Davstorage+ajaxplorer software release v1

9a7dcc00 · Vivien Alger · 453cc58c · 9a7dcc00 · 9a7dcc00 · 9a7dcc00
Commit 9a7dcc00 authored Jun 11, 2013 by Vivien Alger
9 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ eggs/
 parts/
 slapos.cookbook.egg-info
 .*.swp
+*~
+\#*\#
\ No newline at end of file
--- a/component/openssl/buildout.cfg
+++ b/component/openssl/buildout.cfg
@@ -51,4 +51,4 @@ configure-options =
 make-options =
  -j1
 make-targets =
-  install && rm -f ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/* && for i in ${ca-certificates:location}/certs/*/*.crt; do ln -sv $i ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/`${buildout:parts-directory}/${:_buildout_section_name_}/bin/openssl x509 -hash -noout -in $i`.0; done; true
+  all install_sw && rm -f ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/* && for i in ${ca-certificates:location}/certs/*/*.crt; do ln -sv $i ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/`${buildout:parts-directory}/${:_buildout_section_name_}/bin/openssl x509 -hash -noout -in $i`.0; done; true
--- a/slapos/recipe/davstorage/__init__.py
+++ b/slapos/recipe/davstorage/__init__.py
@@ -27,6 +27,8 @@
 import subprocess
 import httplib
 import base64
+import os
+import shutil
 from slapos.recipe.librecipe import GenericBaseRecipe
@@ -50,13 +52,29 @@ class Recipe(GenericBaseRecipe):
                           user, password
                          ])
+    htdocs_location = self.options['htdocs']
+    if not (os.path.exists(htdocs_location) and os.listdir(htdocs_location)):
+      try:
+        os.rmdir(htdocs_location)
+      except:
+        pass
+      shutil.copytree(self.options['source'], htdocs_location)
+    # Install php.ini
+    php_ini = self.createFile(os.path.join(self.options['php-ini-dir'],
+                                             'php.ini'),
+                                self.substituteTemplate(self.getTemplateFilename('php.ini.in'),
+                                dict(tmp_directory=self.options['tmp-dir']))
+                )
+    path_list.append(php_ini)
    apache_config = dict(
      pid_file=self.options['pid-file'],
      lock_file=self.options['lock-file'],
      davlock_db=self.options['davdb-lock'],
      ip=self.options['ip'],
-      port=self.options['port'],
+      port_webdav=self.options['port_webdav'],
+      port_ajax=self.options['port_ajax'],
      error_log=self.options['error-log'],
      access_log=self.options['access-log'],
      document_root=self.options['htdocs'],
@@ -67,6 +85,7 @@ class Recipe(GenericBaseRecipe):
      htpasswd_file=htpasswd_file,
      ssl_certificate=self.options['cert-file'],
      ssl_key=self.options['key-file'],
+      php_ini_dir=self.options['php-ini-dir']
    )
    # Create logfiles
@@ -86,7 +105,7 @@ class Recipe(GenericBaseRecipe):
    promise = self.createPythonScript(self.options['promise'],
      __name__ + '.promise',
-      dict(host=self.options['ip'], port=int(self.options['port']),
+      dict(host=self.options['ip'], port=int(self.options['port_webdav']),
           user=self.options['user'], password=self.options['password'])
                                     )
    path_list.append(promise)

--- a/slapos/recipe/davstorage/template/httpd.conf.in
+++ b/slapos/recipe/davstorage/template/httpd.conf.in
 ServerRoot "%(server_root)s"
-Listen [%(ip)s]:%(port)s
+Listen [%(ip)s]:%(port_webdav)s
+Listen [%(ip)s]:%(port_ajax)s
+NameVirtualHost [%(ip)s]:%(port_webdav)s
+NameVirtualHost [%(ip)s]:%(port_ajax)s
 # Needed modules
-LoadModule unixd_module modules/mod_unixd.so
+LoadModule unixd_module "%(modules_dir)s/mod_unixd.so"
-LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule access_compat_module "%(modules_dir)s/mod_access_compat.so"
-LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule authn_core_module "%(modules_dir)s/mod_authn_core.so"
+LoadModule authz_core_module "%(modules_dir)s/mod_authz_core.so"
 LoadModule authn_file_module "%(modules_dir)s/mod_authn_file.so"
 LoadModule authz_host_module "%(modules_dir)s/mod_authz_host.so"
 LoadModule authz_user_module "%(modules_dir)s/mod_authz_user.so"
 LoadModule auth_basic_module "%(modules_dir)s/mod_auth_basic.so"
-LoadModule auth_digest_module "%(modules_dir)s/mod_auth_digest.so"
+# Comment auth_digest since we don't use it
+#LoadModule auth_digest_module "%(modules_dir)s/mod_auth_digest.so"
 LoadModule log_config_module "%(modules_dir)s/mod_log_config.so"
 LoadModule headers_module "%(modules_dir)s/mod_headers.so"
 LoadModule setenvif_module "%(modules_dir)s/mod_setenvif.so"
-LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
+LoadModule socache_shmcb_module "%(modules_dir)s/mod_socache_shmcb.so"
 LoadModule ssl_module "%(modules_dir)s/mod_ssl.so"
 LoadModule mime_module "%(modules_dir)s/mod_mime.so"
 LoadModule dav_module "%(modules_dir)s/mod_dav.so"
 LoadModule dav_fs_module "%(modules_dir)s/mod_dav_fs.so"
 LoadModule dir_module "%(modules_dir)s/mod_dir.so"
+LoadModule php5_module "%(modules_dir)s/libphp5.so"
 ServerAdmin %(email_address)s
 # Quiet Server header (if not, Apache give its life history)
 # It's safer
 ServerTokens ProductOnly
+PidFile "%(pid_file)s"
+PHPINIDir "%(php_ini_dir)s"
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+<VirtualHost [%(ip)s]:%(port_ajax)s>
+  #ServerName www.example.com
+  # Directory protection
+  <Directory />
+      Options FollowSymLinks
+      AllowOverride None
+      Require all denied
+  </Directory>
+  <Directory %(document_root)s>
+    Options FollowSymLinks
+    AllowOverride All
+    Require all granted
+  </Directory>
+  DocumentRoot "%(document_root)s"
+  DirectoryIndex index.html index.php
+SSLEngine on
+SSLCertificateFile "%(ssl_certificate)s"
+SSLCertificateKeyFile "%(ssl_key)s"
+</VirtualHost>
+<VirtualHost [%(ip)s]:%(port_webdav)s>
 DocumentRoot "%(document_root)s"
-PidFile "%(pid_file)s"
 DavLockDB "%(davlock_db)s"
 <Directory />
@@ -66,6 +103,12 @@ DavLockDB "%(davlock_db)s"
 </Directory>
+SSLEngine on
+SSLCertificateFile "%(ssl_certificate)s"
+SSLCertificateKeyFile "%(ssl_key)s"
+</VirtualHost>
 ErrorLog "%(error_log)s"
 LogLevel warn
@@ -77,9 +120,5 @@ DefaultType text/plain
 TypesConfig "%(mime_types)s"
 AddType application/x-compress .Z
 AddType application/x-gzip .gz .tgz
+AddType application/x-httpd-php .php .phtml .php5 .php4
-SSLRandomSeed startup builtin
+AddType application/x-httpd-php-source .phps
-SSLRandomSeed connect builtin
\ No newline at end of file
-SSLEngine on
-SSLCertificateFile "%(ssl_certificate)s"
-SSLCertificateKeyFile "%(ssl_key)s"
--- a/slapos/recipe/davstorage/template/php.ini.in
+++ b/slapos/recipe/davstorage/template/php.ini.in
+[PHP]
+engine = On
+safe_mode = Off
+expose_php = Off
+error_reporting = E_ALL & ~(E_DEPRECATED|E_NOTICE|E_WARNING)
+display_errors = On
+display_startup_errors = Off
+log_errors = On
+log_errors_max_len = 1024
+ignore_repeated_errors = Off
+ignore_repeated_source = Off
+session.save_path = "%(tmp_directory)s"
+session.auto_start = 0
+date.timezone = Europe/Paris
+file_uploads = On
+upload_max_filesize = 8M
+post_max_size = 8M
+magic_quotes_gpc=Off
+output_buffering=Off
\ No newline at end of file
--- a/software/davstorage/common.cfg
+++ b/software/davstorage/common.cfg
+[buildout]
+versions = versions
+extends =
+  ../../component/apache-php/buildout.cfg  
+  ../../component/apache/buildout.cfg
+  ../../component/curl/buildout.cfg
+  ../../component/dash/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../stack/shacache-client.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/gzip/buildout.cfg
+find-links +=
+  http://www.nexedi.org/static/packages/source/slapos.buildout/
+  http://www.nexedi.org/static/packages/source/
+  http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
+# Use only quite well working sites.
+allow-hosts +=
+  *.googlecode.com
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  alastairs-place.net
+  bitbucket.org
+  dist.repoze.org
+  effbot.org
+  github.com
+  launchpad.net
+  peak.telecommunity.com
+  sourceforge.net
+  www.dabeaz.com
+  www.owlfish.com
+parts =
+  apache-php
+  application
+  template
+  lxml-python
+  eggs
+  instance-recipe-egg
+unzip= true
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+[instance-recipe]
+egg = slapos.cookbook
+module = davstorage
+[instance-recipe-egg]
+recipe = zc.recipe.egg
+python = python2.7
+eggs = ${instance-recipe:egg}
+[application]
+recipe = hexagonit.recipe.download
+url = http://garr.dl.sourceforge.net/project/ajaxplorer/ajaxplorer/dev-channel/4.3.4/ajaxplorer-core-4.3.4.tar.gz
+md5sum = 2f2ff8bda7bbe841ef0e870c724eb74f
+strip-top-level-dir = true
+[template]
+# Default template for the instance.
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = bed788dee6daf05349c4577e7a7f1299
+output = ${buildout:directory}/template.cfg
+mode = 0644
+[instance-davstorage]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-davstorage.cfg
+md5sum = dcc147b49d3c64bc35dd0e914116d5cf
+output = ${buildout:directory}/template-davstorage.cfg
+mode = 0644
+[lxml-python]
+python = python2.7
--- a/software/davstorage/development.cfg
+++ b/software/davstorage/development.cfg
+[buildout]
+extends =
+  ../../component/git/buildout.cfg
+  common.cfg
+parts +=
+  slapos.cookbook-repository
+  slapos.toolbox-repository
+  check-recipe
+develop =
+  ${:parts-directory}/slapos.cookbook-repository
+  ${:parts-directory}/slapos.toolbox-repository
+[slapos.cookbook-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
+branch = davstorage-ajaxplorer
+git-executable = ${git:location}/bin/git
+[slapos.toolbox-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.toolbox.git
+branch = master
+git-executable = ${git:location}/bin/git
+[check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command =
+  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
+  grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
+[versions]
+zc.buildout = 1.6.0-dev-SlapOS-002
+Jinja2 = 2.6
+Werkzeug = 0.8.3
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.6
+hexagonit.recipe.download = 1.6nxd002
+meld3 = 0.6.10
+openssl = 1.0.1c
+# Required by:
+# slapos.core
+Flask = 0.9
+# Required by:
+# slapos.cookbook
+PyXML = 0.8.4
+slapos.recipe.template = 2.4.2
+# Required by:
+# slapos.cookbook==0.24
+# slapos.core==0.14
+# xml-marshaller==0.9.7
+lxml = 3.1.0
+# Required by:
+# slapos.cookbook==0.24
+netaddr = 0.7.10
+# Required by:
+# slapos.core==0.14
+netifaces = 0.8
+# Required by:
+# slapos.cookbook==0.24
+# slapos.core==0.14
+# zc.buildout==1.5.3-dev-SlapOS-009
+# zc.recipe.egg==1.3.2
+setuptools = 0.6c12dev-r88846
+# Required by:
+# slapos.cookbook==0.73.1
+slapos.core = 0.35.1
+# Required by:
+# slapos.core==0.35.1
+supervisor = 3.0b1
+# Required by:
+# slapos.cookbook==0.73.1
+xml-marshaller = 0.9.7
+# Required by:
+# slapos.cookbook==0.24
+zc.recipe.egg = 1.3.2
+# Required by:
+# slapos.core==0.35.1
+zope.interface = 4.0.5
--- a/software/davstorage/instance-davstorage.cfg
+++ b/software/davstorage/instance-davstorage.cfg
 [buildout]
 parts =
  davstorage
-  url
+  publish-connection-informations
  certificate-authority
  ca-davstorage
  cron
  cron-entry-logrotate
  logrotate
  logrotate-entry-davstorage
+  request-frontend
+  frontend-ajaxupload-promise
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
-[url]
+[publish-connection-informations]
-recipe = slapos.cookbook:publishurl
+recipe = slapos.cookbook:publish
-scheme = webdavs
+webdav_access = $${request-frontend:connection-site_url}
-user = $${davstorage:user}
+url = $${request-frontend-ajaxupload:connection-site_url}
-port = $${davstorage:port}
+webdav_user = $${davstorage:user}
-host = $${davstorage:ip}
+webdav_password = $${davstorage:password}
-password = $${davstorage:password}
 [davstorage]
 recipe = slapos.cookbook:davstorage
 user = user
-port = 8080
+password = insecure
+port_webdav = 8080
+port_ajax = 8070
 ip = $${slap-network-information:global-ipv6}
 # Path
@@ -42,12 +45,15 @@ root = $${buildout:directory}
 email-address = admin+davstorage@vifib.net
 htpasswd-file = $${directory:davstorage-conf}/davstorage.htpasswd
 promise = $${basedirectory:promises}/davstorage
+php-ini-dir = $${directory:php-ini-dir}
+tmp-dir = $${directory:tmp-php}
 # Binaries
 apache-binary = ${apache:location}/bin/httpd
 apache-modules-dir = ${apache:location}/modules/
 apache-mime-file = ${apache:location}/conf/mime.types
 apache-htpasswd = ${apache:location}/bin/htpasswd
+source = ${application:location}
 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
@@ -66,7 +72,7 @@ dcrond-binary = ${dcron:location}/sbin/crond
 cron-entries = $${directory:cron-entries}
 crontabs = $${directory:crontabs}
 cronstamps = $${directory:cronstamps}
-catcher = $${cron-simplelogger:binary}
+catcher = $${cron-simplelogger:wrapper}
 binary = $${basedirectory:services}/crond
 [logrotate]
@@ -91,8 +97,8 @@ command = $${logrotate:wrapper}
 [cron-simplelogger]
 recipe = slapos.cookbook:simplelogger
-binary = $${rootdirectory:bin}/cron_simplelogger
+wrapper = $${rootdirectory:bin}/cron_simplelogger
-output = $${directory:cronoutput}
+log = $${basedirectory:log}/crond.log
 [logrotate-entry-davstorage]
@@ -128,6 +134,7 @@ etc = $${buildout:directory}/etc/
 var = $${buildout:directory}/var/
 srv = $${buildout:directory}/srv/
 bin = $${buildout:directory}/bin/
+tmp = $${buildout:directory}/tmp/
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
@@ -149,3 +156,37 @@ cron-entries = $${rootdirectory:etc}/cron.d/
 crontabs = $${rootdirectory:etc}/crontabs/
 cronstamps = $${rootdirectory:etc}/cronstamps/
 cronoutput = $${basedirectory:log}/cron/
+php-ini-dir = $${rootdirectory:etc}/php
+tmp-php = $${rootdirectory:tmp}/php
+# Request frontend
+[request-frontend-ajaxupload]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = Frontend Ajax
+# XXX We have hardcoded SR URL here.
+software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+slave = true
+config = url https-only
+config-https-only = true
+config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/
+return = site_url
+[request-frontend]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = Frontend Webdav
+# XXX We have hardcoded SR URL here.
+software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+slave = true
+config = url https-only
+config-https-only = true
+config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/
+return = site_url
+[frontend-ajaxupload-promise]
+recipe = slapos.cookbook:check_url_available
+path = $${basedirectory:promises}/frontend-ajaxupload
+url = $${request-frontend-ajaxupload:connection-site_url}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
\ No newline at end of file
--- a/software/davstorage/software.cfg
+++ b/software/davstorage/software.cfg
 [buildout]
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-versions = versions
 extends =
-  ../../component/apache/buildout.cfg
+  ../../component/git/buildout.cfg
-  ../../component/dcron/buildout.cfg
+  common.cfg
-  ../../component/logrotate/buildout.cfg
-  ../../stack/shacache-client.cfg
+parts +=
-  ../../component/lxml-python/buildout.cfg
+  slapos.cookbook-repository
-  ../../component/python-2.7/buildout.cfg
+  slapos.toolbox-repository
-  ../../component/gzip/buildout.cfg
+  check-recipe
-# Use only quite well working sites.
+develop =
-allow-hosts =
+  ${:parts-directory}/slapos.cookbook-repository
-  *.nexedi.org
+  ${:parts-directory}/slapos.toolbox-repository
-  *.python.org
-  *.sourceforge.net
+[slapos.cookbook-repository]
-  dist.repoze.org
+recipe = slapos.recipe.build:gitclone
-  effbot.org
+repository = http://git.erp5.org/repos/slapos.git
-  github.com
+branch = davstorage-ajaxplorer
-  peak.telecommunity.com
+git-executable = ${git:location}/bin/git
-  psutil.googlecode.com
-  www.dabeaz.com
+[slapos.toolbox-repository]
-  alastairs-place.net
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.toolbox.git
+branch = master
-parts =
+git-executable = ${git:location}/bin/git
-  template
-  lxml-python
+[check-recipe]
-  apache
+recipe = plone.recipe.command
-  logrotate
+stop-on-error = true
-  dcron
+update-command = ${:command}
-  eggs
+command =
-  gzip
+  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
-  instance-recipe-egg
+  grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
-unzip= true
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-[instance-recipe]
-egg = slapos.cookbook
-module = davstorage
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-python = python2.7
-eggs = ${instance-recipe:egg}
-[template]
-# Default template for the instance.
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-md5sum = bed788dee6daf05349c4577e7a7f1299
-output = ${buildout:directory}/template.cfg
-mode = 0644
-[instance-davstorage]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-davstorage.cfg
-md5sum = 49c8e049a78e233d3a553e64c8914592
-output = ${buildout:directory}/template-davstorage.cfg
-mode = 0644
-[lxml-python]
-python = python2.7
 [versions]
 zc.buildout = 1.6.0-dev-SlapOS-002
 Jinja2 = 2.6
-Werkzeug = 0.7.1
+Werkzeug = 0.8.3
-buildout-versions = 1.6
+buildout-versions = 1.7
-hexagonit.recipe.cmmi = 1.5.0
+hexagonit.recipe.cmmi = 1.6
 hexagonit.recipe.download = 1.6nxd002
-meld3 = 0.6.7
+meld3 = 0.6.10
-slapos.cookbook = 0.26
+openssl = 1.0.1c
 # Required by:
-# slapos.core==0.14
+# slapos.core
-Flask = 0.7.2
+Flask = 0.9
 # Required by:
-# slapos.cookbook==0.24
+# slapos.cookbook
 PyXML = 0.8.4
-# Required by:
+slapos.recipe.template = 2.4.2
-# slapos.recipe.template==1.1
-collective.recipe.template = 1.9
 # Required by:
 # slapos.cookbook==0.24
 # slapos.core==0.14
 # xml-marshaller==0.9.7
-lxml = 2.3
+lxml = 3.1.0
 # Required by:
 # slapos.cookbook==0.24
-netaddr = 0.7.6
+netaddr = 0.7.10
 # Required by:
 # slapos.core==0.14
-#netifaces = 0.4
+netifaces = 0.8
 # Required by:
 # slapos.cookbook==0.24
@@ -115,15 +73,15 @@ netaddr = 0.7.6
 setuptools = 0.6c12dev-r88846
 # Required by:
-# slapos.cookbook==0.24
+# slapos.cookbook==0.73.1
-slapos.core = 0.14
+slapos.core = 0.35.1
 # Required by:
-# slapos.core==0.14
+# slapos.core==0.35.1
-supervisor = 3.0a10
+supervisor = 3.0b1
 # Required by:
-# slapos.cookbook==0.24
+# slapos.cookbook==0.73.1
 xml-marshaller = 0.9.7
 # Required by:
@@ -131,5 +89,6 @@ xml-marshaller = 0.9.7
 zc.recipe.egg = 1.3.2
 # Required by:
-# slapos.core==0.14
+# slapos.core==0.35.1
-zope.interface = 3.7.0
+zope.interface = 4.0.5