Merge master branch to get tar component.

CHANGES.txt

 Changes
 =======
 
-0.46 (Unreleased)
------------------
+0.64 (Unrelease)
+----------------
 
   * No change yet.
 
+0.63 (2012-08-22)
+----------------
+
+  * Add the ability to run command line in shellinabox. [Antoine Catton]
+  * Add the ability to run shellinabox as root. (for LXC purpose) [Antoine Catton]
+  * Add "uuid" recipe. [Antoine Catton]
+  * Add "downloader" recipe. [Antoine Catton]
+
+0.62 (2012-08-21)
+-----------------
+
+  * Add "wrapper" recipe. [Antoine Catton]
+  * Add "gitinit" recipe. [Antoine Catton]
+  * librecipe.execute code clean up and factorization. [Antoine Catton]
+  * Add "template" recipe. [Antoine Catton]
+
+0.61 (2012-08-17)
+-----------------
+
+  * Add "debug" option for slaprunner. [Alain Takoudjou]
+
+0.60 (2012-08-13)
+-----------------
+
+  * New recipe: requestoptional, like "request", but won't fail if instance is
+    not ready. [Cedric de Saint Martin]
+  * Update zabbix to return strings as parameters. [Cedric de Saint Martin]
+  * Add check in check_url_promise in case of empty URL. [Cedric de Saint
+    Martin]
+  * Upgrade slaprunner recipe to be compatible with newest version. [Alain
+    Takoudjou]
+
+0.59 (2012-07-12)
+-----------------
+
+  * Zabbix: add temperature monitoring using custom commands.
+
+0.58 (2012-07-06)
+-----------------
+
+  * Agent rewrite. [Vincent Pelletier]
+
+0.57 (2012-06-22)
+-----------------
+
+  * Do not use system curl. [Romain Courteaud]
+
+0.56 (2012-06-18)
+-----------------
+
+  * Add signalwrapper, generate.mac, generate.password recipes. [Romain
+    Courteaud]
+
+0.55 (2012-06-18)
+-----------------
+
+  * Add slapmonitor and slapreport recipes. [Mohamadou Mbengue]
+
+0.54.1 (2012-06-18)
+-----------------
+
+  * Fix 0.54 release containing wrong code in request.py.
+
+0.54 (2012-06-18)
+-----------------
+
+  * Apache frontend: won't block sending slave informations to SlapOS Master
+    in case of problem from one slave instance.[Cedric de Saint Martin]
+  * Apache frontend will send IP informations for slaves in case slave is about
+    custom domain. [Cedric de Saint Martin]
+  * Ability to use LAMP applications without configuration. [Cedric de Saint
+    Martin]
+  * Users can specify custom domain in LAMP applications. [Cedric de Saint
+    Martin]
+
+0.53 (2012-06-07)
+-----------------
+
+  * Switch slaprunner into generic recipe, and add cloud9 recipe. [Cedric de
+    Saint Martin]
+
+0.52 (2012-05-16)
+-----------------
+
+  * Request bugfix: Correct default software_type (was: RootInstanceSoftware).
+    [Cedric de Saint Martin]
+  * Request will raise again if requested instance is not ready
+    [Romain Courteaud]
+  * Apache Frontend: assume apache is available from standard ports.
+    Consequence: url connection parameter of slave instance doesn't contain
+    port. [Cedric de Saint Martin]
+  * Apache Frontend bugfix: correctly detect slave instance type (zope).
+    [Cedric de Saint Martin]
+  * Apache Frontend: "default" slave instances are available through http
+    in addition to https. [Cedric de Saint Martin]
+  * Apache Frontend: Configuration: Add mod_deflate and set ProxyPreserveHost
+    [Cedric de Saint Martin]
+
+0.51 (2012-05-14)
+-----------------
+
+  * LAMP stack bugfix: Users were losing data when slapgrid is ran (Don't
+    erase htdocs if it already exist). [Cedric de Saint Martin]
+
+0.50 (2012-05-12)
+-----------------
+
+  * LAMP stack bugfix: fix a crash where recipe was trying to restart
+    non-existent httpd process. [Cedric de Saint Martin]
+  * LAMP stack bugfix: don't erase htdocs at update [Cedric de Saint Martin]
+  * Apache Frontend: Improve Apache configuration, inspired by Nexedi
+    production frontend. [Cedric de Saint Martin]
+  * Allow sysadmin of node to customize frontend instance.
+    [Cedric de Saint Martin]
+  * Apache Frontend: Change 'zope=true' option to 'type=zope'.
+    [Cedric de Saint Martin]
+  * Apache Frontend: listens to plain http port as well to redirect to https.
+    [Cedric de Saint Martin]
+
+0.49 (2012-05-10)
+-----------------
+
+  * Apache Frontend supports Zope and Varnish. [Cedric de Saint Martin]
+
+0.48 (2012-04-26)
+-----------------
+
+  * New utility recipe: slapos.recipe.generate_output_if_input_not_null.
+    [Cedric de Saint Martin]
+  * New promise recipe: slapos.recipe.url_available: check if url returns http
+    code 200. [Cedric de Saint Martin]
+  * Fix: slapos.recipe.request won't raise anymore if instance is not ready.
+    [Cedric de Saint Martin]
+  * Fix: slapos.recipe.request won't assume instance reference if not
+    specified. [Cedric de Saint Martin]
+
+0.47 (2012-04-19)
+-----------------
+
+  * Slap Test Agent [Yingjie Xu]
+
+0.46 (2012/04/12)
+-----------------
+
+  * xvfb and firefox initial release [Romain Courteaud]
+
 0.45 (2012-03-29)
 -----------------
 

component/apache-php/buildout.cfg

@@ -20,8 +20,10 @@ extends =
 [apache-php]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = hexagonit.recipe.cmmi
-url = http://fr2.php.net/distributions/php-5.3.10.tar.gz
-md5sum = 2b3d2d0ff22175685978fb6a5cbcdc13
+depends =
+  ${mariadb:version}
+url = http://fr2.php.net/distributions/php-5.3.13.tar.gz
+md5sum = 179c67ce347680f468edbfc3c425476a
 configure-options =
   --with-apxs2=${apache:location}/bin/apxs
   --with-libxml-dir=${libxml2:location}

component/apache/buildout.cfg

@@ -30,10 +30,10 @@ md5sum = 52b31b33fb1aa16e65ddaefc76e41151
 recipe = hexagonit.recipe.cmmi
 depends =
   ${gdbm:version}
-version = 2.4.1
+version = 2.4.3
 revision = 1
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 7d3001c7a26b985d17caa367a868f11c
+md5sum = 87aaf7bc7e8715f0455997bb8c6791aa
 configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
 configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
                     --disable-static
@@ -45,6 +45,7 @@ configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_na
                     --enable-cgid
                     --enable-charset-lite
                     --enable-disk-cache
+                    --enable-mem-cache
                     --enable-echo
                     --enable-exception-hook
                     --enable-mods-shared=all
@@ -115,3 +116,73 @@ configure-options = -c mod_antiloris.c
 make-binary = ${:configure-command}
 make-options = -i -a -n antiloris mod_antiloris.la
 make-targets =
+
+[apache-2.2]
+# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
+recipe = hexagonit.recipe.cmmi
+url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.22.tar.gz
+md5sum = d77fa5af23df96a8af68ea8114fa6ce1
+patch-options = -p1
+configure-options = --disable-static
+                    --enable-authn-alias
+                    --enable-bucketeer
+                    --enable-cache
+                    --enable-case-filter
+                    --enable-case-filter-in
+                    --enable-cgid
+                    --enable-charset-lite
+                    --enable-disk-cache
+                    --enable-mem-cache
+                    --enable-echo
+                    --enable-exception-hook
+                    --enable-mods-shared=all
+                    --enable-optional-fn-export
+                    --enable-optional-fn-import
+                    --enable-optional-hook-export
+                    --enable-optional-hook-import
+                    --enable-proxy
+                    --enable-proxy-ajp
+                    --enable-proxy-balancer
+                    --enable-proxy-connect
+                    --enable-proxy-ftp
+                    --enable-proxy-http
+                    --enable-proxy-scgi
+                    --enable-dav
+                    --enable-dav-fs
+                    --enable-so
+                    --enable-ssl
+                    --with-included-apr
+                    --with-ssl=${openssl:location}
+                    --with-z=${zlib:location}
+                    --with-expat=${libexpat:location}
+                    --with-pcre=${pcre:location}
+                    --with-sqlite3=${sqlite3:location}
+                    --with-gdbm=${gdbm:location}
+                    --without-lber
+                    --without-ldap
+                    --without-ndbm
+                    --without-berkeley-db
+                    --without-pgsql
+                    --without-mysql
+                    --without-sqlite2
+                    --without-oracle
+                    --without-freedts
+                    --without-odbc
+                    --without-iconv
+
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
+  CPPFLAGS =-I${libuuid:location}/include
+  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
+
+[apache-antiloris-apache-2.2]
+# Note: Shall react on each build of apache and reinstall itself
+recipe = hexagonit.recipe.cmmi
+url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
+md5sum = 66862bf10e9be3a023e475604a28a0b4
+configure-command = ${apache-2.2:location}/bin/apxs
+configure-options = -c mod_antiloris.c
+make-binary = ${:configure-command}
+make-options = -i -a -n antiloris mod_antiloris.la
+make-targets =

component/aspell/buildout.cfg

 [buildout]
 parts =
   aspell
+  aspell-en-dictonary
 
 extends = 
   ../ncurses/buildout.cfg
 
+[aspell-common-dictionary]
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+recipe = plone.recipe.command
+command = mkdir -p ${:location}
+update-command = ${:command}
+stop-on-error = yes
+
 [aspell]
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz
 md5sum = e66a9c9af6a60dc46134fdacf6ce97d7
+
+[aspell-en-dictionary]
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2
+md5sum = beba5e8f3afd3ed1644653bb685b2dfb
+configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin
\ No newline at end of file

component/attr/buildout.cfg

+[buildout]
+
+parts = attr
+
+[attr]
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.igh.cnrs.fr/pub/nongnu/attr/attr-2.4.46.src.tar.gz
+md5sum = db557c17fdfa4f785333ecda08654010
+configure-options =
+    --enable-shared=yes
+    --enable-gettext=no
+make-targets = install install-lib install-dev

component/autoconf/buildout.cfg

@@ -7,8 +7,8 @@ parts =
 
 [autoconf]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.gz
-md5sum = c3b5247592ce694f7097873aa07d66fe
+url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
+md5sum = 82d05e03b93e45f5a39b828dc9c6c29b
 environment =
   M4=${m4:location}/bin/m4
   PATH=${perl:location}/bin:%(PATH)s

component/automake/buildout.cfg

@@ -3,11 +3,11 @@ extends =
   ../autoconf/buildout.cfg
   ../perl/buildout.cfg
 parts =
-  automake-1.11
+  automake
 
-[automake-1.11]
+[automake]
 recipe = hexagonit.recipe.cmmi
-md5sum = 93ecb319f0365cb801990b00f658d026
-url = http://ftp.gnu.org/gnu/automake/automake-1.11.3.tar.gz
+md5sum = e620cb9e0259159341c0e0d6b712b67a
+url = http://ftp.gnu.org/gnu/automake/automake-1.12.2.tar.gz
 environment =
   PATH =${autoconf:location}/bin:${perl:location}/bin:%(PATH)s

component/bison/buildout.cfg

@@ -4,7 +4,19 @@ extends =
 parts =
   bison
 
+[bison-drop.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = ac06cbaa298ac686d0b0c04bc03e6ad8
+download-only = true
+filename = drop.gets.patch
+
 [bison]
+virtual-depends = ${bison-drop.gets.patch:md5sum}
+patch-options = -p1
+patches =
+  ${bison-drop.gets.patch:location}/${bison-drop.gets.patch:filename}
+
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/gnu/bison/bison-2.5.tar.bz2
 md5sum = 9dba20116b13fc61a0846b0058fbe004

component/bison/drop.gets.patch

+diff -ur bison-2.5.orig/lib/stdio.in.h bison-2.5/lib/stdio.in.h
+--- bison-2.5.orig/lib/stdio.in.h	2011-05-15 00:23:46.000000000 +0200
++++ bison-2.5/lib/stdio.in.h	2012-07-23 16:30:56.366722487 +0200
+@@ -181,7 +181,9 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@

component/busybox/buildout.cfg

@@ -4,8 +4,8 @@ parts = busybox
 
 [busybox]
 recipe = slapos.recipe.build
-url = http://busybox.net/downloads/busybox-1.19.3.tar.bz2
-md5sum = c3938e1ac59602387009bbf1dd1af7f6
+url = http://git.busybox.net/busybox/snapshot/busybox-1_20_1.tar.gz
+md5sum = 15758fc37ae8051d6def1b8afb691821
 script =
     extract_dir = self.extract(self.download(%(url)r, %(md5sum)r))
     workdir = guessworkdir(extract_dir)

component/ca-certificates/buildout.cfg

 # CA certificates
 
 [buildout]
+
+extends =
+  ../patch/buildout.cfg
+
 parts =
   ca-certificates
 
@@ -16,6 +20,7 @@ download-only = true
 recipe = hexagonit.recipe.cmmi
 version = 20120623
 url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.gz
+patch-binary = ${patch:location}/bin/patch
 md5sum = 5105d4cc086f0d4ecf7bf2e4c4667289
 patches =
   ${ca-certificates-sbin-dir.patch:location}/${ca-certificates-sbin-dir.patch:filename}

component/cloud9/buildout.cfg

@@ -14,7 +14,14 @@ parts =
 [cloud9]
 <= cloud9-git
 
-[cloud9-git]
+[node-sm]
+recipe = slapos.recipe.build:npm
+packages = sm
+node = nodejs
+environment =
+  PATH=${nodejs:location}/bin:%(PATH)s
+
+[cloud9-stable]
 # Online IDE written in javascript/node.js
 # URL : c9.io
 # You can use it using the following command :
@@ -26,7 +33,21 @@ repository = https://github.com/ajaxorg/cloud9.git
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 git-binary = ${git:location}/bin/git
 npm-binary = ${nodejs-0.4:location}/bin/node ${npm:location}/bin/npm
-command = export GIT_SSL_NO_VERIFY=true; (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit} && ${:git-binary} submodule update --init && cd support/jsdav && PATH=${nodejs-0.4:location}/bin:$PATH LDFLAGS=-L${libxml2:location}/lib ${:npm-binary} install) || (rm -fr ${:location}; exit 1)
+command = export GIT_SSL_NO_VERIFY=true; export HOME=${:location}; (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit} && ${:git-binary} submodule update --init && cd support/jsdav && PATH=${nodejs-0.4:location}/bin:$PATH LDFLAGS=-L${libxml2:location}/lib ${:npm-binary} install) || (rm -fr ${:location}; exit 1)
+update-command =
+
+[cloud9-git]
+# Online IDE written in javascript/node.js
+# URL : c9.io
+# You can use it using the following command :
+# NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location} 
+recipe = plone.recipe.command
+stop-on-error = true
+commit = 1f46081df51e6654cef17c205fbf589b219133a7
+repository = https://github.com/ajaxorg/cloud9.git
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+environment = export GIT_SSL_NO_VERIFY=true; export PATH=${git:location}/bin:${nodejs:location}/bin:${node-sm:location}/node_modules/sm/bin:$PATH; export CPPFLAGS="-I${libxml2:location}/include -I${nodejs:location}/include"; export LDFLAGS="-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib"; export HOME=${:location};
+command = ${:environment} (git clone --quiet ${:repository} ${:location} && cd ${:location} && git reset --hard ${:commit} && ${node-sm:location}/node_modules/.bin/sm install) || (rm -fr ${:location}; exit 1)
 update-command =
 
 [cloud9-npm]
@@ -36,10 +57,10 @@ update-command =
 # NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location} 
 recipe = slapos.recipe.npm
 # Node part has to be specified, otherwise system node is used.
-node = nodejs-0.6
+node = nodejs
 # List of packages to install
 packages =
-  cloud9
+  cloud9==0.7
 # Specify environment jsDAV (dependency of cloud9) needs libxml2
 environment = 
   LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib

component/cloudooo/buildout.cfg

@@ -5,21 +5,43 @@ extends =
 parts =
   cloudooo
 
-sources = sources
+develop +=
+  ${:parts-directory}/cloudooo-repository
 
-[sources]
-# Include information related to official cloudooo source code.
-cloudooo = git http://git.erp5.org/repos/cloudooo.git
+[cloudooo-check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/cloudooo.egg-link
 
-[lxml-python]
-python = python2.6
+[cloudooo-repository]
+recipe = plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+stop-on-error = true
+repository = http://git.erp5.org/repos/cloudooo.git
+branch = master
+revision =
+command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
+update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
 
 [cloudooo]
 recipe = zc.recipe.egg
 python = python2.6
+extra-paths = ${cloudooo-repository:location}
 eggs =
   ${lxml-python:egg}
-  cloudooo
   PasteScript
+  python-magic
+  psutil
+  WSGIUtils
+  cloudooo
+entry-points =
+  main=cloudooo.paster_application:application
+  cloudooo_tester=cloudooo.bin.cloudooo_tester:main
+  runCloudoooUnitTest=cloudooo.tests.runHandlerUnitTest:run
+  runCloudoooTestSuite=cloudooo.tests.runTestSuite:run
 scripts = 
   paster=cloudooo_paster
+  runCloudoooUnitTest
+  runCloudoooTestSuite
+ugly-depend-on = ${cloudooo-repository:command} ${cloudooo-repository:update-command} ${cloudooo-check-recipe:command}

component/cloudooo/buildout.eggversion.cfg

+[buildout]
+extends =
+  ../lxml-python/buildout.cfg
+
+parts =
+  cloudooo
+
+[lxml-python]
+python = python2.6
+
+[cloudooo]
+recipe = zc.recipe.egg
+python = python2.6
+eggs =
+  ${lxml-python:egg}
+  cloudooo
+  cloudooo.handler.ooo
+  cloudooo.handler.pdf
+  cloudooo.handler.ffmpeg
+  cloudooo.handler.imagemagick
+  PasteScript
+  python-magic
+entry-points =
+  cloudooo_tester=cloudooo.bin.cloudooo_tester:main
+  runCloudoooUnitTest=cloudooo.tests.runHandlerUnitTest:run
+
+scripts =
+  paster=cloudooo_paster
+  runCloudoooUnitTest
+
+

component/cmake/buildout.cfg

@@ -4,5 +4,5 @@ parts =
 
 [cmake]
 recipe = hexagonit.recipe.cmmi
-url = http://www.cmake.org/files/v2.8/cmake-2.8.6.tar.gz
-md5sum = 2147da452fd9212bb9b4542a9eee9d5b
+url = http://www.cmake.org/files/v2.8/cmake-2.8.8.tar.gz
+md5sum = ba74b22c788a0c8547976b880cd02b17

component/coreutils/buildout.cfg

@@ -2,10 +2,23 @@
 parts =
   coreutils
 
+[coreutils-drop.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 63c2299d92d23e4748abb9668b7e62ea
+download-only = true
+filename = drop.gets.patch
+
 [coreutils]
+virtual-depends = ${coreutils-drop.gets.patch:md5sum}
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.12.tar.gz
 md5sum = fce7999953a67243d00d75cc86dbcaa6
+
+patch-options = -p1
+patches =
+  ${coreutils-drop.gets.patch:location}/${coreutils-drop.gets.patch:filename}
+
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-install-program=tr,basename,uname,cat,cp,ls
 environment =

component/coreutils/drop.gets.patch

+diff -ur coreutils-8.12.old/lib/stdio.in.h coreutils-8.12/lib/stdio.in.h
+--- coreutils-8.12.old/lib/stdio.in.h	2011-04-25 11:01:29.000000000 +0200
++++ coreutils-8.12/lib/stdio.in.h	2012-07-23 16:02:17.591610452 +0200
+@@ -181,7 +181,9 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@

component/couchdb/buildout.cfg

+[buildout]
+
+extends =
+  ../openssl/buildout.cfg
+  ../curl/buildout.cfg
+  ../erlang/buildout.cfg
+  ../icu/buildout.cfg
+  ../spidermonkey/buildout.cfg
+
+parts = couchdb
+
+[couchdb]
+recipe = hexagonit.recipe.cmmi
+url = http://mir2.ovh.net/ftp.apache.org/dist//couchdb/1.1.1/apache-couchdb-1.1.1.tar.gz
+md5sum = cd126219b9cb69a4c521abd6960807a6
+configure-options =
+  --with-erlang=${erlang:location}/lib/erlang/usr/include
+  --with-js-include=${spidermonkey-1.7:location}/include
+  --with-js-lib=${erlang:location}/lib
+  --enable-js-trunk
+environment-section = couchdb-environ
+
+[couchdb-environ]
+PATH = ${erlang:location}/bin:${icu4c:location}/bin:${curl:location}/bin:%(PATH)s
+# XXX: Gotta put everything on the same line. If not, it won't compile
+CFLAGS = -I${icu4c:location}/include -I${spidermonkey-1.7:location}/include -I${curl:location}/include
+LDFLAGS = -L${icu4c:location}/lib -Wl,-rpath=${icu4c:location}/lib -L${spidermonkey-1.7:location}/lib -Wl,-rpath=${spidermonkey-1.7:location}/lib -L${curl:location}/lib -Wl,-rpath=${curl:location}/lib

component/cpio/buildout.cfg

@@ -2,7 +2,19 @@
 [buildout]
 parts = cpio
 
+[cpio-drop.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 6c79cb9caf407063543efff93647c450
+download-only = true
+filename = drop.gets.patch
+
 [cpio]
+virtual-depends =
+  ${cpio-drop.gets.patch:md5sum}
+patch-options = -p1
+patches =
+  ${cpio-drop.gets.patch:location}/${cpio-drop.gets.patch:filename}
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/gnu/cpio/cpio-2.11.tar.bz2
 md5sum = 20fc912915c629e809f80b96b2e75d7d

component/cpio/drop.gets.patch

+diff -ur cpio-2.11.orig/gnu/stdio.in.h cpio-2.11/gnu/stdio.in.h
+--- cpio-2.11.orig/gnu/stdio.in.h	2010-03-10 10:27:03.000000000 +0100
++++ cpio-2.11/gnu/stdio.in.h	2012-07-23 13:04:56.075242094 +0200
+@@ -139,7 +139,9 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@

component/erlang/buildout.cfg

 [buildout]
-parts =
-  erlang
+extends =
+  ../openssl/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../zlib/buildout.cfg
+  ../java/buildout.cfg
+
+parts = erlang
 
 [erlang]
 recipe = hexagonit.recipe.cmmi
-url = http://www.erlang.org/download/otp_src_R14B03.tar.gz
-md5sum = 7979e662d11476b97c462feb7c132fb7
+url = http://www.erlang.org/download/otp_src_R14B04.tar.gz
+md5sum = 4b469729f103f52702bfb1fb24529dc0
+configure-options =
+    --with-ssl=${openssl:location}
+    --with-java
+    --enable-dynamic-ssl-lib
+    --enable-shared-zlib
+    --enable-native-libs
+environment=
+    PATH=${java-sdk-1.6.0:location}/bin:%(PATH)s
+    CFLAGS=-I${ncurses:location}/include -I${zlib:location}/include/
+    LDFLAGS=-L${ncurses:location}/lib/ -L${zlib:location}/lib/ -Wl,-rpath=${ncurses:location}/lib/ -Wl,-rpath=${zlib:location}/lib/
+
+make-options =
+    -j1

component/ffmpeg/buildout.cfg

@@ -9,7 +9,7 @@ parts =
   ffmpeg
 
 [ffmpeg]
-<= ffmpeg-0.6
+<= ffmpeg-0.8
 
 [libogg]
 recipe = hexagonit.recipe.cmmi
@@ -53,8 +53,8 @@ environment =
 
 [libx264]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20110412-2245.tar.bz2
-md5sum = 423c402214544d0e2f21455175a0d01f
+url = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20111005-2245-stable.tar.bz2
+md5sum = f86260b2ea6d6cb5186937c9363891d7
 configure-options =
   --enable-shared
   --enable-pic
@@ -76,10 +76,10 @@ md5sum = 8e8b8b253eb046340ff7b6bf7a6ccd3e
 configure-options =
   --disable-static
 
-[ffmpeg-0.6]
+[ffmpeg-0.8]
 recipe = hexagonit.recipe.cmmi
-url = http://www.ffmpeg.org/releases/ffmpeg-0.6.3.tar.bz2
-md5sum = cdf4ad9b2a4d195b5ca874494bc7b0b0
+url = http://ffmpeg.org/releases/ffmpeg-0.8.5.tar.bz2
+md5sum = 726877b19ece7ea64def8b7e6727e182
 configure-options = 
  --enable-gpl
  --enable-version3

component/firefox/buildout.cfg

@@ -6,6 +6,8 @@ extends =
   ../dbus/buildout.cfg
   ../gtk-2/buildout.cfg
   ../libpng/buildout.cfg
+  ../dash/buildout.cfg
+  ../openssl/buildout.cfg
 
 parts =
   firefox
@@ -30,11 +32,11 @@ script =
   self.copyTree(workdir, "%(location)s")
   wrapper_location = os.path.join("%(location)s", "firefox-slapos")
   wrapper = open(wrapper_location, 'w')
-  wrapper.write("""#!/bin/sh
+  wrapper.write("""#!${dash:location}/bin/dash
   cd %(location)s
-  export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${dbus-glib:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:${libpng:location}/lib:${libSM:location}/lib:${libICE:location}/lib:${alsa:location}/lib:%(location)s
+  export LD_LIBRARY_PATH=%(location)s:${libXrender:location}/lib/:${freetype:location}/lib/:${fontconfig:location}/lib/:${libX11:location}/lib/:${bzip2:location}/lib/:${libXext:location}/lib/:${libXt:location}/lib/:${zlib:location}/lib/:${libXcursor:location}/lib/:${gtk-2:location}/lib/:${cairo:location}/lib/:${pango:location}/lib/:${glib:location}/lib/:${atk:location}/lib/:${gdk-pixbuf:location}/lib/:${alsa:location}/lib/:${libpng:location}/lib/:${libSM:location}/lib/:${libICE:location}/lib:${libxml2:location}/lib:${openssl:location}/lib
   export PATH=${fontconfig:location}/bin:$PATH
-  %(location)s/firefox $*""")
+  exec %(location)s/firefox $*""")
   wrapper.close()
   os.chmod(wrapper_location, 0777)
 

component/fontconfig/buildout.cfg

@@ -6,14 +6,15 @@ extends =
   ../pkgconfig/buildout.cfg
   ../bzip2/buildout.cfg
   ../zlib/buildout.cfg
+  ../bzip2/buildout.cfg
 
 parts =
   fontconfig
 
 [fontconfig]
 recipe = hexagonit.recipe.cmmi
-url = http://fontconfig.org/release/fontconfig-2.8.0.tar.gz
-md5sum = 77e15a92006ddc2adbb06f840d591c0e
+url = http://fontconfig.org/release/fontconfig-2.9.0.tar.gz
+md5sum = 26c83855ed256b5c032baae032fadc4f
 # XXX-Cedric : should we use --with-add-fonts={somefont:location}/share,{someotherfont:location}/share?
 configure-options =
   --disable-static

component/gettext/buildout.cfg

@@ -6,10 +6,23 @@ extends =
   ../libxml2/buildout.cfg
   ../zlib/buildout.cfg
 
+[gettext-drop.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 1a17a2e6c1539927304379dfa0f149c5
+download-only = true
+filename = drop.gets.patch
+
 [gettext]
+virtual-depends = ${gettext-drop.gets.patch:md5sum}
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz
 md5sum = 3dd55b952826d2b32f51308f2f91aa89
+
+patch-options = -p1
+patches =
+  ${gettext-drop.gets.patch:location}/${gettext-drop.gets.patch:filename}
+
 configure-options =
   --disable-static
   --disable-java

component/gettext/drop.gets.patch

+diff -ur gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h
+--- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h	2010-05-17 21:56:12.000000000 +0200
++++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h	2012-07-20 17:42:29.940524198 +0200
+@@ -141,7 +141,9 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+diff -ur gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h
+--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h	2010-05-24 11:42:46.000000000 +0200
++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h	2012-07-20 17:45:20.550461064 +0200
+@@ -141,7 +141,9 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+diff -ur gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h
+--- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h	2010-05-17 21:58:03.000000000 +0200
++++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h	2012-07-20 17:45:15.937129402 +0200
+@@ -141,7 +141,9 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@

component/giflib/buildout.cfg

+[buildout]
+parts =
+  giflib
+
+[giflib]
+recipe = hexagonit.recipe.cmmi
+url = http://prdownloads.sourceforge.net/giflib/giflib-4.2.0.tar.bz2?download
+md5sum = 711ad48551ee14db7c200b5f402df849
+configure-options =
+  --without-x
+  --disable-x11
+  --disable-static
+
+# restrict building to libraries only, we don't care about binaries
+# and specially docs which would require more dependencies (e.g. xmlto):
+make-options =
+  SUBDIRS=lib
\ No newline at end of file

component/git/buildout.cfg

@@ -6,25 +6,28 @@ extends =
   ../curl/buildout.cfg
   ../libexpat/buildout.cfg
   ../openssl/buildout.cfg
-  ../perl/buildout.cfg
   ../zlib/buildout.cfg
 parts =
   git
 
 [git]
 recipe = hexagonit.recipe.cmmi
-url = http://git-core.googlecode.com/files/git-1.7.8.4.tar.gz
-md5sum = e6c3319d76d52a830af395046fc56143
+url = http://git-core.googlecode.com/files/git-1.7.10.4.tar.gz
+md5sum = 68319d593d051ef76c26e945bbd2d7ac
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}
   --with-zlib=${zlib:location}
   --with-expat=${libexpat:location}
-  --with-perl=${perl:location}/bin/perl
   --without-python
   --without-tcltk
-
 environment =
-  PATH=${curl:location}/bin:%(PATH)s
+  NO_PERL=y
+  PATH=${curl:location}/bin:${gettext:location}/bin:%(PATH)s
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib
+
+[gitweb]
+<= git
+make-targets = install-gitweb
+make-options = bindir="${git:location}/bin/"

component/groff/buildout.cfg

+[buildout]
+parts =
+  groff
+
+[groff]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnu.org/gnu/groff/groff-1.21.tar.gz
+md5sum = 8b8cd29385b97616a0f0d96d0951c5bf
+configure-options =
+  --disable-static
+  --without-x

component/groonga/buildout.cfg

@@ -7,11 +7,12 @@ parts =
 
 [groonga]
 recipe = hexagonit.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-2.0.0.tar.gz
-md5sum = 09e6a34db15cf42b6a3aff07e0f841ff
+url = http://packages.groonga.org/source/groonga/groonga-2.0.5.tar.gz
+md5sum = 6ea6634ceee97f701add89ee39f4c1da
 configure-options =
   --disable-static
   --disable-glibtest
   --disable-benchmark
   --disable-document
+  --disable-nginx
   --without-mecab

component/gtk-2/buildout.cfg

@@ -37,8 +37,8 @@ configure-options =
 environment = 
   PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig::${libXrender:location}/lib/pkgconfig
-  CPPFLAGS=-I${cairo:location}/include/cairo
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -lXrender
+  CPPFLAGS=-I${cairo:location}/include/cairo -I${libX11:location}/include/X11 -I${libxcb:location}/include/xcb -I${libXau:location}/include/X11 -I${bzip2:location}/include -L${libXrender:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${cairo:location}/lib -Wl,-rpath=${cairo:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libxcb:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libXau:location}/lib -Wl,-rpath=${libXau:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -lXrender -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
   LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib
 
 [gdk-pixbuf]
@@ -74,9 +74,10 @@ configure-options =
   --disable-cups
   --disable-papi
   --enable-explicit-deps
+  --disable-xinerama
 environment = 
   PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gettext:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig
-  CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include -I${cairo:location}/include/cairo
-  LDFLAGS=-L${gettext:location}/lib -L${glib:location}/lib -L${libtiff:location}/lib -L${libjpeg:location}/lib -L${libpng:location}/lib -L${zlib:location}/lib -L${libXrender:location}/lib -L${libX11:location}/lib -L${libXext:location}/lib -L${pango:location}/lib
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig
+  CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include -I${cairo:location}/include/cairo -I${zlib:location}/include -I${bzip2:location}/include -I${libXdmcp:location}/include -I${glib:location}/include/gio-unix-2.0 -I${glib:location}/include/glib-2.0 -I${glib:location}/include -I${atk:location}/include/atk-1.0
+  LDFLAGS=-L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib -L${kbproto:location}/lib -Wl,-rpath=${kbproto:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -L${render:location}/lib -Wl,-rpath=${render:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${cairo:location}/lib -Wl,-rpath=${cairo:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libXdmcp:location}/lib -Wl,-rpath=${libXdmcp:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib  -L${atk:location}/lib -Wl,-rpath=${atk:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
   LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib:${libX11:location}/lib

component/gzip/buildout.cfg

@@ -2,7 +2,20 @@
 parts =
   gzip
 
+[gzip-drop.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = d9b1156f912c8cf006f140482918ebc9
+download-only = true
+filename = drop.gets.patch
+
 [gzip]
+virtual-depends = ${gzip-drop.gets.patch:md5sum}
 recipe = hexagonit.recipe.cmmi
+
+patch-options = -p1
+patches =
+  ${gzip-drop.gets.patch:location}/${gzip-drop.gets.patch:filename}
+
 url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.4.tar.gz
 md5sum = e381b8506210c794278f5527cba0e765

component/gzip/drop.gets.patch

+diff -ur gzip-1.4.orig/lib/stdio.in.h gzip-1.4/lib/stdio.in.h
+--- gzip-1.4.orig/lib/stdio.in.h	2010-01-20 14:20:36.000000000 +0100
++++ gzip-1.4/lib/stdio.in.h	2012-07-23 16:20:24.299373437 +0200
+@@ -125,7 +125,9 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@

component/haproxy/buildout.cfg

+# HAProxy - The Reliable, High Performance TCP/HTTP Load Balancer
+# http://haproxy.1wt.eu/
+
 [buildout]
+extends =
+  ../pcre/buildout.cfg
+
 parts = haproxy
 
 [haproxy]
 recipe = hexagonit.recipe.cmmi
-url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.19.tar.gz
-md5sum = 41392d738460dbf99295fd928031c6a4
+url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.21.tar.gz
+md5sum = f36d5d13fd4a44ab454eee5d06cb38a2
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".
@@ -13,3 +19,7 @@ make-options =
   TARGET="$(uname -sr 2>/dev/null|grep -Eq '^Linux (2\.6|3)' && echo linux26 || echo generic)"
   ARCH="$(uname -m 2>/dev/null|grep -E '^(x86_64|i[3456]86)$')"
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+  USE_PCRE=1
+  ADDLIB=-Wl,-rpath=${pcre:location}/lib
+environment =
+  PATH=${pcre:location}/bin:%(PATH)s

component/icu/buildout.cfg

+[buildout]
+
+parts = icu4c
+
+[icu4c]
+recipe = hexagonit.recipe.cmmi
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+url = http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz
+md5sum = ea93970a0275be6b42f56953cd332c17
+configure-command = source/configure
+configure-options = --prefix=${:location}

component/imagemagick/buildout.cfg

@@ -8,6 +8,7 @@ extends =
   ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
   ../ghostscript/buildout.cfg
+  ../librsvg/buildout.cfg
   ../libjpeg/buildout.cfg
   ../libpng/buildout.cfg
   ../libtiff/buildout.cfg
@@ -27,10 +28,11 @@ filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
 
 [imagemagick]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.5-10.tar.bz2
-md5sum = 99bc7ec1e756fa75f1af6150df3d1383
+url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.8-6.tar.bz2
+md5sum = e9d90a09b42fe8d9a8cf807274adff30
 depends =
   ${libtiff:version}
+  ${librsvg:version}
 configure-options =
   --disable-static
   --without-x
@@ -50,19 +52,19 @@ configure-options =
   --without-lzma
   --without-openexr
   --without-pango
-  --without-rsvg
   --without-wmf
   --without-xml
   --with-bzlib=${bzip2:location}
   --with-zlib=${zlib:location}
   --with-ltdl-include=${libtool:location}/include
   --with-ltdl-lib=${libtool:location}/lib
+  --with-rsvg=${librsvg:location}
   --with-frozenpaths
 patch-options = -p1
 patches =
   ${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:location}/${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:filename}
 environment =
   PATH=${freetype:location}/bin:${ghostscript:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${librsvg:location}/lib/pkgconfig
   CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib

component/java/buildout.cfg

@@ -29,9 +29,11 @@ slapos_promisee =
   directory:javaws
   file:lib/rt.jar
   file:bin/java
-x86 = http://download.oracle.com/otn-pub/java/jdk/6u30-b12/jre-6u30-linux-i586.bin 3e80243483bc825c34ae01a4373cce5f
-x86-64 = http://download.oracle.com/otn-pub/java/jdk/6u30-b12/jre-6u30-linux-x64.bin a4d28c49251d6b9c2d300b3d61f1ce95
+# http://java.com/en/download/manual.jsp?locale=en
+x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=59621 7466b0b86bef21e3e31ae578b2b9f472
+x86-64 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=59623 c5cfb8393d257b51e7a70e56b7784ac9
 script =
+  import glob
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
   download_file = self.download(self.options['url'], self.options.get('md5sum'))
   extract_dir = tempfile.mkdtemp(self.name)
@@ -43,7 +45,7 @@ script =
   subprocess.call([auto_extract_bin])
   self.cleanup_dir_list.append(extract_dir)
   workdir = guessworkdir(extract_dir)
-  self.copyTree(os.path.join(workdir, "jre1.6.0_30"), "%(location)s")
+  self.copyTree(glob.glob(os.path.join(workdir, "jre1.6.0_*"))[0], "%(location)s")
 
 [java-sdk-1.6.0]
 recipe = slapos.recipe.build

component/leptonica/buildout.cfg

+[buildout]
+parts = leptonica
+extends =
+  ../libtool/buildout.cfg
+  ../zlib/buildout.cfg
+  ../libjpeg/buildout.cfg
+  ../libpng/buildout.cfg
+  ../libtiff/buildout.cfg
+  ../webp/buildout.cfg
+  ../giflib/buildout.cfg
+
+[leptonica]
+recipe = hexagonit.recipe.cmmi
+url = http://leptonica.googlecode.com/files/leptonica-1.68.tar.gz
+md5sum = 5cd7092f9ff2ca7e3f3e73bfcd556403
+configure-command =
+  ./autogen.sh
+  ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static
+patch-options = -p1
+patches =
+  ${leptonica-1.69-zlib-include.patch:location}/${leptonica-1.69-zlib-include.patch:filename}
+environment =
+  ACLOCAL_ARGS=-I${libtool:location}/share/aclocal
+  CPPFLAGS=-I${zlib:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${webp:location}/include -I${giflib:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${giflib:location}/lib -Wl,-rpath=${giflib:location}/lib
+
+[leptonica-1.69-zlib-include.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = cff3dc942075190939b407c38e0d3201
+download-only = true
+filename = ${:_buildout_section_name_}

component/leptonica/leptonica-1.69-zlib-include.patch

+This patch is originally taken from:
+
+http://leptonica.googlecode.com/issues/attachment?aid=560001000&name=zlib-include.patch&token=m2sugSYxB4xwAuNgrKXyHTxBYNg%3A1337345966091
+
+To fix the following issue with leptonica:
+
+http://code.google.com/p/leptonica/issues/detail?id=56
+
+diff -Nurd -x'*~' leptonica-1.68.orig/src/pngio.c leptonica-1.68/src/pngio.c
+--- leptonica-1.68.orig/src/pngio.c	2011-02-01 00:41:12.000000000 -0500
++++ leptonica-1.68/src/pngio.c	2011-07-09 09:17:17.000000000 -0400
+@@ -108,6 +108,10 @@
+ 
+ #include "png.h"
+ 
++#ifdef HAVE_LIBZ
++#include "zlib.h"
++#endif
++
+ /* ----------------Set defaults for read/write options ----------------- */
+     /* strip 16 bpp --> 8 bpp on reading png; default is for stripping */
+ static l_int32   var_PNG_STRIP_16_TO_8 = 1;

component/libcap/buildout.cfg

+[buildout]
+
+extends =
+  ../attr/buildout.cfg
+
+parts = libcap
+
+[libcap2]
+recipe = slapos.recipe.build
+format = no
+url = http://pkgs.fedoraproject.org/lookaside/pkgs/libcap/libcap-2.22.tar.bz2/ce64058bdb3f086ddbfca8ce6c919845/libcap-2.22.tar.bz2
+md5sum = ce64058bdb3f086ddbfca8ce6c919845
+attr-include = ${attr:location}/include/
+attr-lib = ${attr:location}/lib/
+slapos_promise =
+  directory:sbin
+  directory:usr/include
+  statlib:lib/libcap.a
+  file:lib/libcap.so
+  file:sbin/getcap
+  file:sbin/setcap
+script =
+  import os
+  url = self.download(self.options['url'], self.options['md5sum'])
+  extract_dir = self.extract(url)
+  workdir = guessworkdir(extract_dir)
+  cflags = '-I%(attr)s' % {'attr': self.options['attr-include']}
+  ldflags = '-L%(attr)s -Wl,-rpath=%(attr)s' % {'attr': self.options['attr-lib']}
+  call(['make', 'CFLAGS=%s' % cflags, 'LDFLAGS=%s' % ldflags, 'DESTDIR=%s' % self.options['location'], 'RAISE_SETFCAP=no', 'install'],
+       cwd=workdir, env=env)
+  lib64 = os.path.join(self.options['location'], 'lib64')
+  lib = os.path.join(self.options['location'], 'lib')
+  # XXX: Dirty if case
+  #      if lib64 exists, then create a symlink from lib to lib64
+  os.path.exists(lib64) and os.symlink(lib64, lib)
+
+[libcap]
+<= libcap2

component/libdmtx/buildout.cfg

+# libdmtx - open source software for reading and writing Data Matrix barcodes.
+# http://www.libdmtx.org/
+
+[buildout]
+extends =
+  ../imagemagick/buildout.cfg
+  ../jbigkit/buildout.cfg
+parts =
+  libdmtx
+  dmtx-utils
+
+[libdmtx]
+recipe = hexagonit.recipe.cmmi
+url = http://prdownloads.sourceforge.net/libdmtx/libdmtx-0.7.4.tar.bz2
+md5sum = d3a4c0becd92895eb606dbdb78b023e2
+configure-options =
+  --disable-static
+
+[dmtx-utils]
+recipe = hexagonit.recipe.cmmi
+url = http://prdownloads.sourceforge.net/libdmtx/dmtx-utils-0.7.4.tar.bz2
+md5sum = b132ab9fb1d289869469b8bb4959a08a
+configure-options =
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${imagemagick:location}/lib/pkgconfig:${libdmtx:location}/lib/pkgconfig
+  CPPFLAGS=-I${libdmtx:location}/include
+  LDFLAGS=-Wl,-rpath=${jbigkit:location}/lib

component/libexpat/buildout.cfg

@@ -4,7 +4,7 @@ parts =
 
 [libexpat]
 recipe = hexagonit.recipe.cmmi
-url = http://sourceforge.net/projects/expat/files/expat/2.0.1/expat-2.0.1.tar.gz/download
-md5sum = ee8b492592568805593f81f8cdf2a04c
+url = http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download
+md5sum = dd7dab7a5fea97d2a6a43f511449b7cd
 configure-options =
   --disable-static

component/libpng/buildout.cfg

@@ -16,10 +16,10 @@ environment =
 
 [libpng12]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.2.47.tar.bz2
-md5sum = 4389dab9fcd2f9d57ac14701b9115f59
+url = http://download.sourceforge.net/libpng/libpng-1.2.50.tar.bz2
+md5sum = 717caa58e9c71a80820eb38c4f4d6ec3
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.9.tar.bz2
-md5sum = 684ba5f05da436a99c6303a83c7856d6
+url = http://download.sourceforge.net/libpng/libpng-1.5.12.tar.bz2
+md5sum = d87f9c34ccab8242c00e41925839f6c9

component/libreoffice-bin/buildout.cfg

@@ -12,12 +12,12 @@ find-links =
 [libreoffice-bin]
 recipe = slapos.recipe.build
 # here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
-version = 3.5.1
+version = 3.5.5
 url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
 
 # supported architectures md5sums
-md5sum_x86 = ee46fdafb8361b8e131994508c2723b3
-md5sum_x86-64 = ddda58719358e5c97ca5d1c118646574
+md5sum_x86 = 88434a91af56a751fad2e737c2ad6bba
+md5sum_x86-64 = a8c2c35af75807c3ed6c8d04fe6c6419
 
 # where office code can be found?
 officedir = libreoffice3.5

component/librsvg/buildout.cfg

+[buildout]
+parts = librsvg
+extends = 
+  ../bzip2/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../zlib/buildout.cfg
+  ../gtk-2/buildout.cfg
+  ../xorg/buildout.cfg
+
+[libcroco]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.3.tar.bz2
+md5sum = e1e93eeff4367c896f3959af34ba20eb
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${pkgconfig:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
+
+[librsvg]
+recipe = hexagonit.recipe.cmmi
+version = 2.36.1
+url = http://www.nexedi.org/static/tarballs/librsvg/librsvg-${:version}.tar.gz
+md5sum = 699cb7124d319035346e69782baa7c36
+# The original source provided by gnome is tar.xz and it is not a supported compression
+# on hexagonit.recipe.cmmi neither by slapos.recipe.build, so keep alternative source
+# with tar.gz format as a temporary alternative for this.
+# url = http://ftp.acc.umu.se/pub/GNOME/sources/librsvg/2.36/librsvg-2.36.1.tar.xz
+configure-options =
+  --disable-static
+  --disable-gtk-theme
+  --disable-pixbuf-loader
+  --disable-gtk-doc
+  --disable-tools
+  --disable-gtk-doc-html
+  --enable-introspection=no
+environment = 
+  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${pango:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${cairo:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib

component/libtiff/buildout.cfg

@@ -9,14 +9,15 @@ parts =
 
 [libtiff]
 recipe = hexagonit.recipe.cmmi
-version = 4.0.1
+version = 4.0.2
 #url = http://download.osgeo.org/libtiff/tiff-${:version}.tar.gz
 # server is down - circumvent
 url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz
-md5sum = fae149cc9da35c598d8be897826dfc63
+md5sum = 04a08fa1e07e696e820a0c3f32465a13
 configure-options =
   --disable-static
   --without-x
+  --disable-lzma
 environment =
   CPPFLAGS=-I${libjpeg:location}/include -I${jbigkit:location}/include -I${zlib:location}/include
   LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/libuuid/buildout.cfg

@@ -4,7 +4,7 @@ parts =
 
 [libuuid]
 recipe = hexagonit.recipe.cmmi
-url = http://mirror.be.gbxs.net/pub/linux/utils/util-linux-ng/v2.18/util-linux-ng-2.18.tar.bz2
+url = http://www.kernel.org/pub/linux/utils/util-linux/v2.18/util-linux-ng-2.18.tar.bz2
 md5sum = 2f5f71e6af969d041d73ab778c141a77
 configure-options =
   --disable-static

component/libxml2/buildout.cfg

@@ -8,11 +8,12 @@ parts =
 
 [libxml2]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz
-md5sum = 8127a65e8c3b08856093099b52599c86
+url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz
+md5sum = c62106f02ee00b6437f0fb9d370c1093
 configure-options =
   --disable-static
   --without-python
+  --without-lzma
   --with-zlib=${zlib:location}
 environment =
     LDFLAGS = -Wl,-rpath=${zlib:location}/lib

component/libyaml/buildout.cfg

+[buildout]
+
+parts =
+  libyaml
+
+[libyaml]
+recipe = hexagonit.recipe.cmmi
+url = http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz
+md5sum = 36c852831d02cf90508c29852361d01b

component/lxc/buildout.cfg

+[buildout]
+
+extends =
+  ../patch/buildout.cfg
+  ../attr/buildout.cfg
+  ../libcap/buildout.cfg
+
+parts = lxc
+
+[lxc]
+<= lxc-0.8
+
+[lxc-0.8.0-rc2-libexecdir-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = libexecdir-fix.patch
+download-only = true
+md5sum = d674463ccb3a7c205c2326fb4ab5436b
+
+[lxc-0.8.0-rc2-lxc-ls-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = lxc-ls-fix.patch
+download-only = true
+md5sum = 28c155a554d4f4856351085494585c73
+
+[lxc-0.8.0-rc2-cap_get_flag-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = cap_get_flag-fix.patch
+download-only = true
+md5sum = 8d3706a9bd60b6ebfea33998644b1a99
+
+[lxc-0.8]
+recipe = hexagonit.recipe.cmmi
+url = http://lxc.sourceforge.net/download/lxc/lxc-0.8.0-rc2.tar.gz
+md5sum = 9bd6988542fd7dd198d056ef3a2db9f6
+patch-binary = ${patch:location}/bin/patch
+patch-options = -p1
+patches =
+  ${lxc-0.8.0-rc2-cap_get_flag-patch:location}/${lxc-0.8.0-rc2-cap_get_flag-patch:filename}
+  ${lxc-0.8.0-rc2-libexecdir-patch:location}/${lxc-0.8.0-rc2-libexecdir-patch:filename}
+  ${lxc-0.8.0-rc2-lxc-ls-patch:location}/${lxc-0.8.0-rc2-lxc-ls-patch:filename}
+environment =
+  PATH=%(PATH)s:${attr:location}/bin/:${libcap:location}/sbin/
+  CFLAGS=-I${libcap:location}/usr/include
+  LDFLAGS=-L${libcap:location}/lib/ -Wl,-rpath=${libcap:location}/lib/

component/lxc/cap_get_flag-fix.patch

+commit 94767c5249b5802a894f6d84f6245ef86f50bff3
+Author: Serge Hallyn <serge.hallyn@ubuntu.com>
+Date:   Fri Jun 29 10:37:07 2012 -0500
+
+    Fix lxc's handling of CAP_LAST_CAP
+    
+    CAP_LAST_CAP in linux/capability.h doesn't always match what the kernel
+    actually supports.  If the kernel supports fewer capabilities, then a
+    cap_get_flag for an unsupported capability returns -EINVAL.
+    
+    Recognize that, and don't fail when initializing capabilities when this
+    happens, rather accept that we've reached the last capability.
+    
+    Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
+
+diff --git a/src/lxc/caps.c b/src/lxc/caps.c
+index 10a0b4a..c32e7e4 100644
+--- a/src/lxc/caps.c
++++ b/src/lxc/caps.c
+@@ -28,6 +28,7 @@
+ #include <limits.h>
+ #include <sys/prctl.h>
+ #include <sys/capability.h>
++#include <errno.h>
+ 
+ #include "log.h"
+ 
+@@ -90,6 +91,7 @@ int lxc_caps_up(void)
+ 	cap_t caps;
+ 	cap_value_t cap;
+ 	int ret;
++	int lastcap = 0;
+ 
+ 	/* when we are run as root, we don't want to play
+ 	 * with the capabilities */
+@@ -108,9 +110,15 @@ int lxc_caps_up(void)
+ 
+ 		ret = cap_get_flag(caps, cap, CAP_PERMITTED, &flag);
+ 		if (ret) {
+-			ERROR("failed to cap_get_flag: %m");
+-			goto out;
++			if (errno == EINVAL) {
++				INFO("Last supported cap was %d\n", cap-1);
++				break;
++			} else {
++				ERROR("failed to cap_get_flag: %m");
++				goto out;
++			}
+ 		}
++		lastcap = cap;
+ 
+ 		ret = cap_set_flag(caps, CAP_EFFECTIVE, 1, &cap, flag);
+ 		if (ret) {

component/lxc/libexecdir-fix.patch

+commit 00ad19d4dba5c05401125d4217dc8f4e7fd9403a
+Author: David Ward <david.ward@ll.mit.edu>
+Date:   Fri May 4 00:50:15 2012 +0200
+
+    lxc-setcap/lxc-setuid: add autoconf expansion for $libexecdir
+    
+    Support new default location for LXCINITDIR.
+    
+    Signed-off-by: David Ward <david.ward@ll.mit.edu>
+    Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
+
+diff --git a/configure.ac b/configure.ac
+index c2bf4b0..0c8aa69 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,6 +40,7 @@ AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = "xyes"])
+ AS_AC_EXPAND(PREFIX, $prefix)
+ AS_AC_EXPAND(LIBDIR, $libdir)
+ AS_AC_EXPAND(BINDIR, $bindir)
++AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
+ AS_AC_EXPAND(INCLUDEDIR, $includedir)
+ AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+ AS_AC_EXPAND(DATADIR, $datadir)
+diff --git a/src/lxc/lxc-setcap.in b/src/lxc/lxc-setcap.in
+index 52d4b48..71e3710 100644
+--- a/src/lxc/lxc-setcap.in
++++ b/src/lxc/lxc-setcap.in
+@@ -84,6 +84,7 @@ lxc_dropcaps()
+ shortoptions='hd'
+ longoptions='help'
+ libdir=@LIBDIR@
++libexecdir=@LIBEXECDIR@
+ localstatedir=@LOCALSTATEDIR@
+ 
+ getopt=$(getopt -o $shortoptions --longoptions  $longoptions -- "$@")
+diff --git a/src/lxc/lxc-setuid.in b/src/lxc/lxc-setuid.in
+index 0919eac..020dfae 100644
+--- a/src/lxc/lxc-setuid.in
++++ b/src/lxc/lxc-setuid.in
+@@ -81,6 +81,7 @@ lxc_dropuid()
+ shortoptions='hd'
+ longoptions='help'
+ libdir=@LIBDIR@
++libexecdir=@LIBEXECDIR@
+ localstatedir=@LOCALSTATEDIR@
+ 
+ getopt=$(getopt -o $shortoptions --longoptions  $longoptions -- "$@")

component/lxc/lxc-ls-fix.patch

+commit 7ef0141356454503ab81460290b5dffa32c1f441
+Author: David Ward <david.ward@ll.mit.edu>
+Date:   Fri May 4 00:50:15 2012 +0200
+
+    refresh lxc-ls
+    
+    Add an '--active' option that lists active containers by searching
+    cgroups. (Otherwise, the directories in /var/lib/lxc are listed.)
+    Modify the cgroup search to only use hierarchies that contain one
+    or more subsystems. When searching, if a hierarchy contains the
+    'ns' subsystem, do not append '/lxc' to the parent cgroup.
+    
+    Add a '--help' option that prints the command syntax.
+    
+    Print error messages and help information to stderr.
+    
+    Update the documentation.
+    
+    Signed-off-by: David Ward <david.ward@ll.mit.edu>
+    Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
+
+diff --git a/doc/lxc-ls.sgml.in b/doc/lxc-ls.sgml.in
+index 3ffd4f8..d33e9b3 100644
+--- a/doc/lxc-ls.sgml.in
++++ b/doc/lxc-ls.sgml.in
+@@ -48,7 +48,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 
+   <refsynopsisdiv>
+     <cmdsynopsis>
+-      <command>lxc-ls <optional>ls option</optional>
++      <command>lxc-ls <optional>--active</optional> <optional>ls option</optional>
+       </command>
+     </cmdsynopsis>
+   </refsynopsisdiv>
+@@ -67,6 +67,17 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 
+       <varlistentry>
+ 	<term>
++	  <option><optional>--active</optional></option>
++	</term>
++	<listitem>
++	  <para>
++	    List active containers.
++	  </para>
++	</listitem>
++      </varlistentry>
++
++      <varlistentry>
++	<term>
+ 	  <option><optional>ls options</optional></option>
+ 	</term>
+ 	<listitem>
+@@ -94,10 +105,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+       </varlistentry>
+ 
+       <varlistentry>
+-	<term>lxc-ls -1</term>
++	<term>lxc-ls --active -1</term>
+ 	<listitem>
+ 	<para>
+-	  list all the containers and display the list in one column.
++	  list active containers and display the list in one column.
+ 	</para>
+ 	</listitem>
+       </varlistentry>
+diff --git a/src/lxc/lxc-ls.in b/src/lxc/lxc-ls.in
+index a1ad642..11a3b45 100644
+--- a/src/lxc/lxc-ls.in
++++ b/src/lxc/lxc-ls.in
+@@ -1,43 +1,100 @@
+ #!/bin/bash
+ 
+-localstatedir=@LOCALSTATEDIR@
+-lxcpath=@LXCPATH@
++#
++# lxc: linux Container library
+ 
+-if [ ! -r $lxcpath ]; then
+-    exit 0
+-fi
++# This library is free software; you can redistribute it and/or
++# modify it under the terms of the GNU Lesser General Public
++# License as published by the Free Software Foundation; either
++# version 2.1 of the License, or (at your option) any later version.
++
++# This library is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# Lesser General Public License for more details.
++
++# You should have received a copy of the GNU Lesser General Public
++# License along with this library; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++localstatedir=@LOCALSTATEDIR@
++lxc_path=@LXCPATH@
+ 
+-function get_cgroup()
++usage()
+ {
+-	local mount_string
+-	mount_string=$(mount -t cgroup |grep -E -e '^lxc ')
+-	if test -n "$mount_string"; then
+-		mount_point=$(echo $mount_string |cut -d' ' -f3)
+-		return
+-	fi
+-	mount_string=`grep -m1 -E '^[^ \t]+[ \t]+[^ \t]+[ \t]+cgroup' /proc/self/mounts`;
+-	if test -z "$mount_string"; then
+-		echo "failed to find mounted cgroup"
+-		exit 1
+-	fi
+-	mount_point=`echo "$mount_string" |cut -d' ' -f2`;
++	echo "usage: $(basename $0) [--active] [--] [LS_OPTIONS...]" >&2
+ }
+ 
+-ls "$@" $lxcpath
++help() {
++	usage
++	echo >&2
++	echo "List containers existing on the system." >&2
++	echo >&2
++	echo "  --active     list active containers" >&2
++	echo "  LS_OPTIONS   ls command options (see \`ls --help')" >&2
++}
++
++get_parent_cgroup()
++{
++	local hierarchies hierarchy fields subsystems init_cgroup mountpoint
++
++	parent_cgroup=""
++
++	# Obtain a list of hierarchies that contain one or more subsystems
++	hierarchies=$(tail -n +2 /proc/cgroups | cut -f 2)
+ 
+-active=$(netstat -xl 2>/dev/null | grep $lxcpath | \
+-	sed -e 's#.*'"$lxcpath/"'\(.*\)/command#\1#');
++	# Iterate through the list until a suitable hierarchy is found
++	for hierarchy in $hierarchies; do
++		# Obtain information about the init process in the hierarchy
++		fields=$(grep -E "^$hierarchy:" /proc/1/cgroup | head -n 1)
++		if [ -z "$fields" ]; then continue; fi
++		fields=${fields#*:}
+ 
+-if test -n "$active"; then
+-	get_cgroup
+-	if test -n "$mount_point"; then
+-		# get cgroup for init
+-		init_cgroup=`cat /proc/1/cgroup | awk -F: '{ print $3 }' | head -1`
+-		if [ ! -d $mount_point/$init_cgroup/lxc  ]; then
+-			cd $mount_point/$init_cgroup
++		# Get a comma-separated list of the hierarchy's subsystems
++		subsystems=${fields%:*}
++
++		# Get the cgroup of the init process in the hierarchy
++		init_cgroup=${fields#*:}
++
++		# Get the filesystem mountpoint of the hierarchy
++		mountpoint=$(grep -E "^cgroup [^ ]+ [^ ]+ ([^ ]+,)?$subsystems(,[^ ]+)? " /proc/self/mounts | cut -d ' ' -f 2)
++		if [ -z "$mountpoint" ]; then continue; fi
++
++		# Return the absolute path to the containers' parent cgroup
++		# (do not append '/lxc' if the hierarchy contains the 'ns' subsystem)
++		if [[ ",$subsystems," == *,ns,* ]]; then
++			parent_cgroup="${mountpoint}${init_cgroup%/}"
+ 		else
+-			cd $mount_point/$init_cgroup/lxc
++			parent_cgroup="${mountpoint}${init_cgroup%/}/lxc"
+ 		fi
+-		ls "$@" -d $active
+-	fi
++		break
++	done
++}
++
++directory="$lxc_path"
++
++for i in "$@"; do
++	case $i in
++		--help)
++			help; exit 1;;
++		--active)
++			get_parent_cgroup; directory="$parent_cgroup"; shift;;
++		--)
++			shift; break;;
++		*)
++			break;;
++        esac
++done
++
++containers=""
++if [ ! -z "$directory" ]; then
++	containers=$(find $directory -mindepth 1 -maxdepth 1 -type d -printf "%f\n" 2>/dev/null)
+ fi
++
++if [ -z "$containers" ]; then
++	echo "$(basename $0): no containers found" >&2
++	exit 1
++fi
++
++cd "$directory"
++ls -d $@ $containers

component/m4/buildout.cfg

@@ -2,7 +2,19 @@
 parts =
   m4
 
+[m4-drop.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = dc5f06fb42649e181c40177eb1edc333
+download-only = true
+filename = drop.gets.patch
+
 [m4]
+virtual-depends = ${m4-drop.gets.patch:md5sum}
+patch-options = -p1
+patches =
+  ${m4-drop.gets.patch:location}/${m4-drop.gets.patch:filename}
+
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.bz2
 md5sum = 8a7cef47fecab6272eb86a6be6363b2f

component/m4/drop.gets.patch

+diff -ur m4-1.4.16.orig/lib/stdio.in.h m4-1.4.16/lib/stdio.in.h
+--- m4-1.4.16.orig/lib/stdio.in.h	2011-03-01 17:39:29.000000000 +0100
++++ m4-1.4.16/lib/stdio.in.h	2012-07-23 09:28:57.945703705 +0200
+@@ -162,7 +162,9 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@

component/mariadb/buildout.cfg

@@ -16,66 +16,6 @@ extends =
 parts =
   mariadb
 
-[mariadb-no_test-patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = d65f61829cfbcd5062f49db2b00bd6fe
-filename = mysql_create_system_tables__no_test.patch
-download-only = true
-
-[mariadb]
-recipe = hexagonit.recipe.cmmi
-version = 5.3.5-ga
-url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
-md5sum = 98ce0441b37c8d681855150495fdc03b
-# compile directory is required to build mysql plugins.
-keep-compile-dir = true
-# configure: how to avoid searching for my.cnf?
-#  - like in mysql part in http://svn.zope.org/zodbshootout/trunk/buildout.cfg?view=markup
-# we use embeded yassl instead of openssl to avoid compilation errors on sphinx search engine.
-configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-  --disable-static
-  --enable-thread-safe-client
-  --enable-local-infile
-  --enable-assembler
-  --with-pic
-  --with-fast-mutexes
-  --with-charset=utf8
-  --with-extra-charsets=complex
-  --with-collation=utf8_unicode_ci
-  --with-big-tables
-  --without-embedded-server
-  --with-plugins=max-no-ndb
-  --with-aria-tmp-tables
-  --without-plugin-oqgraph
-  --without-readline
-  --with-ssl
-  --with-libevent=${libevent:location}
-  --with-zlib-dir=${zlib:location}
-
-patch-options = -p0
-patches =
-  ${mariadb-no_test-patch:location}/${mariadb-no_test-patch:filename}
-environment =
-  CPPFLAGS=-I${ncurses:location}/include -I${readline5:location}/include
-  LDFLAGS=-Wl,-rpath=${libevent:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline5:location}/lib -Wl,-rpath=${readline5:location}/lib -Wl,-rpath=${zlib:location}/lib
-
-[mroonga-mariadb]
-recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-2.00.tar.gz
-md5sum = 49dab92863b5c3fa1d49344c73357ca2
-configure-options =
-  --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
-  --with-mysql-config=${mariadb:location}/bin/mysql_config
-depends =
-  ${mariadb:version}
-environment =
-  PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  CPPFLAGS=-I${groonga:location}/include/groonga
-  LDFLAGS=-L${groonga:location}/lib
-  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
-
 [mariadb-5.5-no_test-patch]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
@@ -83,11 +23,12 @@ md5sum = 14e6d713c16298a10f40d29f2b799aca
 filename = mariadb_5.5_create_system_tables__no_test.patch
 download-only = true
 
-[mariadb-5.5]
+[mariadb]
 recipe = hexagonit.recipe.cmmi
-version = 5.5.20
+version = 5.5.25
+revision = 1
 url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
-md5sum = e618343b5039fa468c0e1e6098785e3c
+md5sum = 943f67c267d73a4080ab497e11740daf
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0
@@ -103,12 +44,13 @@ configure-options =
   -DWITH_ZLIB=system
   -DWITH_READLINE=0
   -DWITH_PIC=1
+  -DENABLE_DTRACE=0
   -DWITH_EXTRA_CHARSETS=complex
   -DWITH_EMBEDDED_SERVER=0
   -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
   -DWITHOUT_DAEMON_EXAMPLE=1
-  -DWITH_SPHINX_STORAGE_ENGINE=1
   -DCMAKE_C_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
+  -DCMAKE_CXX_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
   -DCMAKE_INSTALL_RPATH=${libaio:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
 environment =
   CMAKE_PROGRAM_PATH=${cmake:location}/bin
@@ -116,17 +58,20 @@ environment =
   CMAKE_LIBRARY_PATH=${libaio:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
   LDFLAGS=-L${libaio:location}/lib
 
-[mroonga-mariadb-5.5]
+[mroonga-mariadb]
 recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-2.00.tar.gz
-md5sum = 49dab92863b5c3fa1d49344c73357ca2
+url = https://github.com/downloads/mroonga/mroonga/mroonga-2.05.tar.gz
+md5sum = 6aee0e6ff948bba7c02854326afc11df
 configure-options =
-  --with-mysql-source=${mariadb-5.5:location}__compile__/mariadb-${mariadb-5.5:version}
-  --with-mysql-config=${mariadb-5.5:location}/bin/mysql_config
+  --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
+  --with-mysql-config=${mariadb:location}/bin/mysql_config
 depends =
-  ${mariadb-5.5:version}
+  ${mariadb:version}
+  ${mariadb:revision}
 environment =
   PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga
   LDFLAGS=-L${groonga:location}/lib
   PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
+  CXXFLAGS=-Wno-deprecated
+# CXXFLAGS workaround: avoid depracation warning in order to compile on gcc 4.7+

component/mariadb/mariadb_5.5_create_system_tables__no_test.patch

+# 33_scripts__mysql_create_system_tables__no_test.dpatch by  <ch@debian.org>
+
+A user with no password prevents a normal user from login under certain
+circumstances as it is checked first.
+See http://bugs.debian.org/301741
+and http://bugs.mysql.com/bug.php?id=6901
+
+--- scripts/mysql_system_tables_data.sql	2008-12-04 22:59:44.000000000 +0100
++++ scripts/mysql_system_tables_data.sql	2008-12-04 23:00:07.000000000 +0100
+@@ -27,8 +27,6 @@
+ -- Fill "db" table with default grants for anyone to
+ -- access database 'test' and 'test_%' if "db" table didn't exist
+ CREATE TEMPORARY TABLE tmp_db LIKE db;
+-INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
+-INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
+ INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
+ DROP TABLE tmp_db;
+ 
+@@ -41,8 +39,6 @@
+ REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','' FROM dual WHERE LOWER( @current_hostname) != 'localhost';
+ REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
+ REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
+-INSERT INTO tmp_user (host,user) VALUES ('localhost','');
+-INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost';
+ INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
+ DROP TABLE tmp_user;
+ 

component/mariadb/mroonga-2.01-mariadb-5.5.23.patch

+--- ha_mroonga.cc.orig	2012-04-11 17:59:24.171323133 +0200
++++ ha_mroonga.cc	2012-04-11 18:01:50.431325458 +0200
+@@ -10319,10 +10319,11 @@
+ bool ha_mroonga::wrapper_auto_repair() const
+ {
+   bool res;
++  int ha_err = 0;
+   MRN_DBUG_ENTER_METHOD();
+   MRN_SET_WRAP_SHARE_KEY(share, table->s);
+   MRN_SET_WRAP_TABLE_KEY(this, table);
+-  res = wrap_handler->auto_repair();
++  res = wrap_handler->auto_repair(ha_err);
+   MRN_SET_BASE_SHARE_KEY(share, table->s);
+   MRN_SET_BASE_TABLE_KEY(this, table);
+   DBUG_RETURN(res);
+@@ -10330,9 +10331,10 @@
+ 
+ bool ha_mroonga::storage_auto_repair() const
+ {
++  int ha_err = 0;
+   MRN_DBUG_ENTER_METHOD();
+   // XXX: success is valid variable name?
+-  bool success = handler::auto_repair();
++  bool success = handler::auto_repair(ha_err);
+   DBUG_RETURN(success);
+ }
+ 

component/mariadb/plugin_handler_socket_libhsclient_fatal.patch

+# inspired by handlersocket-1.0.6-80-g88bf1e0-1.1-nmu.diff by gregoa@debian.org
+
+Description: add missing include to avoid FTBFS with gcc 4.7
+bug-debian: http://bugs.debian.org/667198
+More informations: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667198
+Author: gregor herrmann <gregoa@debian.org>
+
+--- plugin/handler_socket/libhsclient/fatal.cpp
++++ plugin/handler_socket/libhsclient/fatal.cpp
+@@ -9,6 +9,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <syslog.h>
++#include <unistd.h>
+
+ #include "fatal.hpp"

component/memcached/buildout.cfg

@@ -27,9 +27,9 @@ patches =
   ${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename} ${memcached-gcc-4.4.patch:location}/${memcached-gcc-4.4.patch:filename}
 patch-options = -p1
 configure-command =
-  aclocal-1.11
+  aclocal
   autoheader
-  automake-1.11 --foreign
+  automake --foreign
   autoconf
   ./configure
 configure-options =
@@ -37,5 +37,5 @@ configure-options =
   --with-libevent=${libevent:location}
   --disable-docs
 environment =
-  PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:%(PATH)s
+  PATH=${autoconf:location}/bin:${automake:location}/bin:%(PATH)s
   LDFLAGS =-Wl,-rpath=${libevent:location}/lib

component/memstrike/buildout.cfg

@@ -19,7 +19,7 @@ configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-libmemcached=${libmemcached:location}
 environment =
-  PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:%(PATH)s
+  PATH =${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s
   LDFLAGS =-Wl,-rpath=${libmemcached:location}/lib
 
 [memstrikesource]

component/mydumper/buildout.cfg

@@ -13,6 +13,8 @@ parts = mydumper
 # mydumper that works
 [mydumper]
 recipe = slapos.recipe.build
+depends =
+  ${mariadb:version}
 url = http://launchpad.net/mydumper/0.2/0.2.3/+download/mydumper-0.2.3.tar.gz
 md5sum = 36e6a1c97a9634a6882ddaac5e2697d5
 buildout-bin-dir = ${buildout:bin-directory}
@@ -21,9 +23,9 @@ mysql-config = ${mariadb:location}/bin/mysql_config
 doc-dependency = ${mydumper-doc:eggs}
 mysqllib = ${mariadb:location}/lib
 pkg-config-path = ${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/
-libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/mysql/
-includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include/mysql/
-cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include/mysql/
+libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/
+includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include/mysql
+cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include/mysql
 mydumper-patches =
    ${:_profile_base_location_}/mydumper-remove-warnings-errors.patch 917fea16b5ddea195cfa33fbd9827f57 -p1
 slapos_promise =

component/mysql-5.1/buildout.cfg

@@ -69,7 +69,7 @@ patches =
   ${mysql-5.1-sphinx-patch:location}/${mysql-5.1-sphinx-patch:filename}
   ${mysql-5.1-no_test-patch:location}/${mysql-5.1-no_test-patch:filename}
 environment =
-  PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
+  PATH =${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
   CPPFLAGS =-I${ncurses:location}/include -I${readline:location}/include
   LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib
 

component/mysql-5.5/buildout.cfg

@@ -57,7 +57,7 @@ configure-options =
   -DCMAKE_C_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${zlib:location}/include"
   -DCMAKE_INSTALL_RPATH=${libaio:location}/lib:${ncurses:location}/lib:${zlib:location}/lib
 environment =
-  CMAKE_PROGRAM_PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:${cmake:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin
+  CMAKE_PROGRAM_PATH=${autoconf:location}/bin:${automake:location}/bin:${cmake:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin
   CMAKE_INCLUDE_PATH=${libaio:location}/include:${ncurses:location}/include:${zlib:location}/include
   CMAKE_LIBRARY_PATH=${libaio:location}/lib:${ncurses:location}/lib:${zlib:location}/lib
   LDFLAGS=-L${libaio:location}/lib

component/mysql-python/buildout.cfg

@@ -13,8 +13,13 @@ PATH =${mariadb:location}/bin:%(PATH)s
 [mysql-python]
 recipe = zc.recipe.egg:custom
 egg = MySQL-python
+depends =
+  ${mariadb:version}
 environment = mysql-python-env
+library-dirs =
+  ${zlib:location}/lib/
+  ${openssl:location}/lib/
 rpath =
-  ${mariadb:location}/lib/mysql/
+  ${mariadb:location}/lib/
   ${zlib:location}/lib/
   ${openssl:location}/lib/

component/mysql-tritonn-5.0/buildout.cfg

@@ -33,7 +33,7 @@ configure-options =
 make-options =
   LIBTOOL=libtool
 environment =
-  PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:%(PATH)s
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s
 
 [mysql-5.0-tritonn-patch]
 recipe = hexagonit.recipe.download
@@ -87,6 +87,6 @@ patches =
   ${mysql-5.0-tritonn-patch:location}/${mysql-5.0-tritonn-patch:filename}
   ${mysql-5.0-sphinx-patch:location}/${mysql-5.0-sphinx-patch:filename}
 environment =
-    PATH=${senna:location}/bin:${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
+    PATH=${senna:location}/bin:${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
     CPPFLAGS=-I${senna:location}/include/senna -I${ncurses:location}/include -I${readline5:location}/include
     LDFLAGS=-L${senna:location}/lib -L${readline5:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline5:location}/lib

component/noVNC/buildout.cfg

@@ -4,5 +4,6 @@ parts =
 
 [noVNC]
 recipe = slapos.recipe.build:download-unpacked
-url = https://github.com/kanaka/noVNC/tarball/v0.2
+url = http://cloud.github.com/downloads/kanaka/noVNC/novnc-0.3.tar.gz
+md5sum = 95d3c58921fa188c179491e8ef2acc12
 strip-top-level-dir = true

component/nodejs/buildout.cfg

@@ -3,7 +3,6 @@ extends =
   ../git/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../openssl/buildout.cfg
-  ../python-2.7/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -12,13 +11,14 @@ parts =
 [nodejs]
 # Server-side Javascript.
 recipe = hexagonit.recipe.cmmi
-url = http://nodejs.org/dist/v0.6.12/node-v0.6.12.tar.gz
-md5sum = a12766ae4003c9712927d1fa134ed9f6
+url = http://nodejs.org/dist/v0.6.21/node-v0.6.21.tar.gz
+md5sum = 0da985a0bf820400af92363b9f453fe4
 configure-options =
   --openssl-includes=${openssl:location}/include
   --openssl-libpath=${openssl:location}/lib
 environment =
-  PATH=${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
+  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
+  PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
@@ -31,7 +31,7 @@ configure-options =
   --openssl-includes=${openssl:location}/include
   --openssl-libpath=${openssl:location}/lib
 environment =
-  PATH=${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/openldap/buildout.cfg

@@ -2,13 +2,14 @@
 parts =
   openldap
 extends =
+  ../groff/buildout.cfg
   ../openssl/buildout.cfg
   ../cyrus-sasl/buildout.cfg
 
 [openldap]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.26.tgz
-md5sum = f36f3086031dd56ae94f722ffae8df5e
+url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.31.tgz
+md5sum = 804c6cb5698db30b75ad0ff1c25baefd
 configure-options =
   --disable-static
   --disable-slapd
@@ -24,3 +25,4 @@ configure-options =
 environment =
   CPPFLAGS=-I${openssl:location}/include -I${cyrus-sasl:location}/include
   LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${cyrus-sasl:location}/lib -Wl,-rpath=${cyrus-sasl:location}/lib
+  PATH=${groff:location}/bin:%(PATH)s

component/openssl/buildout.cfg

@@ -7,6 +7,7 @@
 extends =
   ../ca-certificates/buildout.cfg
   ../zlib/buildout.cfg
+  ../patch/buildout.cfg
 
 parts =
   openssl
@@ -28,8 +29,9 @@ download-only = true
 
 [openssl]
 recipe = hexagonit.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.1.tar.gz
-md5sum = 134f168bc2a8333f19f81d684841710b
+url = https://www.openssl.org/source/openssl-1.0.1c.tar.gz
+md5sum = ae412727c8c15b67880aef7bd2999b2e
+patch-binary = ${patch:location}/bin/patch
 patches =
   ${openssl-nodoc.patch:location}/${openssl-nodoc.patch:filename}
   ${openssl-exlibs.patch:location}/${openssl-exlibs.patch:filename}

component/perl-DBD-mariadb/buildout.cfg

@@ -10,6 +10,7 @@ parts =
 recipe = hexagonit.recipe.cmmi
 version = 4.019
 depends =
+  ${mariadb:version}
   ${perl:version}
   ${perl-DBI:version}
 url = http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.019.tar.gz
@@ -20,4 +21,4 @@ patch-options = -p1
 configure-command =
   ${perl:location}/bin/perl Makefile.PL --mysql_config=${mariadb:location}/bin/mysql_config
 environment =
-  OTHERLDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib/mysql -Wl,-rpath=${openssl:location}/lib
\ No newline at end of file
+  OTHERLDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib -Wl,-rpath=${openssl:location}/lib

component/perl/buildout.cfg

@@ -16,9 +16,9 @@ filename = ${:_buildout_section_name_}
 recipe = hexagonit.recipe.cmmi
 depends =
   ${gdbm:version}
-version = 5.14.2
+version = 5.16.0
 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
-md5sum = 04a4c5d3c1f9f19d77daff8e8cd19a26
+md5sum = 15a2f95fb27231e10998240f13acf961
 siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
 patch-options = -p1
 patches =

component/pil-python/buildout.cfg

+[buildout]
+extends =
+  ../freetype/buildout.cfg
+  ../libjpeg/buildout.cfg
+  ../zlib/buildout.cfg
+
+parts =
+  pil-python
+
+[pil-python]
+recipe = zc.recipe.egg:custom
+egg = PIL
+include-dirs =
+  ${freetype:location}/include
+  ${libjpeg:location}/include
+  ${zlib:location}/include
+library-dirs =
+  ${freetype:location}/lib
+  ${libjpeg:location}/lib
+  ${zlib:location}/lib
+rpath =
+  ${freetype:location}/lib
+  ${libjpeg:location}/lib
+  ${zlib:location}/lib

component/pkgconfig/buildout.cfg

@@ -11,7 +11,7 @@ extends =
 
 [pkgconfig]
 recipe = hexagonit.recipe.cmmi
-url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
+url = ftp://mirror.ovh.net/gentoo-distfiles/distfiles/pkg-config-0.26.tar.gz
 md5sum = 47525c26a9ba7ba14bf85e01509a7234
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 # build pkg-config twice so that second configure can use pkg-config

component/poppler/buildout.cfg

@@ -12,12 +12,9 @@ extends =
   ../zlib/buildout.cfg
 
 [poppler]
-<= poppler-0.17.1
-
-[poppler-0.17.1]
 recipe = hexagonit.recipe.cmmi
-md5sum = b566d1fbaa29b9257bf0ecc130e7b2ca
-url = http://poppler.freedesktop.org/poppler-0.17.2.tar.gz
+md5sum = 45dd2c16c8c4d1a39e830e45745c4e25
+url = http://poppler.freedesktop.org/poppler-0.20.2.tar.gz
 depends =
   ${libtiff:version}
 configure-options =

component/python-2.6/buildout.cfg

@@ -10,6 +10,7 @@ extends =
   ../readline/buildout.cfg
   ../sqlite3/buildout.cfg
   ../zlib/buildout.cfg
+  ../file/buildout.cfg
 
 parts =
     python2.6
@@ -31,12 +32,12 @@ depends =
 prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
 version = 2.6
 package_version = ${:version}.8
-package_version_suffix = rc1
+package_version_suffix =
 executable = ${:prefix}/bin/python${:version}
 
 url =
   http://python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tar.bz2
-md5sum = df6ccdac7da3b7c7c79124b92110277e
+md5sum = c6e0420a21d8b23dee8b0195c9b9a125
 patch-options = -p1
 patches =
   ${python-2.6.6-no_system_inc_dirs.patch:location}/${python-2.6.6-no_system_inc_dirs.patch:filename}
@@ -45,9 +46,11 @@ configure-options =
   --enable-unicode=ucs4
   --with-threads
 
+# the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
+# which would otherwise load the system libmagic.so with ctypes
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
 
 [bootstrap2.6]
 recipe = zc.recipe.egg

component/python-2.7/buildout.cfg

@@ -9,6 +9,7 @@ extends =
   ../readline/buildout.cfg
   ../sqlite3/buildout.cfg
   ../zlib/buildout.cfg
+  ../file/buildout.cfg
 
 parts =
     python2.7
@@ -25,8 +26,8 @@ python = python2.7
 [python2.7]
 recipe = hexagonit.recipe.cmmi
 package_version = 2.7.3
-package_version_suffix = rc1
-md5sum = 72aaa940dfa2777de161d7cb27c91df7
+package_version_suffix =
+md5sum = c57477edd6d18bd9eeca2f21add73919
 
 depends =
   ${gdbm:version}
@@ -44,6 +45,8 @@ configure-options =
   --with-system-expat
   --with-threads
 
+# the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
+# which would otherwise load the system libmagic.so with ctypes
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib

component/rpm2cpio/buildout.cfg

@@ -4,5 +4,5 @@ parts =
 
 [rpm2cpio]
 recipe = slapos.recipe.build:download
-url = http://ruda.googlecode.com/hg/rpm/rpm2cpio.py
-md5sum = 06001f57616581312f9599e104f2473a
+url = http://ruda.googlecode.com/hg-history/2989f0531de63872cc7327590798d1898ac91246/rpm/rpm2cpio.py
+md5sum = c5bb6227d99e1ff5df880f997cbed2e3

component/ruby/buildout.cfg

+[buildout]
+
+extends =
+  ../libyaml/buildout.cfg
+
+parts = ruby
+
+[ruby-1.9.3]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz
+md5sum = bc0c715c69da4d1d8bd57069c19f6c0e
+configure-options =
+  --enable-shared --enable-rpath
+environment =
+  CFLAGS=-I${libyaml:location}/include
+  LDFLAGS=-L${libyaml:location}/lib -Wl,-rpath=${libyaml:location}/lib
+
+[ruby-1.9]
+<= ruby-1.9.3
+
+[ruby]
+<= ruby-1.9

component/slapos/buildout.cfg

@@ -19,6 +19,7 @@ extends =
   ../sqlite3/buildout.cfg
   ../swig/buildout.cfg
   ../zlib/buildout.cfg
+  ../patch/buildout.cfg
 
 parts =
   slapos
@@ -47,7 +48,7 @@ allowed-eggs-from-site-packages =
 [environment]
 # Note: For now original PATH is appeneded to the end, as not all tools are
 #       provided by SlapOS
-PATH=${bison:location}/bin:${bzip2:location}/bin:${gettext:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${libxslt:location}/bin:${m4:location}/bin:${ncurses:location}/bin:${openssl:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin:${readline:location}/bin:${sqlite3:location}/bin:${swig:location}/bin:${buildout:bin-directory}:$PATH
+PATH=${bison:location}/bin:${bzip2:location}/bin:${gettext:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${libxslt:location}/bin:${m4:location}/bin:${ncurses:location}/bin:${openssl:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin:${readline:location}/bin:${sqlite3:location}/bin:${swig:location}/bin:${buildout:bin-directory}:${patch:location}/bin:$PATH
 CFLAGS=-I${bzip2:location}/include -I${gdbm:location}/include -I${gettext:location}/include -I${glib:location}/include -I${libxml2:location}/include -I${libxslt:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${popt:location}/include -I${readline:location}/include -I${sqlite3:location}/include -I${zlib:location}/include
 CPPFLAGS=${:CFLAGS}
 LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${libxslt:location}/lib -Wl,-rpath=${libxslt:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
@@ -110,49 +111,56 @@ scripts =
   slapgrid-supervisorctl = slapos.grid.svcbackend:supervisorctl
   slapgrid-supervisord = slapos.grid.svcbackend:supervisord
   slapproxy = slapos.proxy:main
+  slapos = slapos.entry:main
 
 [versions]
-zc.buildout = 1.6.0-dev-SlapOS-004
+zc.buildout = 1.6.0-dev-SlapOS-006
 
-# Generated by buildout-versions
 Jinja2 = 2.6
+Pygments = 1.5
 Werkzeug = 0.8.3
 buildout-versions = 1.7
 collective.recipe.template = 1.9
-hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3.4
+docutils = 0.9.1
+hexagonit.recipe.cmmi = 1.6
+ipython = 0.13
+lxml = 2.3.5
 meld3 = 0.6.8
-netaddr = 0.7.6
-slapos.core = 0.24
+netaddr = 0.7.7
+slapos.core = 0.28.5
 slapos.libnetworkcache = 0.12
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.24
-Flask = 0.8
+# slapos.core==0.28.5
+Flask = 0.9
 
 # Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+# netaddr==0.7.7
+Sphinx = 1.1.3
 
 # Required by:
-# slapos.core==0.24
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.5.1
+
+# Required by:
+# slapos.core==0.28.5
 netifaces = 0.8
 
 # Required by:
-# slapos.core==0.24
+# slapos.core==0.28.5
 # slapos.libnetworkcache==0.12
 # supervisor==3.0a12
-# zc.buildout==1.6.0-dev-SlapOS-004
-# zope.interface==3.8.0
+# zc.buildout==1.6.0-dev-SlapOS-006
+# zope.interface==4.0.1
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.24
+# slapos.core==0.28.5
 supervisor = 3.0a12
 
 # Required by:
-# slapos.core==0.24
-zope.interface = 3.8.0
+# slapos.core==0.28.5
+zope.interface = 4.0.1

component/sphinx/buildout.cfg

@@ -18,10 +18,14 @@ filename = sphinx-1.10-beta-snowball.patch
 
 [sphinx]
 recipe = hexagonit.recipe.cmmi
+depends =
+  ${mariadb:version}
 url = http://sphinxsearch.com/files/sphinx-2.0.2-beta.tar.gz
 md5sum = fafe0f1a71d0ded32404c067eba7d0b3
 configure-options =
-  --with-mysql=${mariadb:location}
+  --with-mysql
+  --with-mysql-includes=${mariadb:location}/include/mysql
+  --with-mysql-libs=${mariadb:location}/lib
   --with-libstemmer
   --with-iconv
   --without-pgsql
@@ -30,5 +34,6 @@ patch-options = -p1
 patches =
   ${sphinx-1.10-beta-snowball.patch:location}/${sphinx-1.10-beta-snowball.patch:filename}
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${libexpat:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib/mysql -L${libexpat:location}/lib -Wl,-rpath=${libexpat:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${libexpat:location}/include -fpermissive
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib -L${libexpat:location}/lib -Wl,-rpath=${libexpat:location}/lib
+# Note: -fpermissive added to allow compilation on recent gcc 4.7+

component/spidermonkey/buildout.cfg

+[buildout]
+
+parts = spidermonkey
+
+[spidermonkey-1.7]
+recipe = slapos.recipe.build
+url = ftp://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz
+md5sum = 5571134c3863686b623ebe4e6b1f6fe6
+slapos_promise =
+  directory:include/
+  directory:bin/
+  file:bin/js
+  statlib:lib/libjs.a
+  file:lib/libjs.so
+script =
+  url = self.download(self.options['url'], self.options['md5sum'])
+  extract_dir = self.extract(url)
+  workdir = os.path.join(guessworkdir(extract_dir), 'src')
+  env.update(JS_DIST=self.options['location'])
+  call(['make', '-f', 'Makefile.ref'], cwd=workdir, env=env)
+  call(['make', '-f', 'Makefile.ref', 'export'], cwd=workdir, env=env)
+
+[spidermonkey]
+<= spidermonkey-1.7

component/sqlite3/buildout.cfg

@@ -5,8 +5,8 @@ parts =
 
 [sqlite3]
 recipe = hexagonit.recipe.cmmi
-url = http://www.sqlite.org/sqlite-autoconf-3071000.tar.gz
-md5sum = 9ed2ca93577b58cfa0d01f64b9312ab9
+url = http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz
+md5sum = c97df403e8a3d5b67bb408fcd6aabd8e
 configure-options =
   --disable-static
   --enable-readline

component/tar/buildout.cfg

+[buildout]
+
+parts = tar
+
+[tar]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnu.org/gnu/tar/tar-1.26.tar.gz
+md5sum = 00d1e769c6af702c542cca54b728920d
+environment =
+  FORCE_UNSAFE_CONFIGURE=1

component/tesseract/buildout.cfg

 [buildout]
 extends =
+  ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+  ../leptonica/buildout.cfg
   ../jbigkit/buildout.cfg
-  ../libjpeg/buildout.cfg
-  ../libpng/buildout.cfg
-  ../libtiff/buildout.cfg
-  ../zlib/buildout.cfg
 
 parts =
-  tesseract-eng-traineddata-unzip
   tesseract
 
-[tesseract-share]
-# XXX: tesseract seems not easy configurable on runtime about where to find
-# its trained data, so just move out its datadir to own controlled location
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = mkdir -p ${:location} && mkdir -p ${:location}/tessdata
-update-command = ${:command}
-stop-on-error = yes
+[tesseract-gcc-4.7-build-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+filename = tesseract-3.00-gcc-4.7-build.patch
+md5sum = ca80db3ec489c547b03f3ee48879c1b1
+
+[tesseract-3.01-remove-bom.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+filename = ${:_buildout_section_name_}
+md5sum = 2e691858cb492b7c17d23bf0912b3d24
 
 [tesseract]
 recipe = hexagonit.recipe.cmmi
-url = http://tesseract-ocr.googlecode.com/files/tesseract-3.00.tar.gz
-md5sum = cc812a261088ea0c3d2da735be35d09f
-depends =
-  ${libtiff:version}
-configure-options =
-  --disable-static
-  --datarootdir=${tesseract-share:location}
+url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz
+md5sum = 1ba496e51a42358fb9d3ffe781b2d20a
+patch-options =
+  -p1
+patches =
+  ${tesseract-gcc-4.7-build-patch:location}/${tesseract-gcc-4.7-build-patch:filename}
+  ${tesseract-3.01-remove-bom.patch:location}/${tesseract-3.01-remove-bom.patch:filename}
+configure-command =
+  aclocal -I ${libtool:location}/share/aclocal -I config
+  libtoolize -f -c
+  libtoolize --automake
+  autoheader -f
+  automake -c -a -f
+  autoconf -Wno-portability
+  ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static --datarootdir=${tesseract-eng-traineddata:location}
+# XXX: tesseract seems not easily configurable at runtime about where to find
+# its trained data, so we set its datarootdir above to a controlled location
+
+# tesseract has a non-standard way of testing for leptonica, hence the
+# LIBLEPT_HEADERSDIR entry below:
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include
-  LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s
+  ACLOCAL_ARGS=-I${libtool:location}/share/aclocal
+  LIBLEPT_HEADERSDIR=${leptonica:location}/include
+  CPPFLAGS=-I${leptonica:location}/include
+  LDFLAGS =-L${leptonica:location}/lib -Wl,-rpath=${leptonica:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 
 [tesseract-eng-traineddata]
 recipe = hexagonit.recipe.download
-download-only = true
-url = http://tesseract-ocr.googlecode.com/files/eng.traineddata.gz
-md5sum = d91041ad156cf2db36664e91ef799451
-
-[tesseract-eng-traineddata-unzip]
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-recipe = plone.recipe.command
-command = gunzip ${tesseract-eng-traineddata:location}/eng.traineddata.gz -c > ${tesseract-share:location}/tessdata/eng.traineddata
-update-command = ${:command}
-stop-on-error = yes
+strip-top-level-dir = true
+url = http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.01.eng.tar.gz
+md5sum = 89c139a73e0e7b1225809fc7b226b6c9

component/tesseract/tesseract-3.00-gcc-4.7-build.patch

+--- tesseract-3.00/viewer/svutil.cpp.old	2012-04-11 09:34:26.168608940 +0200
++++ tesseract-3.00/viewer/svutil.cpp	2012-04-11 09:34:46.108565692 +0200
+@@ -21,6 +21,7 @@
+ // thread/process creation & synchronization and network connection.
+ 
+ #include <stdio.h>
++#include <unistd.h>
+ #ifdef WIN32
+ #include <windows.h>
+ #include <winsock.h>

component/tesseract/tesseract-3.01-remove-bom.patch

+The patch below removes a utf-8 BOM mark.
+
+Avoid touching it as the BOM is invisible, and copy/pasting might not work.
+
+It is needed because old compilers treat the BOM as garbage instead of
+whitespace.
+
+--- tesseract-3.01/ccutil/strngs.h.orig	2012-05-24 15:13:22.743808379 +0200
++++ tesseract-3.01/ccutil/strngs.h	2012-05-24 15:16:54.468858282 +0200
+@@ -1,4 +1,4 @@
+-/**********************************************************************
++/**********************************************************************
+  * File:        strngs.h  (Formerly strings.h)
+  * Description: STRING class definition.
+  * Author:					Ray Smith

component/varnish/buildout.cfg

@@ -5,7 +5,7 @@
 parts =
   varnish
   varnish-2.1
-
+  varnish-3.0
 extends =
   ../ncurses/buildout.cfg
   ../pcre/buildout.cfg
@@ -30,8 +30,15 @@ url = http://repo.varnish-cache.org/source/varnish-2.1.5.tar.gz
 md5sum = 2d2f227da36a2a240c475304c717b8e3
 configure-options =
   --disable-static
+  --without-rst2html
+  --without-rst2man
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig
   CPPFLAGS=-I${ncurses:location}/include
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+
+[varnish-3.0]
+<= varnish-2.1
+url = http://repo.varnish-cache.org/source/varnish-3.0.2.tar.gz
+md5sum = c8eae0aabbe66b6daabdf3a1f58cd47a

component/w3m/buildout.cfg

@@ -17,6 +17,9 @@ download-only = true
 md5sum = 75422a6f7f671b3a6d9add6724cc0945
 
 [w3m]
+virtual-depend =
+  ${w3m-w3m.gcc.forward.compat.patch:md5sum}
+
 recipe = hexagonit.recipe.cmmi
 md5sum = 1b845a983a50b8dec0169ac48479eacc
 url = http://downloads.sourceforge.net/project/w3m/w3m/w3m-0.5.3/w3m-0.5.3.tar.gz
@@ -42,6 +45,6 @@ patches =
 
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  CPPFLAGS=-I${ncurses:location}/include/ -I${zlib:location}/include/
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkconfig
+  CPPFLAGS=-I${ncurses:location}/include/ -I${zlib:location}/include/ -I${garbage-collector:location}/include
   LDFLAGS=-Wl,--as-needed -L${garbage-collector:location}/lib -Wl,-rpath=${garbage-collector:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/webp/buildout.cfg

+[buildout]
+parts =
+  webp
+
+[webp]
+recipe = hexagonit.recipe.cmmi
+url = https://webp.googlecode.com/files/libwebp-0.1.3.tar.gz
+md5sum = 254d4670e14e9ed881f0536b006ab336
+configure-options =
+  --disable-static

component/wget/buildout.cfg

@@ -6,7 +6,19 @@ extends =
 parts =
   wget
 
+[wget-drop.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 866907ebc89fc2e76b44c519cb84930f
+download-only = true
+filename = drop.gets.patch
+
 [wget]
+virtual-depends = ${wget-drop.gets.patch:md5sum}
+patch-options = -p1
+patches =
+  ${wget-drop.gets.patch:location}/${wget-drop.gets.patch:filename}
+
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/gnu/wget/wget-1.13.4.tar.bz2
 md5sum = 12115c3750a4d92f9c6ac62bac372e85

component/wget/drop.gets.patch

+diff -ur wget-1.13.4.orig/lib/stdio.in.h wget-1.13.4/lib/stdio.in.h
+--- wget-1.13.4.orig/lib/stdio.in.h	2011-09-13 10:15:14.000000000 +0200
++++ wget-1.13.4/lib/stdio.in.h	2012-07-23 14:47:39.793579086 +0200
+@@ -697,8 +697,10 @@
+ /* It is very rare that the developer ever has full control of stdin,
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
++#endif
+ 
+ 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@

component/xorg/buildout.cfg

@@ -7,12 +7,19 @@ extends =
   ../libxslt/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
+  ../bzip2/buildout.cfg
   ../openssl/buildout.cfg
+  ../gnutls/buildout.cfg
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+  ../dash/buildout.cfg
 
 parts =
   libXdmcp
   libXext
   libXau
+  libXinerama
   libSM
   libXrender
 
@@ -48,10 +55,21 @@ environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
+[xtrans-tmp-env-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+filename = xtrans_tmp_env.patch
+md5sum = 37d82a3b6009113023599632117a6855
+
 [xtrans]
 recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/xtrans-1.2.6.tar.bz2
 md5sum = c66f9ffd2da4fb012220c6c40ebc7609
+patches =
+  ${xtrans-tmp-env-patch:location}/${xtrans-tmp-env-patch:filename}
+patches_md5sum = ${xtrans-tmp-env-patch:md5sum}
+patch-options = -p1
 configure-options =
   --disable-docs
   --without-xmlto
@@ -83,10 +101,21 @@ recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/xcb/libpthread-stubs-0.3.tar.bz2
 md5sum = e8fa31b42e13f87e8f5a7a2b731db7ee
 
+[libxcb-tmp-env-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+filename = xcb_tmp_env.patch
+md5sum = 61f39878120ba434a169e24cae2af862
+
 [libxcb]
 recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/xcb/libxcb-1.7.tar.bz2
 md5sum = 925699df361b99491165ebc12068056b
+patches =
+  ${libxcb-tmp-env-patch:location}/${libxcb-tmp-env-patch:filename}
+patches_md5sum = ${libxcb-tmp-env-patch:md5sum}
+patch-options = -p1
 configure-options =
   --disable-static
   --disable-build-docs
@@ -116,6 +145,7 @@ configure-options =
   --disable-specs
   --without-xmlto
   --without-fop
+  XEXT_LIBS=-lX11
 patches =
   ${libXext-patch-link-error:location}/${libXext-patch-link-error:filename}
 patch-options = -p1
@@ -153,7 +183,7 @@ configure-options =
   --without-xmlto
   --without-fop
 environment =
-  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig
   LD_LIBRARY_PATH=${xproto:location}/lib:${xextproto:location}/lib:${libxcb:location}/lib
   LD_RUN_PATH=${xproto:location}/lib:${xextproto:location}/lib:${libxcb:location}/lib
   PATH=${pkgconfig:location}/bin:%(PATH)s
@@ -243,6 +273,7 @@ environment =
   LD_LIBRARY_PATH=${xproto:location}/lib/
   LD_RUN_PATH=${xproto:location}/lib/
   CPPFLAGS=-I${xproto:location}/include/ -I${zlib:location}/include
+  LDFLAGS=-L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib 
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [libXfont]
@@ -253,8 +284,8 @@ environment =
   PKG_CONFIG_PATH=${fontsproto:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${freetype:location}/lib/pkgconfig
   LD_LIBRARY_PATH=${fontsproto:location}/lib:${libfontenc:location}/lib:${xtrans:location}/include/:${xproto:location}/lib/:${freetype:location}/lib
   LD_RUN_PATH=${fontsproto:location}/lib:${libfontenc:location}/lib:${xproto:location}/lib/:${xtrans:location}/include/:${freetype:location}/lib
-  LDFLAGS=-L${zlib:location}/lib
-  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libfontenc:location}/lib -Wl,-rpath=${libfontenc:location}/lib 
+  CPPFLAGS=-I${zlib:location}/include -I${bzip2:location}/include -I${libfontenc:location}/include
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [libxkbfile]
@@ -308,11 +339,14 @@ md5sum = d43c2afc69937655d13c02588c9ff974
 recipe = hexagonit.recipe.cmmi
 url = http://xlibs.freedesktop.org/release/libXrender-0.9.0.tar.bz2
 md5sum = ce7cda009aa0b10a73637941d44ae789
+configure-options =
+  --disable-static
 environment =
-  PKG_CONFIG_PATH=${render:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig
-  CPPFLAGS=-I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include
+  PKG_CONFIG_PATH=${renderproto:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${render:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig
+  CPPFLAGS=-I${renderproto:location}/include/ -I${libX11:location}/include/ -I${libxcb:location}/include -I${libXau:location}/include -I${libXdmcp:location}/include -I${xproto:location}/include -I${kbproto:location}/include
   LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib
   LD_RUN_PATH=${render:location}/lib
+  LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libxcb:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libXau:location}/lib -Wl,-rpath=${libXau:location}/lib -L${libXdmcp:location}/lib -Wl,-rpath=${libXdmcp:location}/lib 
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [libXinerama]
@@ -350,33 +384,14 @@ environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   LIBUUID_CFLAGS=-I${libuuid:location}/include
 
-[renderproto]
-recipe = hexagonit.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/proto/renderproto-0.11.1.tar.bz2
-md5sum = a914ccc1de66ddeb4b611c6b0686e274
-
-[libXrender]
-recipe = hexagonit.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/lib/libXrender-0.9.6.tar.bz2
-md5sum = 3b3b7d076c2384b6c600c0b5f4ba971f
-configure-options =
-  --disable-static
-environment =
-  PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  CPPFLAGS=-I${libX11:location}/include -I${renderproto:location}/include -I${xproto:location}/include
-
 [libXt]
 recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libXt-1.0.9.tar.bz2
 md5sum = 8a414f8f2327aaa616ca2dcac1f5d8c3
-configure-options = 
-  --disable-static
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-    PKG_CONFIG_PATH=${render:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libSM:location}/lib/pkgconfig:${libICE:location}/lib/pkgconfig
-    CPPFLAGS=-I${xproto:location}/include -I${libX11:location}/include -I${libSM:location}/include -I${libICE:location}/include -I${kbproto:location}/include
-
+  PKG_CONFIG_PATH=${libSM:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libICE:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig
+  CPPFLAGS=-I${libSM:location}/include -I${kbproto:location}/include -I${libICE:location}/include -I${xproto:location}/include -I${libX11:location}/include
 
 [dri2proto]
 recipe = hexagonit.recipe.cmmi
@@ -440,11 +455,50 @@ environment =
   PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig
   CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${fixesproto:location}/include -I${xextproto:location}/include -I${damageproto:location}/include -I${xfixes:location}/include 
 
+[xorg-tmp-env-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+filename = tmp_env.patch
+md5sum = 8b60ab8121f0564a681fc00d03101696
+
+[libxmu]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/lib/libXmu-1.1.0.tar.gz
+md5sum = 15e1cb9aaf97eae169bfe6944e0a541e
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libXt:location}/lib/pkgconfig
+  CPPFLAGS=-I${libX11:location}/include -I${xextproto:location}/include
+
+[libXcursor]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/lib/libXcursor-1.1.11.tar.gz
+md5sum = 55558a41d0bcf9210636858844fa4d2f
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${render:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig
+  CPPFLAGS=-I${render:location}/include -I${xproto:location}/include -I${fixesproto:location}/include -I${libX11:location}/include -I${xfixes:location}/include -I${libXrender:location}/include
+
+[xwd]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/app/xwd-1.0.4.tar.gz
+md5sum = f8da771069756210833524b5afa1832c
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig
+  CPPFLAGS=-I${xproto:location}/include -I${libX11:location}/include -I${libxkbfile:location}/include# -I${xfixes:location}/include -I${libXrender:location}/include
+  LDFLAGS=-L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libxkbfile:location}/lib -Wl,-rpath=${libxkbfile:location}/lib -lX11
+
 [xserver]
 # Adds Xvfb functionnality
 recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/xserver/xorg-server-1.9.3.tar.bz2
 md5sum = 5bef6839a76d029204ab31aa2fcb5201
+patches =
+  ${xorg-tmp-env-patch:location}/${xorg-tmp-env-patch:filename}
+patches_md5sum = ${xorg-tmp-env-patch:md5sum}
+patch-options = -p1
 configure-options =
   --enable-xvfb
   --disable-aiglx
@@ -454,15 +508,13 @@ configure-options =
   --disable-dri
   --disable-dri2
   --disable-xorg
-  --disable-xprint
   --disable-config-hal
+  --disable-tcp-transport
   --with-xkb-bin-directory=${xkbcomp:location}/bin
   --with-xkb-path=${xkeyboard-config:location}/share/X11/xkb
-#XXX-Cedric : The following can be safely removed as soon as Xvfb is known as working
-#  --with-default-font-path="${xfree86-fonts:location}/share/fonts/X11/Type1,${fontutil:location}/share/fonts/X11/75dpi,${cursor-fonts:location}/share/fonts/X11/misc"
-#depends = ${adobe-75dpi-fonts:location}
+  --with-sha1=libgcrypt
 environment =
-  PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig
-  CPPFLAGS=-I${xproto:location}/include -I${pixman:location}/include/pixman-1 -I${xextproto:location}/include -I${inputproto:location}/include -I${fontsproto:location}/include -I${kbproto:location}/include -I${xineramaproto:location}/include -I${renderproto:location}/include -I${bigreqsproto:location}/include -I${videoproto:location}/include -I${resourceproto:location}/include -I${xcmiscproto:location}/include -I${xtrans:location}/include -I${libXau:location}/include -I${randrproto:location}/include -I${libxkbfile:location}/include -I${recordproto:location}/include -I${fixesproto:location}/include -I${damageproto:location}/include
+  PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig:${gpg-error:location}/lib/pkgconfig
+  CPPFLAGS=-I${xproto:location}/include -I${pixman:location}/include/pixman-1 -I${xextproto:location}/include -I${inputproto:location}/include -I${fontsproto:location}/include -I${kbproto:location}/include -I${xineramaproto:location}/include -I${renderproto:location}/include -I${bigreqsproto:location}/include -I${videoproto:location}/include -I${resourceproto:location}/include -I${xcmiscproto:location}/include -I${xtrans:location}/include -I${libXau:location}/include -I${randrproto:location}/include -I${libxkbfile:location}/include -I${recordproto:location}/include -I${fixesproto:location}/include -I${damageproto:location}/include -I${bzip2:location}/include -I${gcrypt:location}/include -I${zlib:location}/include -I${libfontenc:location}/include -I${gpg-error:location}/include
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  LDFLAGS=-Wl,-rpath,${openssl:location}/lib
+  LDFLAGS=-L${gcrypt:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${gcrypt:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libfontenc:location}/lib -Wl,-rpath=${libfontenc:location}/lib -L${libXau:location}/lib -Wl,-rpath=${libXau:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib

component/xorg/tmp_env.patch

+--- xorg-server-1.9.3/os/utils.c.old	2012-03-29 18:20:02.000000000 +0200
++++ xorg-server-1.9.3/os/utils.c	2012-03-29 18:39:33.000000000 +0200
+@@ -226,7 +226,26 @@ OsSignal(int sig, OsSigHandlerPtr handle
+  * server at a time.  This keeps the servers from stomping on each other
+  * if the user forgets to give them different display numbers.
+  */
+-#define LOCK_DIR "/tmp"
++char *
++getcompatibleenv(const char *name, const char *compatible)
++{
++  static char path_list[1][PATH_MAX];
++  char *dir;
++
++  if (path_list[0][0]) {
++    return path_list[0];
++  }
++
++  dir = getenv(name);
++  if (dir == NULL) {
++    return strncpy(path_list[0], compatible, PATH_MAX);
++  } else {
++    return strncpy(path_list[0], dir, PATH_MAX);
++  }
++
++}
++
++#define LOCK_DIR getcompatibleenv("TMPDIR", "/tmp")
+ #define LOCK_TMP_PREFIX "/.tX"
+ #define LOCK_PREFIX "/.X"
+ #define LOCK_SUFFIX "-lock"

component/xorg/xcb_tmp_env.patch

+--- libxcb-1.7/src/xcb_util.c.back	2012-04-03 13:30:36.000000000 +0200
++++ libxcb-1.7/src/xcb_util.c	2012-04-03 14:47:00.000000000 +0200
+@@ -147,11 +147,31 @@
+ static int _xcb_open_abstract(char *protocol, const char *file, size_t filelen);
+ #endif
+ 
++char *
++_xcb_getandappendcompatibleenv(const char *name, const char *compatible, const char *suffix)
++{
++  static char path_list[1][PATH_MAX];
++  char *dir;
++
++  if (path_list[0][0])
++  {
++    return path_list[0];
++  }
++
++  dir = getenv(name);
++  if (dir == NULL) {
++    strncpy(path_list[0], compatible, PATH_MAX);
++  } else {
++    strncpy(path_list[0], dir, PATH_MAX);
++  }
++  return strncat(path_list[0], suffix, PATH_MAX);
++}
++
+ static int _xcb_open(const char *host, char *protocol, const int display)
+ {
+     int fd;
+-    static const char unix_base[] = "/tmp/.X11-unix/X";
+-    const char *base = unix_base;
++    char *base;
++    base = _xcb_getandappendcompatibleenv("TMPDIR", "/tmp", "/.X11-unix/X");
+     size_t filelen;
+     char *file = NULL;
+     int actual_filelen;

component/xorg/xtrans_tmp_env.patch

+--- xtrans-1.2.6/Xtranssock.c.old	2012-03-29 14:25:45.000000000 +0200
++++ xtrans-1.2.6/Xtranssock.c	2012-03-29 18:40:54.000000000 +0200
+@@ -207,29 +207,49 @@ static int TRANS(SocketINETClose) (Xtran
+ #ifdef UNIXCONN
+ 
+ 
++char *
++getandappendcompatibleenv(const int index, const char *name, const char *compatible, const char *suffix)
++{
++  static char path_list[2][PATH_MAX];
++  char *dir;
++
++  if (path_list[index][0])
++  {
++    return path_list[index];
++  }
++
++  dir = getenv(name);
++  if (dir == NULL) {
++    strncpy(path_list[index], compatible, PATH_MAX);
++  } else {
++    strncpy(path_list[index], dir, PATH_MAX);
++  }
++  return strncat(path_list[index], suffix, PATH_MAX);
++}
++
+ #if defined(X11_t)
+-#define UNIX_PATH "/tmp/.X11-unix/X"
+-#define UNIX_DIR "/tmp/.X11-unix"
++#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.X11-unix/X")
++#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.X11-unix")
+ #endif /* X11_t */
+ #if defined(XIM_t)
+-#define UNIX_PATH "/tmp/.XIM-unix/XIM"
+-#define UNIX_DIR "/tmp/.XIM-unix"
++#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.XIM-unix/XIM")
++#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.XIM-unix")
+ #endif /* XIM_t */
+ #if defined(FS_t) || defined(FONT_t)
+-#define UNIX_PATH "/tmp/.font-unix/fs"
+-#define UNIX_DIR "/tmp/.font-unix"
++#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.font-unix/fs")
++#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.font-unix")
+ #endif /* FS_t || FONT_t */
+ #if defined(ICE_t)
+-#define UNIX_PATH "/tmp/.ICE-unix/"
+-#define UNIX_DIR "/tmp/.ICE-unix"
++#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.ICE-unix/")
++#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.ICE-unix")
+ #endif /* ICE_t */
+ #if defined(TEST_t)
+-#define UNIX_PATH "/tmp/.Test-unix/test"
+-#define UNIX_DIR "/tmp/.Test-unix"
++#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.Test-unix/test")
++#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.Test-unix")
+ #endif
+ #if defined(LBXPROXY_t)
+-#define UNIX_PATH "/tmp/.X11-unix/X"
+-#define UNIX_DIR  "/tmp/.X11-unix"
++#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.X11-unix/X")
++#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.X11-unix")
+ #endif
+ 
+ 

component/xtrabackup/buildout.cfg

@@ -59,6 +59,6 @@ configure-command = ln -sf ${mysql-5.1-download:location}/${mysql-5.1-download:f
 environment =
   CPPFLAGS =-I${zlib:location}/include -I${ncurses:location}/include -I${readline:location}/include
   LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib
-  PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${flex:location}/bin:%(PATH)s:${bison:location}/bin
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${flex:location}/bin:%(PATH)s:${bison:location}/bin
 make-options =
   -j1

component/xz-utils/buildout.cfg

+[buidout]
+parts =
+  xz-utils
+
+[xz-utils]
+recipe = hexagonit.recipe.cmmi
+url = http://tukaani.org/xz/xz-5.0.4.tar.gz
+md5sum = df3df690aef18384e1e031be7ec3a964

component/zabbix/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [zabbix-agent]
 recipe = hexagonit.recipe.cmmi
-url = http://prdownloads.sourceforge.net/zabbix/zabbix-1.8.10.tar.gz?download
-md5sum = 7e89f80c1822787c0831f7c0dbefcd7b
+url = http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.1.tar.gz?download
+md5sum = 3b301aa4f2b7cb5ede46884b9c7873e1
 configure-options =
   --enable-agent
   --enable-ipv6

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.46-dev'
+version = '0.63-dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
@@ -40,92 +40,109 @@ setup(name=name,
       zip_safe=True,
       entry_points={
         'zc.buildout': [
+          'agent = slapos.recipe.agent:Recipe',
           'apache.frontend = slapos.recipe.apache_frontend:Recipe',
           'apachephp = slapos.recipe.apachephp:Recipe',
           'apacheproxy = slapos.recipe.apacheproxy:Recipe',
           'apache.zope.backend = slapos.recipe.apache_zope_backend:Recipe',
-          'certificate_authority = slapos.recipe.certificate_authority:Recipe',
           'certificate_authority.request = slapos.recipe.certificate_authority:Request',
+          'certificate_authority = slapos.recipe.certificate_authority:Recipe',
           'check_port_listening = slapos.recipe.check_port_listening:Recipe',
-          'cron = slapos.recipe.dcron:Recipe',
+          'check_url_available = slapos.recipe.check_url_available:Recipe',
+          'cloud9 = slapos.recipe.cloud9:Recipe',
+          'cloudooo.test = slapos.recipe.cloudooo_test:Recipe',
           'cron.d = slapos.recipe.dcron:Part',
+          'cron = slapos.recipe.dcron:Recipe',
           'davstorage = slapos.recipe.davstorage:Recipe',
-          'dropbear = slapos.recipe.dropbear:Recipe',
+          'downloader = slapos.recipe.downloader:Recipe',
           'dropbear.add_authorized_key = slapos.recipe.dropbear:AddAuthorizedKey',
           'dropbear.client = slapos.recipe.dropbear:Client',
+          'dropbear = slapos.recipe.dropbear:Recipe',
           'duplicity = slapos.recipe.duplicity:Recipe',
-          'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe',
           'equeue = slapos.recipe.equeue:Recipe',
+          'erp5.bootstrap = slapos.recipe.erp5_bootstrap:Recipe',
+          'erp5.promise = slapos.recipe.erp5_promise:Recipe',
+          'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe',
           'erp5testnode = slapos.recipe.erp5testnode:Recipe',
+          'erp5.test = slapos.recipe.erp5_test:Recipe',
+          'erp5.update = slapos.recipe.erp5_update:Recipe',
+          'firefox = slapos.recipe.firefox:Recipe',
+          'fontconfig = slapos.recipe.fontconfig:Recipe',
           'generate.mac = slapos.recipe.generatemac:Recipe',
-          'nbdserver = slapos.recipe.nbdserver:Recipe',
-          'generic.onetimeupload = slapos.recipe.generic_onetimeupload:Recipe',
-          'helloworld = slapos.recipe.helloworld:Recipe',
+          'generate.password = slapos.recipe.generatepassword:Recipe',
           'generic.cloudooo = slapos.recipe.generic_cloudooo:Recipe',
-          'fontconfig = slapos.recipe.fontconfig:Recipe',
+          'generic.kumofs = slapos.recipe.generic_kumofs:Recipe',
+          'generic.memcached = slapos.recipe.generic_memcached:Recipe',
+          'generic.mysql = slapos.recipe.generic_mysql:Recipe',
+          'generic.varnish = slapos.recipe.generic_varnish:Recipe',
+          'generic.zope = slapos.recipe.generic_zope:Recipe',
+          'generic.zope.zeo.client = slapos.recipe.generic_zope_zeo_client:Recipe',
+          'gitinit = slapos.recipe.gitinit:Recipe',
+          'haproxy = slapos.recipe.haproxy:Recipe',
+          'helloworld = slapos.recipe.helloworld:Recipe',
           'java = slapos.recipe.java:Recipe',
           'kumofs = slapos.recipe.kumofs:Recipe',
-          'kvm = slapos.recipe.kvm:Recipe',
           'kvm.frontend = slapos.recipe.kvm_frontend:Recipe',
-          'generic.kumofs = slapos.recipe.generic_kumofs:Recipe',
-          'haproxy = slapos.recipe.haproxy:Recipe',
-          'libcloud = slapos.recipe.libcloud:Recipe',
+          'kvm = slapos.recipe.kvm:Recipe',
+          'lamp.request = slapos.recipe.lamp:Request',
+          'lamp.simple = slapos.recipe.lamp:Simple',
+          'lamp = slapos.recipe.lamp:Request',
+          'lamp.static = slapos.recipe.lamp:Static',
           'libcloudrequest = slapos.recipe.libcloudrequest:Recipe',
+          'libcloud = slapos.recipe.libcloud:Recipe',
           'lockfile = slapos.recipe.lockfile:Recipe',
+          'logrotate.d = slapos.recipe.logrotate:Part',
+          'logrotate = slapos.recipe.logrotate:Recipe',
           'memcached = slapos.recipe.memcached:Recipe',
-          'generic.memcached = slapos.recipe.generic_memcached:Recipe',
-          'mysql = slapos.recipe.mysql:Recipe',
-          'mydumper = slapos.recipe.mydumper:Recipe',
-          'generic.mysql = slapos.recipe.generic_mysql:Recipe',
           'mkdirectory = slapos.recipe.mkdirectory:Recipe',
+          'mydumper = slapos.recipe.mydumper:Recipe',
+          'mysql = slapos.recipe.mysql:Recipe',
+          'nbdserver = slapos.recipe.nbdserver:Recipe',
           'nosqltestbed = slapos.recipe.nosqltestbed:NoSQLTestBed',
-          'notifier = slapos.recipe.notifier:Recipe',
           'notifier.callback = slapos.recipe.notifier:Callback',
           'notifier.notify = slapos.recipe.notifier:Notify',
+          'notifier = slapos.recipe.notifier:Recipe',
           'novnc = slapos.recipe.novnc:Recipe',
-          'lamp = slapos.recipe.lamp:Request',
-          'lamp.request = slapos.recipe.lamp:Request',
-          'lamp.static = slapos.recipe.lamp:Static',
-          'lamp.simple = slapos.recipe.lamp:Simple',
-          'logrotate = slapos.recipe.logrotate:Recipe',
-          'logrotate.d = slapos.recipe.logrotate:Part',
+          'onetimeupload = slapos.recipe.onetimeupload:Recipe',
           'pbs = slapos.recipe.pbs:Recipe',
+          'proactive = slapos.recipe.proactive:Recipe',
           'publish = slapos.recipe.publish:Recipe',
           'publishurl = slapos.recipe.publishurl:Recipe',
           'pwgen = slapos.recipe.pwgen:Recipe',
-          'proactive = slapos.recipe.proactive:Recipe',
+          'pwgen.stable = slapos.recipe.pwgen:StablePasswordGeneratorRecipe',
+          'requestoptional = slapos.recipe.requestoptional:Recipe',
           'request = slapos.recipe.request:Recipe',
           'seleniumrunner = slapos.recipe.seleniumrunner:Recipe',
           'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',
-          'shell = slapos.recipe.shell:Recipe',
           'shellinabox = slapos.recipe.shellinabox:Recipe',
-          'symbolic.link = slapos.recipe.symbolic_link:Recipe',
-          'softwaretype = slapos.recipe.softwaretype:Recipe',
-          'siptester = slapos.recipe.siptester:SipTesterRecipe',
+          'shell = slapos.recipe.shell:Recipe',
+          'signalwrapper= slapos.recipe.signal_wrapper:Recipe',
           'simplelogger = slapos.recipe.simplelogger:Recipe',
+          'siptester = slapos.recipe.siptester:SipTesterRecipe',
+          'slapconfiguration = slapos.recipe.slapconfiguration:Recipe',
+          'slapcontainer = slapos.recipe.container:Recipe',
+          'slapmonitor = slapos.recipe.slapmonitor:Recipe',
+          'slapreport = slapos.recipe.slapreport:Recipe',
           'slaprunner = slapos.recipe.slaprunner:Recipe',
-          'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
-          'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
+          'softwaretype = slapos.recipe.softwaretype:Recipe',
           'sphinx= slapos.recipe.sphinx:Recipe',
+          'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
+          'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
           'stunnel = slapos.recipe.stunnel:Recipe',
+          'symbolic.link = slapos.recipe.symbolic_link:Recipe',
+          'template = slapos.recipe.template:Recipe',
           'testnode = slapos.recipe.testnode:Recipe',
+          'tidstorage = slapos.recipe.tidstorage:Recipe',
           'urlparse = slapos.recipe._urlparse:Recipe',
+          'uuid = slapos.recipe._uuid:Recipe',
           'vifib = slapos.recipe.vifib:Recipe',
           'waitfor = slapos.recipe.waitfor:Recipe',
+          'webchecker = slapos.recipe.web_checker:Recipe',
+          'wrapper = slapos.recipe.wrapper:Recipe',
+          'xvfb = slapos.recipe.xvfb:Recipe',
           'xwiki = slapos.recipe.xwiki:Recipe',
           'zabbixagent = slapos.recipe.zabbixagent:Recipe',
-          'generic.zope = slapos.recipe.generic_zope:Recipe',
-          'generic.zope.zeo.client = slapos.recipe.generic_zope_zeo_client:Recipe',
-          'generate.erp5.tidstorage = slapos.recipe.generate_erp5_tidstorage:Recipe',
-          'generate.cloudooo = slapos.recipe.generate_cloudooo:Recipe',
           'zeo = slapos.recipe.zeo:Recipe',
-          'tidstorage = slapos.recipe.tidstorage:Recipe',
-          'erp5.bootstrap = slapos.recipe.erp5_bootstrap:Recipe',
-          'erp5.promise = slapos.recipe.erp5_promise:Recipe',
-          'erp5.update = slapos.recipe.erp5_update:Recipe',
-          'erp5.test = slapos.recipe.erp5_test:Recipe',
-          'generic.varnish = slapos.recipe.generic_varnish:Recipe',
-          'webchecker = slapos.recipe.web_checker:Recipe',
         ],
         'slapos.recipe.nosqltestbed.plugin': [
           'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',

slapos/recipe/README.apache_frontend.txt

-apache_frontend
-==========
-
-Frontend using Apache, allowing to rewrite and proxy URLs like
-myinstance.myfrontenddomainname.com to real IP/URL of myinstance.
-
-apache_frontend works using the master instance / slave instance design.
-It means that a single main instance of Apache will be used to act as frontend
-for many slaves.
-
-
-How to use
-========
-First, you will need to request a "master" instance of Apache Frontend with
-"domain" parameter, like : 
-<?xml version='1.0' encoding='utf-8'?>
-<instance>
- <parameter id="domain">moulefrite.com</parameter>
- <parameter id="port">443</parameter>
-</instance>
-
-Then, it is possible to request many slave instances
-(currently only from slapconsole, UI doesn't work yet)
-of Apache Frontend, like : 
-instance = request(
-       software_release=apache_frontend,
-       partition_reference='frontend2',
-       shared=True,
-       partition_parameter_kw={"url":"https://[1:2:3:4]:1234/someresource"}
-     )
-Those slave instances will be redirected to the "master" instance,
-and you will see on the "master" instance the associated RewriteRules of
-all slave instances.
-
-Finally, the slave instance will be accessible from :
-https://someidentifier.moulefrite.com.

slapos/recipe/README.generic_varnish.txt

+generic_varnish
+===============
+
+This recipe creates a varnish instance dedicated for ERP5 with a web checker[1]
+set up.
+
+How to Use
+==========
+
+On slap console, you can instanciate varnish like this:
+
+instance = request(
+  software_type='varnish',
+  partition_parameter_kw={
+     'tidstorage-url':'http://[your tidstrage address]:your tid strage port',
+     'web-checker-frontend-url':'http://www.example.com',
+     'web-checker-mail-address':'web-checker-result@example.com',
+     'web-checker-smtp-host':'mail.example.com',
+  }
+)
+
+tidstrage-url is the backend url that varnish will cache. It is expected that
+the backend is created by tidstorage recipe.
+
+web-checker-frontend-url is the entry-point-url that web checker will check
+the HTTP headers of all the pages in the web site.
+
+web-checker-mail-address is the email address where web checker will send
+the HTTP Cache cheking result.
+
+web-checker-smtp-host is the smtp server to be used to send the web checker
+result.
+
+[Note]
+When web-checker-* parameters are not given, web_checker will be disabled.
+
+TODO
+====
+
+We need to merge this and apache_frontend recipe.
+
+References
+==========
+
+[1] web_checker (it is a part of erp5.util)
+http://pypi.python.org/pypi/erp5.util
+web_checker: Web site HTTP Cache header checking tool
+

slapos/recipe/_uuid.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import uuid
+
+import os
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+    def _options(self, options):
+        write = True
+        if os.path.exists(options['cache-file']):
+            with open(options['cache-file'], 'r') as cache_file:
+                try:
+                    generated_uuid = uuid.UUID(hex=cache_file.read())
+                    write = False
+                except ValueError:
+                    generated_uuid = uuid.uuid4()
+        else:
+            generated_uuid = uuid.uuid4()
+
+        if write:
+            with open(options['cache-file'], 'w') as cache_file:
+                cache_file.write(generated_uuid.hex)
+
+        options['uuid'] = generated_uuid.hex
+
+    def install(self):
+        return []

slapos/recipe/agent/__init__.py

+##############################################################################
+#
+# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+#############################################################################
+
+import os
+import sys
+import zc.buildout
+import slapos.slap
+from slapos.recipe.librecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import GenericSlapRecipe
+import json
+import ConfigParser
+
+# XXX: BaseSlapRecipe and GenericSlapRecipe are deprecated, use
+# GenericBaseRecipe and move partition parameter fetching to software release.
+class Recipe(BaseSlapRecipe, GenericSlapRecipe):
+  def install(self):
+    self.path_list = []
+    crond = self.installCrond()
+
+    slap = slapos.slap.slap()
+    slap.initializeConnection(self.server_url, self.key_file, self.cert_file)
+    parameter_dict = slap.registerComputerPartition(
+      self.computer_id,
+      self.computer_partition_id,
+    ).getInstanceParameterDict()
+
+    # XXX: should probably expect one more (SR-originating) parameter instead
+    # of using self.work_directory .
+    configuration_path = os.path.join(self.work_directory, "agent.cfg")
+    with open(configuration_path, "w") as configuration:
+      configuration.write(parameter_dict["configuration"])
+    agent_crond_path = os.path.join(crond, "agent")
+    with open(agent_crond_path, "w") as agent_crond:
+      agent_crond.write("*/5 * * * * %s -S %s --pidfile=%s --log=%s "
+        "%s 2>&1 > /dev/null\n" % (
+          self.options["python_binary"],
+          self.options["agent_binary"],
+          self.options["pidfile"],
+          self.options["log"],
+          configuration_path,
+      ))
+
+    return self.path_list + [configuration_path, agent_crond_path]
+
+  def installCrond(self):
+    _, ws = self.egg.working_set()
+    timestamps = self.createDataDirectory('cronstamps')
+    cron_output = os.path.join(self.log_directory, 'cron-output')
+    self._createDirectory(cron_output)
+    catcher = zc.buildout.easy_install.scripts([('catchcron',
+      __name__ + '.catdatefile', 'catdatefile')], ws, sys.executable,
+      self.bin_directory, arguments=[cron_output])[0]
+    self.path_list.append(catcher)
+    cron_d = os.path.join(self.etc_directory, 'cron.d')
+    crontabs = os.path.join(self.etc_directory, 'crontabs')
+    self._createDirectory(cron_d)
+    self._createDirectory(crontabs)
+    wrapper = zc.buildout.easy_install.scripts([('crond',
+      'slapos.recipe.librecipe.execute', 'execute')], ws, sys.executable,
+      self.wrapper_directory, arguments=[
+        self.options['dcrond_binary'].strip(), '-s', cron_d, '-c', crontabs,
+        '-t', timestamps, '-f', '-l', '5', '-M', catcher]
+      )[0]
+    self.path_list.append(wrapper)
+    return cron_d

slapos/recipe/agent/catdatefile.py

+import os
+import sys
+import time
+def catdatefile(args):
+  directory = args[0]
+  try:
+    suffix = args[1]
+  except IndexError:
+    suffix = '.log'
+  f = open(os.path.join(directory,
+    time.strftime('%Y-%m-%d.%H:%M.%s') + suffix), 'aw')
+  for line in sys.stdin.read():
+    f.write(line)
+  f.close()

slapos/recipe/apache_frontend/__init__.py

@@ -33,6 +33,7 @@ import zc.buildout
 import zc.recipe.egg
 import ConfigParser
 import re
+import traceback
 
 
 class Recipe(BaseSlapRecipe):
@@ -42,6 +43,19 @@ class Recipe(BaseSlapRecipe):
         'template/%s' % template_name)
 
   def _install(self):
+    # Check for mandatory arguments
+    frontend_domain_name = self.parameter_dict.get("domain")
+    if frontend_domain_name is None:
+      raise zc.buildout.UserError('No domain name specified. Please define '
+          'the "domain" instance parameter.')
+
+    # Define optional arguments
+    frontend_port_number = self.parameter_dict.get("port", 4443)
+    frontend_plain_http_port_number = self.parameter_dict.get(
+        "plain_http_port", 8080)
+    base_varnish_port = 26009
+    slave_instance_list = self.parameter_dict.get("slave_instance_list", [])
+
     self.path_list = []
     self.requirements, self.ws = self.egg.working_set()
 
@@ -51,72 +65,65 @@ class Recipe(BaseSlapRecipe):
     self.killpidfromfile = zc.buildout.easy_install.scripts(
         [('killpidfromfile', 'slapos.recipe.erp5.killpidfromfile',
           'killpidfromfile')], self.ws, sys.executable, self.bin_directory)[0]
-
     self.path_list.append(self.killpidfromfile)
 
-    frontend_port_number = self.parameter_dict.get("port", 4443)
-    frontend_domain_name = self.parameter_dict.get("domain",
-        "host.vifib.net")
-
-    base_varnish_port = 26009
-    slave_instance_list = self.parameter_dict.get("slave_instance_list", [])
     rewrite_rule_list = []
+    rewrite_rule_zope_list = []
     slave_dict = {}
     service_dict = {}
-    if frontend_port_number is 443:
-      base_url = "%s/" % frontend_domain_name
-    else:
-      base_url = "%s:%s/" % (frontend_domain_name, frontend_port_number)
+
     for slave_instance in slave_instance_list:
-      url = slave_instance.get("url")
-      if url is None:
-        continue
+      backend_url = slave_instance.get("url", None)
       reference = slave_instance.get("slave_reference")
-      subdomain = reference.replace("-", "").lower()
-      slave_dict[reference] = "https://%s.%s" % (subdomain, base_url)
+      # Set scheme (http? https?)
+      # Future work may allow to choose between http and https (or both?)
+      scheme = 'http://'
 
-      enable_cache = slave_instance.get("enable_cache", "")
-      if enable_cache.upper() in ('1', 'TRUE'):
-        # Varnish should use stunnel to connect to the backend
-        base_varnish_control_port = base_varnish_port
-        base_varnish_port += 1
-        # Use regex
-        host_regex = "((\[\w*|[0-9]+\.)(\:|)).*(\]|\.[0-9]+)"
-        slave_host = re.search(host_regex, url).group(0)
-        port_regex = "\w+(\/|)$"
-        matcher = re.search(port_regex, url)
-        if matcher is not None:
-          slave_port = matcher.group(0)
-          slave_port = slave_port.replace("/", "")
-        elif url.startswith("https://"):
-          slave_port = 443
-        else:
-          slave_port = 80
-        service_name = "varnish_%s" % reference
-        varnish_ip = self.getLocalIPv4Address()
-        stunnel_port = base_varnish_port + 1
-        self.installVarnishCache(service_name,
-          ip=varnish_ip,
-          port=base_varnish_port,
-          control_port=base_varnish_control_port,
-          backend_host=varnish_ip,
-          backend_port=stunnel_port,
-          size="1G")
-        service_dict[service_name] = dict(public_ip=varnish_ip,
-            public_port=stunnel_port,
-            private_ip=slave_host.replace("[", "").replace("]", ""),
-            private_port=slave_port)
-        rewrite_rule_list.append("%s.%s http://%s:%s" % \
-            (reference.replace("-", ""), frontend_domain_name,
-            varnish_ip, base_varnish_port))
+      self.logger.info('Processing slave instance: %s' % reference)
+
+      # Check for mandatory slave fields
+      if backend_url is None:
+        self.logger.warn('No "url" parameter is defined for %s slave'\
+            'instance. Ignoring it.' % reference)
+        continue
+
+      # Check for custom domain (like mypersonaldomain.com)
+      # If no custom domain, use generated one.
+      # Note: if we get an empty custom_domain parameter, we ignore it
+      domain = slave_instance.get('custom_domain')
+      if isinstance(domain, basestring):
+        domain = domain.strip()
+      if domain is None or domain.strip() == '':
+        domain = "%s.%s" % (reference.replace("-", "").lower(),
+            frontend_domain_name)
+
+      # Define the URL where the instance will be available
+      # WARNING: we use default ports (443, 80) here.
+      slave_dict[reference] = "%s%s/" % (scheme, domain)
+
+      # Check if we want varnish+stunnel cache.
+      if slave_instance.get("enable_cache", "").upper() in ('1', 'TRUE'):
+        # XXX-Cedric : need to refactor to clean code? (to many variables)
+        rewrite_rule = self.configureVarnishSlave(
+            base_varnish_port, backend_url, reference, service_dict, domain)
         base_varnish_port += 2
       else:
-        rewrite_rule_list.append("%s.%s %s" % (subdomain, frontend_domain_name,
-            url))
+        rewrite_rule = "%s %s" % (domain, backend_url)
+
+      # Finally, if successful, we add the rewrite rule to our list of rules
+      if rewrite_rule:
+        # We check if we have a zope slave. It requires different rewrite
+        # rule structure.
+        # So we will have one RewriteMap for normal websites, and one
+        # RewriteMap for Zope Virtual Host Monster websites.
+        if slave_instance.get("type", "").lower() in ['zope']:
+          rewrite_rule_zope_list.append(rewrite_rule)
+        else:
+          rewrite_rule_list.append(rewrite_rule)
 
+    # Certificate stuff
     valid_certificate_str = self.parameter_dict.get("domain_ssl_ca_cert")
     valid_key_str = self.parameter_dict.get("domain_ssl_ca_key")
-
     if valid_certificate_str is None and valid_key_str is None:
       ca_conf = self.installCertificateAuthority()
       key, certificate = self.requestCertificate(frontend_domain_name)
@@ -125,14 +132,13 @@ class Recipe(BaseSlapRecipe):
           frontend_domain_name, valid_certificate_str, valid_key_str)
       key = ca_conf.pop("key")
       certificate = ca_conf.pop("certificate")
-
     if service_dict != {}:
       if valid_certificate_str is not None and valid_key_str is not None:
         self.installCertificateAuthority()
         stunnel_key, stunnel_certificate = \
             self.requestCertificate(frontend_domain_name)
       else:
-        stunnel_key, stunnet_certificate = key, certificate
+        stunnel_key, stunnel_certificate = key, certificate
       self.installStunnel(service_dict,
         stunnel_certificate, stunnel_key,
         ca_conf["ca_crl"],
@@ -142,19 +148,98 @@ class Recipe(BaseSlapRecipe):
         ip_list=["[%s]" % self.getGlobalIPv6Address(),
                  self.getLocalIPv4Address()],
         port=frontend_port_number,
+        plain_http_port=frontend_plain_http_port_number,
         name=frontend_domain_name,
         rewrite_rule_list=rewrite_rule_list,
+        rewrite_rule_zope_list=rewrite_rule_zope_list,
         key=key, certificate=certificate)
 
+    # Send connection informations about each slave
     for reference, url in slave_dict.iteritems():
-      self.setConnectionDict(dict(site_url=url), reference)
-
+      self.logger.debug("Sending connection parameters of slave "
+          "instance: %s" % reference)
+      try:
+        connection_dict = {
+           'frontend_ipv6_address': self.getGlobalIPv6Address(),
+           'frontend_ipv4_address': self.getLocalIPv4Address(),
+           'site_url': url
+        }
+        self.setConnectionDict(connection_dict, reference)
+      except:
+        self.logger.fatal("Error while sending slave %s informations: %s",
+            reference, traceback.format_exc())
+
+    # Then set it for master instance
     self.setConnectionDict(
       dict(site_url=apache_parameter_dict["site_url"],
-           domain_ipv6_address=self.getGlobalIPv6Address(),
-           domain_ipv4_address=self.getLocalIPv4Address()))
+           frontend_ipv6_address=self.getGlobalIPv6Address(),
+           frontend_ipv4_address=self.getLocalIPv4Address()))
+
+    # Promises
+    promise_config = dict(
+      hostname=self.getGlobalIPv6Address(),
+      port=frontend_port_number,
+      python_path=sys.executable,
+    )
+    promise_v6 = self.createPromiseWrapper(
+      'apache_ipv6',
+      self.substituteTemplate(
+          pkg_resources.resource_filename(
+              'slapos.recipe.check_port_listening',
+          'template/socket_connection_attempt.py.in'),
+        promise_config))
+    self.path_list.append(promise_v6)
+
+    promise_config = dict(
+      hostname=self.getLocalIPv4Address(),
+      port=frontend_port_number,
+      python_path=sys.executable,
+    )
+    promise_v4 = self.createPromiseWrapper(
+      'apache_ipv4',
+      self.substituteTemplate(
+          pkg_resources.resource_filename(
+              'slapos.recipe.check_port_listening',
+          'template/socket_connection_attempt.py.in'),
+        promise_config))
+    self.path_list.append(promise_v4)
+
     return self.path_list
 
+  def configureVarnishSlave(self, base_varnish_port, url, reference,
+      service_dict, domain):
+    # Varnish should use stunnel to connect to the backend
+    base_varnish_control_port = base_varnish_port
+    base_varnish_port += 1
+    # Use regex
+    host_regex = "((\[\w*|[0-9]+\.)(\:|)).*(\]|\.[0-9]+)"
+    slave_host = re.search(host_regex, url).group(0)
+    port_regex = "\w+(\/|)$"
+    matcher = re.search(port_regex, url)
+    if matcher is not None:
+      slave_port = matcher.group(0)
+      slave_port = slave_port.replace("/", "")
+    elif url.startswith("https://"):
+      slave_port = 443
+    else:
+      slave_port = 80
+    service_name = "varnish_%s" % reference
+    varnish_ip = self.getLocalIPv4Address()
+    stunnel_port = base_varnish_port + 1
+    self.installVarnishCache(service_name,
+      ip=varnish_ip,
+      port=base_varnish_port,
+      control_port=base_varnish_control_port,
+      backend_host=varnish_ip,
+      backend_port=stunnel_port,
+      size="1G")
+    service_dict[service_name] = dict(public_ip=varnish_ip,
+        public_port=stunnel_port,
+        private_ip=slave_host.replace("[", "").replace("]", ""),
+        private_port=slave_port)
+    return "%s http://%s:%s" % \
+        (domain, varnish_ip, base_varnish_port)
+
   def installLogrotate(self):
     """Installs logortate main configuration file and registers its to cron"""
     logrotate_d = os.path.abspath(os.path.join(self.etc_directory,
@@ -301,9 +386,9 @@ class Recipe(BaseSlapRecipe):
     apache_conf['port'] = port
     apache_conf['server_admin'] = 'admin@'
     apache_conf['error_log'] = os.path.join(self.log_directory,
-        name + '-error.log')
+        'frontend-apache-error.log')
     apache_conf['access_log'] = os.path.join(self.log_directory,
-        name + '-access.log')
+        'frontend-apache-access.log')
     self.registerLogRotation(name, [apache_conf['error_log'],
       apache_conf['access_log']], self.killpidfromfile + ' ' +
       apache_conf['pid_file'] + ' SIGUSR1')
@@ -383,7 +468,8 @@ class Recipe(BaseSlapRecipe):
     self.path_list.append(wrapper)
     return stunnel_conf
 
-  def installFrontendApache(self, ip_list, port, key, certificate, name,
+  def installFrontendApache(self, ip_list, key, certificate, name,
+                            port=4443, plain_http_port=8080,
                             rewrite_rule_list=[], rewrite_rule_zope_list=[],
                             access_control_string=None):
     # Create htdocs, populate it with default 404 document
@@ -395,10 +481,36 @@ class Recipe(BaseSlapRecipe):
     notfound_file_content = open(notfound_template_file_location, 'r').read()
     self._writeFile(notfound_file_location, notfound_file_content)
 
+    # Create mod_ssl cache directory
+    cache_directory_location = os.path.join(self.var_directory, 'cache')
+    mod_ssl_cache_location = os.path.join(cache_directory_location,
+        'httpd_mod_ssl')
+    self._createDirectory(cache_directory_location)
+    self._createDirectory(mod_ssl_cache_location)
+
+    # Create "custom" apache configuration file if it does not exist.
+    # Note : This file won't be erased or changed when slapgrid is ran.
+    # It can be freely customized by node admin.
+    custom_apache_configuration_directory = os.path.join(
+        self.data_root_directory, 'apache-conf.d')
+    self._createDirectory(custom_apache_configuration_directory)
+    custom_apache_configuration_file_location = os.path.join(
+        custom_apache_configuration_directory, 'apache_frontend.custom.conf')
+    f = open(custom_apache_configuration_file_location, 'a')
+    f.close()
+
+    # Create backup of custom apache configuration
+    backup_path = self.createBackupDirectory('custom_apache_conf_backup')
+    backup_cron = os.path.join(self.cron_d, 'custom_apache_conf_backup')
+    open(backup_cron, 'w').write(
+        '''0 0 * * * %(rdiff_backup)s %(source)s %(destination)s'''%dict(
+          rdiff_backup=self.options['rdiff_backup_binary'],
+          source=custom_apache_configuration_directory,
+          destination=backup_path))
+    self.path_list.append(backup_cron)
+
     # Create configuration file and rewritemaps
     apachemap_name = "apachemap.txt"
-    # XXX-Cedric : implement zope specific rewrites list. Current apachemap is
-    #              generic and does not use VirtualHost Monster.
     apachemapzope_name = "apachemapzope.txt"
     self.createConfigurationFile(apachemap_name, "\n".join(rewrite_rule_list))
     self.createConfigurationFile(apachemapzope_name,
@@ -406,9 +518,17 @@ class Recipe(BaseSlapRecipe):
     apache_conf = self._getApacheConfigurationDict(name, ip_list, port)
     apache_conf['ssl_snippet'] = self.substituteTemplate(
         self.getTemplateFilename('apache.ssl-snippet.conf.in'),
-        dict(login_certificate=certificate, login_key=key))
+        dict(login_certificate=certificate,
+            login_key=key,
+            httpd_mod_ssl_cache_directory=mod_ssl_cache_location,
+        )
+    )
 
-    apache_conf["listen"] = "\n".join(["Listen %s:%s" % (ip, port) for ip in ip_list])
+    apache_conf["listen"] = "\n".join([
+        "Listen %s:%s" % (ip, port)
+        for port in (plain_http_port, port)
+        for ip in ip_list
+    ])
 
     path = self.substituteTemplate(
         self.getTemplateFilename('apache.conf.path-protected.in'),
@@ -419,7 +539,9 @@ class Recipe(BaseSlapRecipe):
       apachemap_path=os.path.join(self.etc_directory, apachemap_name),
       apachemapzope_path=os.path.join(self.etc_directory, apachemapzope_name),
       apache_domain=name,
-      port=port,
+      https_port=port,
+      plain_http_port=plain_http_port,
+      custom_apache_conf=custom_apache_configuration_file_location,
     ))
 
     apache_conf_string = self.substituteTemplate(
@@ -427,11 +549,10 @@ class Recipe(BaseSlapRecipe):
 
     apache_config_file = self.createConfigurationFile('apache_frontend.conf',
         apache_conf_string)
-
-
     self.path_list.append(apache_config_file)
+
     self.path_list.extend(zc.buildout.easy_install.scripts([(
-      name, 'slapos.recipe.erp5.apache', 'runApache')], self.ws,
+      'frontend_apache', 'slapos.recipe.erp5.apache', 'runApache')], self.ws,
           sys.executable, self.wrapper_directory, arguments=[
             dict(
               required_path_list=[key, certificate],

slapos/recipe/apache_frontend/template/apache.conf.in

@@ -3,7 +3,6 @@
 
 # Basic server configuration
 PidFile "%(pid_file)s"
-LockFile "%(lock_file)s"
 ServerName %(server_name)s
 DocumentRoot %(document_root)s
 
@@ -18,8 +17,7 @@ AddType application/x-gzip .gz .tgz
 # As backend is trusting REMOTE_USER header unset it always
 RequestHeader unset REMOTE_USER
 
-# SSL Configuration
-%(ssl_snippet)s
+ServerTokens Prod
 
 # Log configuration
 ErrorLog "%(error_log)s"
@@ -28,38 +26,15 @@ LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"
 LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common
 CustomLog "%(access_log)s" common
 
-# Directory protection
-<Directory />
-    Options FollowSymLinks
-    AllowOverride None
-    Order deny,allow
-    Deny from all
-</Directory>
-
 %(path_enable)s
 
-# Rewrite part
-RewriteEngine On
-
-# Define the two rewritemaps : one for zope, one generic
-RewriteMap apachemapzope txt:%(apachemapzope_path)s
-RewriteMap apachemapgeneric txt:%(apachemap_path)s
-
-# First, we check if we have a zope backend server
-# If so, let's use Virtual Host Daemon rewrite
-#RewriteCond ${apachemapzope:%%{SERVER_NAME}} >""
-#RewriteRule ^/(\w+)($|/.*) ${apachemapzope:$1}/VirtualHostBase/https/%(apache_domain)s:%(port)s/VirtualHostRoot/_vh_$1$2 [L,P]
-
-# If we have generic backend server, let's rewrite without virtual host daemon
-RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >""
-RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P]
-
-# If nothing exist : put a nice error
-ErrorDocument 404 /notfound.html
-
 # List of modules
+#LoadModule unixd_module modules/mod_unixd.so
+#LoadModule access_compat_module modules/mod_access_compat.so
+#LoadModule authz_core_module modules/mod_authz_core.so
 LoadModule authz_host_module modules/mod_authz_host.so
 LoadModule log_config_module modules/mod_log_config.so
+LoadModule deflate_module modules/mod_deflate.so
 LoadModule setenvif_module modules/mod_setenvif.so
 LoadModule version_module modules/mod_version.so
 LoadModule proxy_module modules/mod_proxy.so
@@ -71,4 +46,91 @@ LoadModule dav_fs_module modules/mod_dav_fs.so
 LoadModule negotiation_module modules/mod_negotiation.so
 LoadModule rewrite_module modules/mod_rewrite.so
 LoadModule headers_module modules/mod_headers.so
+LoadModule cache_module modules/mod_cache.so
+LoadModule mem_cache_module modules/mod_mem_cache.so
 LoadModule antiloris_module modules/mod_antiloris.so
+
+# The following directives modify normal HTTP response behavior to
+# handle known problems with browser implementations.
+BrowserMatch "Mozilla/2" nokeepalive
+BrowserMatch ".*MSIE.*" nokeepalive ssl-unclean-shutdown \
+                        downgrade-1.0 force-response-1.0
+BrowserMatch "RealPlayer 4\.0" force-response-1.0
+BrowserMatch "Java/1\.0" force-response-1.0
+BrowserMatch "JDK/1\.0" force-response-1.0
+# The following directive disables redirects on non-GET requests for
+# a directory that does not include the trailing slash.  This fixes a 
+# problem with Microsoft WebFolders which does not appropriately handle 
+# redirects for folders with DAV methods.
+# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
+BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
+BrowserMatch "MS FrontPage" redirect-carefully
+BrowserMatch "^WebDrive" redirect-carefully
+BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully
+BrowserMatch "^gnome-vfs" redirect-carefully
+BrowserMatch "^XML Spy" redirect-carefully
+BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
+
+# Cache directives
+CacheEnable mem /
+CacheDefaultExpire 3600
+MCacheSize 8192
+MCacheMaxObjectCount 1000
+MCacheMaxObjectSize 8192
+MCacheRemovalAlgorithm LRU
+
+# Deflate
+AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/x-javascript application/javascript
+BrowserMatch ^Mozilla/4 gzip-only-text/html
+BrowserMatch ^Mozilla/4\.0[678] no-gzip
+BrowserMatch \bMSIE !no-gzip !gzip-only-text/html 
+# Make sure proxies don't deliver the wrong content
+Header append Vary User-Agent
+
+# SSL Configuration
+%(ssl_snippet)s
+
+<VirtualHost *:%(https_port)s>
+  SSLEngine on
+  SSLProxyEngine on
+  # Rewrite part
+  ProxyVia On
+  ProxyPreserveHost On
+  ProxyTimeout 600
+  RewriteEngine On
+
+  # Define the two rewritemaps : one for zope, one generic
+  RewriteMap apachemapzope txt:%(apachemapzope_path)s
+  RewriteMap apachemapgeneric txt:%(apachemap_path)s
+
+  # First, we check if we have a zope backend server
+  # If so, let's use Virtual Host Daemon rewrite
+  RewriteCond ${apachemapzope:%%{SERVER_NAME}} >""
+  RewriteRule ^/(.*)$ ${apachemapzope:%%{SERVER_NAME}}/VirtualHostBase/https/%%{SERVER_NAME}:%%{SERVER_PORT}/VirtualHostRoot/$1 [L,P]
+
+  # If we have generic backend server, let's rewrite without virtual host daemon
+  RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >""
+  RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P]
+
+  # If nothing exist : put a nice error
+  ErrorDocument 404 /notfound.html
+</VirtualHost>
+
+<VirtualHost *:%(plain_http_port)s>
+  RewriteEngine On
+  ProxyPreserveHost On
+
+  # We accept generic (i.e not lamp) backends on http
+  RewriteMap apachemapgeneric txt:%(apachemap_path)s
+  RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >""
+  RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P]
+
+  # Not using HTTPS? Ask that guy over there.
+  # Dummy redirection to https. Note: will work only if https listens
+  # on standard port (443).
+  RewriteRule ^/(.*)$ https://%%{SERVER_NAME}%%{REQUEST_URI}
+</VirtualHost>
+
+# Include configuration file not operated by slapos. This file won't be erased
+# or changed when slapgrid is ran. It can be freely customized by node admin.
+Include %(custom_apache_conf)s

slapos/recipe/apache_frontend/template/apache.ssl-snippet.conf.in

-SSLEngine on
-SSLProxyEngine on
 SSLCertificateFile %(login_certificate)s
 SSLCertificateKeyFile %(login_key)s
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
+SSLSessionCache shmcb:/%(httpd_mod_ssl_cache_directory)s/ssl_scache(512000)
+SSLSessionCacheTimeout  300
+SSLRandomSeed startup /dev/urandom 256
+SSLRandomSeed connect builtin
+SSLProtocol -ALL +SSLv3 +TLSv1
+SSLHonorCipherOrder On
+SSLCipherSuite RC4-SHA:HIGH:!ADH
+<FilesMatch "\.(cgi|shtml|phtml|php)$">
+      SSLOptions +StdEnvVars
+</FilesMatch>
+# Accept proxy to sites using self-signed SSL certificates
+SSLProxyCheckPeerCN off
+SSLProxyCheckPeerExpire off

slapos/recipe/apache_zope_backend/__init__.py

@@ -70,7 +70,7 @@ class Recipe(GenericBaseRecipe):
     apache_conf['server_name'] = '%s' % apache_conf['ip']
     apache_conf['path'] = '/'
     apache_conf['access_control_string'] = access_control_string
-    apache_conf['rewrite_rule'] = "RewriteRule (.*) %s%s [L,P]" % (backend,
+    apache_conf['rewrite_rule'] = "RewriteRule (.*) %s%s$1 [L,P]" % (backend,
       self.options.get('backend-path', '/'))
     apache_conf_string = pkg_resources.resource_string(__name__,
           'template/apache.zope.conf.in') % apache_conf

slapos/recipe/apachephp/__init__.py

@@ -37,7 +37,7 @@ class Recipe(GenericBaseRecipe):
     path_list = []
 
     # Copy application
-    shutil.rmtree(self.options['htdocs'])
+    if not os.path.exists(self.options['htdocs']):
       shutil.copytree(self.options['source'],
                       self.options['htdocs'])
 
@@ -85,6 +85,8 @@ class Recipe(GenericBaseRecipe):
       with open(secret_key_filename, 'r') as secret_key_file:
         secret_key = secret_key_file.read()
 
+    # Generate application configuration file
+    if self.options.get('template'):
       application_conf = dict(mysql_database=self.options['mysql-database'],
                               mysql_user=self.options['mysql-username'],
                               mysql_password=self.options['mysql-password'],
@@ -112,6 +114,8 @@ class Recipe(GenericBaseRecipe):
       # Reload apache configuration
       with open(self.options['pid-file']) as pid_file:
         pid = int(pid_file.read().strip(), 10)
+      try:
         os.kill(pid, signal.SIGUSR1) # Graceful restart
-
+      except OSError:
+        pass
     return path_list

slapos/recipe/check_url_available/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+import sys
+
+class Recipe(GenericBaseRecipe):
+  """
+  Create script that will check if "url" is available (e.g page answers 200 OK).
+  """
+
+  def install(self):
+    config = {
+      'url': self.options['url'],
+      'shell_path': self.options['dash_path'],
+      'curl_path': self.options['curl_path'],
+    }
+
+    # XXX-Cedric in this script, curl won't check certificate
+    promise = self.createExecutable(
+      self.options['path'],
+      self.substituteTemplate(self.getTemplateFilename('check_url.in'), config)
+    )
+
+    return [promise]

slapos/recipe/check_url_available/template/check_url.in

+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+
+URL="%(url)s"
+
+if [ -z $URL ]; then
+  echo "No URL specified." >&2
+  exit 3
+fi
+
+CODE=$(%(curl_path)s -k -sL $URL -w %%{http_code} -o /dev/null)
+
+if [ $CODE -eq 000 ]; then
+  echo "$URL is not available (server not reachable)." >&2
+  exit 1
+fi
+
+if ! [ $CODE -eq 200 ]; then
+  echo "$URL is not available (returned $CODE)." >&2
+  exit 2
+fi

slapos/recipe/cloud9/__init__.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+import os
+
+class Recipe(GenericBaseRecipe):
+  """Deploy a fully operational cloud9 service."""
+
+  def _options(self, options):
+    self.ip = options['ip'].strip()
+    self.port = options['port'].strip()
+    self.git = options['git-binary'].strip()
+    self.node_executable = options['node-binary'].strip()
+    self.cloud9 = options['cloud9'].strip()
+    self.workdir = options['working-directory'].strip()
+    self.wrapper = options['wrapper'].strip()
+    # Set cloud9 access URL
+    options['access-url'] = 'http://[%s]:%s' % (self.ip, self.port)
+
+  def install(self):
+    path_list = []
+
+    environment = {
+        'PATH': os.path.dirname(self.git) + ':' + os.environ['PATH'],
+    }
+
+    cloud9_args = [self.node_executable, self.cloud9, '-l', self.ip, '-p',
+        self.port, '-w', self.workdir]
+
+    wrapper = self.createPythonScript(self.wrapper,
+        'slapos.recipe.librecipe.execute.executee',
+        (cloud9_args, environment)
+    )
+    path_list.append(wrapper)
+
+    return path_list

slapos/recipe/cloudooo/__init__.py

-##############################################################################
-#
-# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
-import os
-import pkg_resources
-import sys
-import zc.buildout
-import zc.recipe.egg
-
-class Recipe(BaseSlapRecipe):
-  def getTemplateFilename(self, template_name):
-    return pkg_resources.resource_filename(__name__,
-        'template/%s' % template_name)
-
-  def _install(self):
-    self.path_list = []
-    self.requirements, self.ws = self.egg.working_set([__name__])
-    # Use killpidfromfile from ERP5.
-    self.killpidfromfile = zc.buildout.easy_install.scripts(
-        [('killpidfromfile', __name__ + 'slapos.recipe.erp5.killpidfromfile',
-          'killpidfromfile')], self.ws, sys.executable, self.bin_directory)[0]
-    self.path_list.append(self.killpidfromfile)
-    conversion_server_conf = self.installConversionServer(
-        self.getLocalIPv4Address(), 23000, 23060)
-
-    self.linkBinary()
-    self.setConnectionDict(dict(
-      site_url="http://%s:%s/" % (self.getLocalIPv4Address(), 23000),
-    ))
-    return self.path_list
-
-  def linkBinary(self):
-    """Links binaries to instance's bin directory for easier exposal"""
-    for linkline in self.options.get('link_binary_list', '').splitlines():
-      if not linkline:
-        continue
-      target = linkline.split()
-      if len(target) == 1:
-        target = target[0]
-        path, linkname = os.path.split(target)
-      else:
-        linkname = target[1]
-        target = target[0]
-      link = os.path.join(self.bin_directory, linkname)
-      if os.path.lexists(link):
-        if not os.path.islink(link):
-          raise zc.buildout.UserError(
-              'Target link already %r exists but it is not link' % link)
-        os.unlink(link)
-      os.symlink(target, link)
-      self.logger.debug('Created link %r -> %r' % (link, target))
-      self.path_list.append(link)
-
-  def installConversionServer(self, ip, port, openoffice_port):
-    name = 'conversion_server'
-    working_directory = self.createDataDirectory(name)
-    conversion_server_dict = dict(
-      working_path=working_directory,
-      uno_path=self.options['ooo_uno_path'],
-      office_binary_path=self.options['ooo_binary_path'],
-      ip=ip,
-      port=port,
-      openoffice_port=openoffice_port,
-    )
-    for env_line in self.options['environment'].splitlines():
-      env_line = env_line.strip()
-      if not env_line:
-        continue
-      if '=' in env_line:
-        env_key, env_value = env_line.split('=')
-        conversion_server_dict[env_key.strip()] = env_value.strip()
-      else:
-        raise zc.buildout.UserError('Line %r in environment parameter is '
-            'incorrect' % env_line)
-    config_file = self.createConfigurationFile(name + '.cfg',
-        self.substituteTemplate(self.getTemplateFilename('cloudooo.cfg.in'),
-          conversion_server_dict))
-    self.path_list.append(config_file)
-    # Use execute from erp5.
-    self.path_list.extend(zc.buildout.easy_install.scripts([(name,
-      __name__ + 'slapos.recipe.librecipe.execute',
-      'execute_with_signal_translation')], self.ws,
-      sys.executable, self.wrapper_directory,
-      arguments=[self.options['ooo_paster'].strip(), 'serve', config_file]))
-    return {
-      name + '_port': conversion_server_dict['port'],
-      name + '_ip': conversion_server_dict['ip']
-      }

slapos/recipe/cloudooo/template/cloudooo.cfg.in

-[app:main]
-use = egg:cloudooo
-#
-## System config
-#
-debug_mode = True
-# Folder where pid files, lock files and virtual frame buffer mappings
-# are stored. In this folder is necessary create a folder tmp, because this
-# folder is used to create all temporary documents.
-working_path = %(working_path)s
-# Folder where UNO library is installed
-uno_path = %(uno_path)s
-# Folder where soffice.bin is installed
-office_binary_path = %(office_binary_path)s
-#
-## Monitor Settings
-#
-# Limit to use the Openoffice Instance. if pass of the limit, the instance is
-# stopped and another is started.
-limit_number_request = 100
-# Interval to check the factory
-monitor_interval = 10
-timeout_response = 180
-enable_memory_monitor = True
-# Set the limit in MB
-# e.g 1000 = 1 GB, 100 = 100 MB
-limit_memory_used = 3000
-#
-## OOFactory Settings
-#
-# The pool consist of several OpenOffice.org instances
-application_hostname = %(ip)s
-# OpenOffice Port
-openoffice_port = %(openoffice_port)s
-# LD_LIBRARY_PATH passed to OpenOffice
-env-LD_LIBRARY_PATH = %(LD_LIBRARY_PATH)s
-
-#
-# Mimetype Registry
-# It is used to select the handler that will be used in conversion.
-# Priority matters, first match take precedence on next lines.
-mimetype_registry =
-  application/pdf * ooo
-  video/* * ffmpeg
-  audio/* * ffmpeg
-  application/x-shockwave-flash * ffmpeg
-  application/ogg * ffmpeg
-  application/ogv * ffmpeg
-  image/* * ooo
-  text/* * ooo
-  application/zip * ooo
-  application/msword * ooo
-  application/vnd* * ooo
-  application/x-vnd* * ooo
-  application/postscript * ooo
-  application/wmf * ooo
-  application/csv * ooo
-  application/x-openoffice-gdimetafile * ooo
-  application/x-emf * ooo
-  application/emf * ooo
-  application/octet* * ooo
-  * application/vnd.oasis.opendocument* ooo
-
-[server:main]
-use = egg:PasteScript#wsgiutils
-host = %(ip)s
-port = %(port)s

slapos/recipe/cloudooo_test/__init__.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+import urlparse
+
+class Recipe(GenericBaseRecipe):
+  def install(self):
+    path_list = []
+    common_dict = dict(
+        prepend_path=self.options['prepend-path'],
+    )
+    common_list = [
+           "--paster_path", self.options['ooo-paster'],
+           self.options['configuration-file']
+          ]
+    run_unit_test_path = self.createPythonScript(self.options['run-unit-test'],
+        __name__ + '.test.runUnitTest', [dict(
+        call_list=[self.options['run-unit-test-binary'],
+          ] + common_list, **common_dict)])
+
+    path_list.append(run_unit_test_path)
+    path_list.append(self.createPythonScript(self.options['run-test-suite'],
+        __name__ + '.test.runTestSuite', [dict(
+        call_list=[self.options['run-test-suite-binary'],
+          ], **common_dict)]))
+
+    return path_list

slapos/recipe/cloudooo_test/test.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+import sys
+def runTestSuite(args):
+  env = os.environ.copy()
+  d = args[0]
+  env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
+  # Deal with Shebang size limitation
+  executable_filepath = d['call_list'][0]
+  file_object = open(executable_filepath, 'r')
+  line = file_object.readline()
+  file_object.close()
+  argument_list = []
+  if line[:2] == '#!':
+    executable_filepath = line[2:].strip()
+    argument_list.append(executable_filepath)
+  argument_list.extend(d['call_list'])
+  argument_list.extend(sys.argv[1:])
+  argument_list.append(env)
+  os.execle(executable_filepath, *argument_list)
+
+def runUnitTest(args):
+  env = os.environ.copy()
+  d = args[0]
+  env['PATH'] = ':'.join([d['prepend_path']] + os.environ.get('PATH', '').split(':'))
+  # Deal with Shebang size limitation
+  executable_filepath = d['call_list'][0]
+  file_object = open(executable_filepath, 'r')
+  line = file_object.readline()
+  file_object.close()
+  argument_list = []
+  if line[:2] == '#!':
+    executable_filepath = line[2:].strip()
+    argument_list.append(executable_filepath)
+  argument_list.extend(d['call_list'])
+  argument_list.extend(sys.argv[1:])
+  argument_list.append(env)
+  os.execle(executable_filepath, *argument_list)
+

slapos/recipe/container.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import ConfigParser
+import uuid
+import os
+import subprocess
+
+# XXX : This is in order to get the computer_partition object
+#       which exposes the state of the current partition.
+#
+# XXX : We could have modify slapgrid in order to put the
+#       state of the current partition offline. But this is
+#       written to have the most minimal impact.
+from slapos.recipe.librecipe import GenericSlapRecipe
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericSlapRecipe):
+
+    def _options(self, options):
+        config_filename = self.options['config']
+
+        container_uuid = None
+
+        if os.path.exists(config_filename):
+            config = ConfigParser.ConfigParser()
+            config.read(config_filename)
+            if config.has_option('requested', 'name'):
+                container_uuid = uuid.UUID(hex=config.get('requested', 'name'))
+
+        if container_uuid is None:
+            # uuid wasn't generated at first in order to avoid
+            # wasting entropy
+            container_uuid = uuid.uuid4()
+
+        options['slapcontainer-name'] = container_uuid.hex
+
+        return options
+
+
+
+    def _install(self):
+        path_list = []
+
+        self.logger.info("Putting slapcontainer configuration file...")
+
+        config = ConfigParser.ConfigParser()
+        config.add_section('requested')
+        config.set('requested', 'status',
+                   self.computer_partition.getState())
+        config.set('requested', 'name', self.options['slapcontainer-name'])
+        config.add_section('rootfs')
+        config.set('rootfs', 'image', self.options['image'])
+        config.set('rootfs', 'complete', self.options['image-complete'])
+        config.add_section('network')
+        config.set('network', 'interface', self.options['interface'])
+        config.add_section('config')
+        config.set('config', 'file', self.options['lxc-config'])
+
+        # Just a touch
+        open(self.options['lxc-config'], 'a').close()
+
+        config_filename = self.options['config']
+        with open(config_filename, 'w') as config_file:
+            config.write(config_file)
+        path_list.append(config_filename)
+
+        return path_list

slapos/recipe/downloader.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import os
+import urllib
+import hashlib
+import tempfile
+import shutil
+import subprocess
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+BUFFER_SIZE = 1024
+
+def service(args):
+    environ = os.environ.copy()
+    environ.update(PATH=args['path'])
+    if not os.path.exists(args['confirm']):
+        tmpdir = tempfile.mkdtemp()
+        try:
+            # XXX: Hardcoded path
+            tmpoutput = os.path.join(tmpdir, 'downloaded')
+            urllib.urlretrieve(args['url'], tmpoutput)
+
+            if args['md5'] is not None:
+                # XXX: we need to find a better way to do a md5sum
+                md5sum = hashlib.md5()
+                with open(args['output'], 'r') as output:
+                    file_buffer = output.read(BUFFER_SIZE)
+                    while len(file_buffer) > 0:
+                        md5sum.update(file_buffer)
+                        file_buffer = output.read(BUFFER_SIZE)
+
+                if args['md5'] != md5sum.hexdigest():
+                    return 127 # Not-null return code
+
+            if not args['archive']:
+                os.rename(tmpoutput, args['output'])
+            else:
+                # XXX: hardcoding path
+                extract_dir = os.path.join(tmpdir, 'extract')
+                os.mkdir(extract_dir)
+                subprocess.check_call(
+                    ['tar', '-x', '-f', tmpoutput,
+                            '-C', extract_dir,
+                    ],
+                    env=environ,
+                )
+                archive_content = os.listdir(extract_dir)
+                if len(archive_content) == 1 and \
+                   os.path.isfile(os.path.join(extract_dir,
+                                               archive_content[0])):
+                    os.rename(os.path.join(extract_dir,
+                                           archive_content[0]),
+                              args['output'])
+                else:
+                    return 127 # Not-null return code
+
+        finally:
+            shutil.rmtree(tmpdir)
+
+        # Just a touch on args['confirm'] file
+        open(args['confirm'], 'w').close()
+
+    return 0
+
+
+
+class Recipe(GenericBaseRecipe):
+
+    def install(self):
+        path_list = []
+
+        md5sum = self.options.get('md5sum', '')
+        if len(md5sum) == 0:
+            md5sum = None
+
+        keywords = {
+            'url': self.options['url'],
+            'md5': md5sum,
+            'output': self.options['downloaded-file'],
+            'confirm': self.options['downloaded-file-complete'],
+            'archive': self.optionIsTrue('archive', False),
+        }
+        if keywords['archive']:
+            keywords['path'] = self.options['path']
+        path_list.append(
+            self.createPythonScript(
+                self.options['binary'],
+                'slapos.recipe.downloader.service',
+                keywords,
+            )
+        )
+
+        return path_list

slapos/recipe/erp5_bootstrap/template/erp5_bootstrap.in

@@ -22,6 +22,9 @@ result = zope_connection.getresponse()
 
 if result.status == 204: # and (result.read() == "False"):
 
+  # Use a new connection
+  zope_connection = httplib.HTTPConnection(host)
+
   # Create the expected ERP5 instance
   zope_connection.request(
     'POST', '/manage_addProduct/ERP5/manage_addERP5Site',
@@ -32,4 +35,11 @@ if result.status == 204: # and (result.read() == "False"):
       'cmf_activity_sql_connection_string': mysql_url,
     }),
     headers=header_dict)
+  # Wait for the erp5 response, to prevent multiple requests
+  # been done by the same script.
+  result = zope_connection.getresponse()
 
+  # Read result make sure the site really finished to 
+  #created the ERP5 site.
+  result.read()
+  print "ERP5 site created."

slapos/recipe/erp5_update/__init__.py

@@ -29,6 +29,7 @@ from slapos.recipe.librecipe import GenericSlapRecipe
 
 class Recipe(GenericSlapRecipe):
   def _install(self):
+    self.logger.warn('DEPRECATED: Please update your configuration to use erp5.promise and erp5.bootstrap instead.')
     conversion_server = None
     if 'cloudooo-url' in self.options and self.options['cloudooo-url']:
       parsed = urlparse.urlparse(self.options['cloudooo-url'])

slapos/recipe/firefox/__init__.py

+##############################################################################
+#
+# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+#############################################################################
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+import sys
+
+class Recipe(GenericBaseRecipe):
+  def install(self):
+
+    prefjs = self.createFile(
+      self.options['prefsjs-path'],
+      self.substituteTemplate(self.getTemplateFilename('prefs.js'), {}))
+
+    config = {
+      'firefox_binary': self.options['firefox-path'],
+      'python_path': sys.executable,
+      'tmp_path': self.options['tmp-path'],
+      'pref_path': prefjs,
+      }
+
+    runner = self.createExecutable(
+      self.options['runner-path'],
+      self.substituteTemplate(self.getTemplateFilename('firefox_run.in'),
+                              config))
+
+    return [runner, prefjs]
+

slapos/recipe/firefox/template/firefox_run.in

+#!%(python_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+#
+
+import os
+from subprocess import Popen, PIPE
+import tempfile
+import shutil
+import sys
+import signal
+import subprocess
+import time
+
+os.environ['MOZ_NO_REMOTE'] = '1'
+os.environ['LC_ALL'] = 'C'
+os.environ['MOZ_CRASHREPORTER_DISABLE'] = '1'
+os.environ['NO_EM_RESTART'] = '1'
+os.environ['TMPDIR'] = "%(tmp_path)s"
+os.environ['DISPLAY'] = ':0'
+# XXX .Xauthority
+
+profile_path = tempfile.mkdtemp()
+shutil.copyfile('%(pref_path)s', os.path.join(profile_path, 'pref.js'))
+# os.environ['HOME'] = profile_path
+child_pg = None
+
+def sig_handler(signal, frame):
+  if child_pg is not None:
+    os.killpg(child_pg, signal.SIGHUP)
+    os.killpg(child_pg, signal.SIGTERM)
+  sys.exit(0)
+
+signal.signal(signal.SIGINT, sig_handler)
+signal.signal(signal.SIGQUIT, sig_handler)
+signal.signal(signal.SIGTERM, sig_handler)
+
+def execute_with_signal_translation(args):
+  """Run process as children and translate from SIGTERM to another signal"""
+  child = subprocess.Popen(args, close_fds=True, preexec_fn=os.setsid)
+  child_pg = child.pid
+  try:
+    while True:
+      time.sleep(2)
+  finally:
+    os.killpg(child_pg, signal.SIGHUP)
+    os.killpg(child_pg, signal.SIGTERM)
+
+try:
+  execute_with_signal_translation(
+    ["%(firefox_binary)s", "-no-remote", "-profile", profile_path] + sys.argv[1:])
+
+finally:
+  shutil.rmtree(profile_path)
+  

slapos/recipe/firefox/template/prefs.js

+// Don't ask if we want to switch default browsers
+user_pref("browser.shell.checkDefaultBrowser", false);
+user_pref("browser.startup.homepage_override.mstone", "ignore");
+
+// disable application updates
+user_pref("app.update.enabled", false)
+
+// disables the 'know your rights' button from displaying on first run
+user_pref("browser.rights.3.shown", true);
+
+// Disable pop-up blocking
+user_pref("browser.allowpopups", true);
+user_pref("dom.disable_open_during_load", false);
+user_pref("browser.tabs.warnOnClose", false);
+
+// Configure us as the local proxy
+//user_pref("network.proxy.type", 2);
+
+// Disable security warnings
+user_pref("security.warn_submit_insecure", false);
+user_pref("security.warn_submit_insecure.show_once", false);
+user_pref("security.warn_entering_secure", false);
+user_pref("security.warn_entering_secure.show_once", false);
+user_pref("security.warn_entering_weak", false);
+user_pref("security.warn_entering_weak.show_once", false);
+user_pref("security.warn_leaving_secure", false);
+user_pref("security.warn_leaving_secure.show_once", false);
+user_pref("security.warn_viewing_mixed", false);
+user_pref("security.warn_viewing_mixed.show_once", false);
+
+// Disable "do you want to remember this password?"
+user_pref("signon.rememberSignons", false);
+
+// increase the timeout before warning of unresponsive script
+user_pref("dom.max_script_run_time", 120);
+
+// this is required to upload files
+// user_pref("capability.principal.codebase.p1.granted", "UniversalFileRead");
+// user_pref("signed.applets.codebase_principal_support", true);
+// user_pref("capability.principal.codebase.p1.id", "http://");
+// user_pref("capability.principal.codebase.p1.subjectName", "");
+
+user_pref("browser.link.open_external", 3);
+user_pref("browser.link.open_newwindow", 3);
+
+// disables the request to send performance data from displaying
+user_pref("toolkit.telemetry.prompted", 2);
+user_pref("toolkit.telemetry.rejected", true);
+
+user_pref("browser.migration.version", 5);
+user_pref("extensions.SelectionUI", true);
+user_pref("network.cookie.prefsMigrated", true);
+user_pref("browser.bookmarks.restore_default_bookmarks", false);
+user_pref("browser.places.smartBookmarksVersion", 2);
+user_pref("privacy.sanitize.migrateFx3Prefs", true);

slapos/recipe/generate_erp5_tidstorage.py

-##############################################################################
-#
-# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-from slapos.recipe.librecipe import GenericSlapRecipe
-import os
-import json
-import traceback
-
-SECTION_BACKEND_PUBLISHER = """[publish-apache-backend-list]
-recipe = slapos.cookbook:publish"""
-ZOPE_PORT_BASE = 12000
-ZEO_PORT_BASE = 15000
-HAPROXY_PORT_BASE = 11000
-APACHE_PORT_BASE = 10000
-
-class Recipe(GenericSlapRecipe):
-  def _options(self, options):
-    self.dirname = os.path.join(self.buildout['buildout']['parts-directory'],
-      self.name)
-    options['output'] = os.path.join(self.dirname, self.name + '.cfg')
-
-  def _generateRealTemplate(self):
-    current_zeo_port = ZEO_PORT_BASE
-    current_zope_port = ZOPE_PORT_BASE
-    current_apache_port = APACHE_PORT_BASE
-    current_haproxy_port = HAPROXY_PORT_BASE
-    json_data = json.loads(self.parameter_dict['json'])
-    site_id = str(json_data['site-id'])
-    # prepare zeo
-    output = ''
-    part_list = []
-    zope_dict = {}
-    zope_connection_dict = {}
-    known_tid_storage_identifier_dict = {}
-    snippet_zeo = open(self.options['snippet-zeo']).read()
-    for zeo_id, zeo_configuration_list in json_data['zeo'].iteritems():
-      if not type(zeo_configuration_list) in (type([]), type(set()), type(())):
-        raise ValueError('%s passed in json is not a list, json: %s.' % (
-          zeo_configuration_list, json_data))
-      storage_list = []
-      a = storage_list.append
-      for zeo_slave in zeo_configuration_list:
-        zope_connection_dict[zeo_slave['storage-name']] = {
-          'zope-cache-size': zeo_slave['zope-cache-size'],
-          'zeo-cache-size': zeo_slave['zeo-cache-size'],
-          'mount-point': zeo_slave['mount-point'] % {'site-id': site_id},
-          'storage-name': zeo_slave['storage-name'],
-          'server': '${zeo-instance-%(zeo-id)s:ip}:${zeo-instance-%(zeo-id)s:port}' % {'zeo-id': zeo_id}
-        }
-        zodb_path = os.path.join('${directory:zodb}', zeo_slave['storage-name'] + '.fs')
-        a('  storage-name=%(storage-name)s zodb-path=%(zodb-path)s' % {'zodb-path': zodb_path, 'storage-name': zeo_slave['storage-name']})
-        known_tid_storage_identifier_dict[
-          "((('%(ip)s', %(port)s),), '%(storage_name)s')" % dict(
-            ip='${zeo-instance-%s:ip}' % zeo_id,
-            port='${zeo-instance-%s:port}' % zeo_id,
-            storage_name=zeo_slave['storage-name'])] = (zodb_path, '${directory:zodb-backup}/%s/' % zeo_slave['storage-name'], zeo_slave['serialize-path'] % {'site-id': site_id})
-      current_zeo_port += 1
-      output += snippet_zeo % dict(
-        zeo_id=zeo_id,
-        zeo_port=current_zeo_port,
-        storage_list='\n'.join(storage_list)
-      )
-      part_list.extend([
-        "zeo-instance-%s" % zeo_id,
-        "logrotate-entry-zeo-%s" % zeo_id
-      ])
-
-    zeo_connection_list = []
-    a = zeo_connection_list.append
-    for k, v in zope_connection_dict.iteritems():
-      a('  zeo-cache-size=%(zeo-cache-size)s zope-cache-size=%(zope-cache-size)s server=%(server)s mount-point=%(mount-point)s storage-name=%(storage-name)s' % v)
-    zeo_connection_string = '\n'.join(zeo_connection_list)
-    zope_dict.update(
-      timezone=json_data['timezone'],
-      zeo_connection_string=zeo_connection_string,
-      site_id=site_id,
-    )
-    # always one distribution node
-    current_zope_port += 1
-    snippet_zope = open(self.options['snippet-zope']).read()
-    zope_id = 'zope-distribution'
-    part_list.append(zope_id)
-    part_list.append('logrotate-entry-%s' % zope_id)
-    output += snippet_zope % dict(zope_thread_amount=1, zope_id=zope_id,
-      zope_port=current_zope_port, zope_timeserver=True, 
-      longrequest_logger_file='', longrequest_logger_timeout='', 
-      longrequest_logger_interval='', **zope_dict)
-    # always one admin node
-    current_zope_port += 1
-    zope_id = 'zope-admin'
-    part_list.append(zope_id)
-    part_list.append('logrotate-entry-%s' % zope_id)
-    output += snippet_zope % dict(zope_thread_amount=1, zope_id=zope_id,
-      zope_port=current_zope_port, zope_timeserver=False, 
-      longrequest_logger_file='', longrequest_logger_timeout='', 
-      longrequest_logger_interval='', **zope_dict)
-    # handle activity key
-    for q in range(1, json_data['activity']['zopecount'] + 1):
-      current_zope_port += 1
-      part_name = 'zope-activity-%s' % q
-      part_list.append(part_name)
-      part_list.append('logrotate-entry-%s' % part_name)
-      output += snippet_zope % dict(zope_thread_amount=1, zope_id=part_name,
-        zope_port=current_zope_port, zope_timeserver=True,
-        longrequest_logger_file='', longrequest_logger_timeout='', 
-        longrequest_logger_interval='', **zope_dict)
-    # handle backend key
-    snippet_backend = open(self.options['snippet-backend']).read()
-    publish_url_list = []
-    for backend_name, backend_configuration in json_data['backend'].iteritems():
-      haproxy_backend_list = []
-      for q in range(1, backend_configuration['zopecount'] + 1):
-        current_zope_port += 1
-        part_name = 'zope-%s-%s' % (backend_name, q)
-        part_list.append(part_name)
-        part_list.append('logrotate-entry-%s' % part_name)
-        longrequest_logger = backend_configuration.get("longrequest-logger", None)
-        if longrequest_logger is not None:
-          longrequest_part_name = '%s-longrequest' %part_name 
-          longrequest_logger_file = '${basedirectory:log}/%s.log' \
-                                      %longrequest_part_name
-          longrequest_logger_timeout = longrequest_logger.get('timeout', '4')
-          longrequest_logger_interval = longrequest_logger.get('interval', '2')
-        else:
-          longrequest_logger_file = longrequest_logger_timeout = \
-            longrequest_logger_interval = ''
-        output += snippet_zope % dict(
-          zope_thread_amount=backend_configuration['thread-amount'],
-          zope_id=part_name, zope_port=current_zope_port, zope_timeserver=False,
-          longrequest_logger_file=longrequest_logger_file, 
-          longrequest_logger_timeout=longrequest_logger_timeout, 
-          longrequest_logger_interval=longrequest_logger_interval,
-          **zope_dict)
-        haproxy_backend_list.append('${%(part_name)s:ip}:${%(part_name)s:port}' % dict(part_name=part_name))
-
-      scheme = backend_configuration.get('scheme', ['https'])
-
-      # now generate backend access
-      current_apache_port += 1
-      current_haproxy_port += 1
-      backend_dict = dict(
-        backend_name=backend_name,
-        apache_port=current_apache_port,
-        apache_public_port=current_apache_port+1,
-        haproxy_port=current_haproxy_port,
-        access_control_string=backend_configuration['access-control-string'],
-        maxconn=backend_configuration['maxconn'],
-        server_check_path='/%s/getId' % site_id,
-        haproxy_backend_list=' '.join(haproxy_backend_list),
-        ssl_authentication=backend_configuration.get('ssl-authentication',
-          False),
-        backend_path=backend_configuration.get('backend-path', '/') % {
-            'site-id': site_id}
-
-      )
-      current_apache_port += 1
-      output += snippet_backend % backend_dict
-
-      if 'http' in scheme:
-        part_list.append('apache-public-%(backend_name)s logrotate-entry-apache-public-%(backend_name)s' % dict(backend_name=backend_name))
-        publish_url_list.append('url-public-%(backend_name)s = http://[${apache-public-%(backend_name)s:ip}]:${apache-public-%(backend_name)s:port}' % dict(
-          backend_name=backend_name))
-      if 'https' in scheme:
-        part_list.append('apache-%(backend_name)s ca-apache-%(backend_name)s logrotate-entry-apache-%(backend_name)s haproxy-%(backend_name)s' % dict(backend_name=backend_name))
-        publish_url_list.append('url-%(backend_name)s = https://[${apache-%(backend_name)s:ip}]:${apache-%(backend_name)s:port}' % dict(
-          backend_name=backend_name))
-
-    output += SECTION_BACKEND_PUBLISHER + '\n'
-    output += '\n'.join(publish_url_list)
-    part_list.append('publish-apache-backend-list')
-    master_dict = self.parameter_dict.copy()
-    if 'erp5-ca' in json_data:
-      erp5_ca = json_data['erp5-ca']
-      # Fetching exactly named parameters from json in order to raise proper
-      # error if required
-      master_dict.update(
-        erp5_ca_country_code = erp5_ca['country-code'],
-        erp5_ca_email = erp5_ca['email'],
-        erp5_ca_state = erp5_ca['state'],
-        erp5_ca_city = erp5_ca['city'],
-        erp5_ca_company = erp5_ca['company']
-      )
-    else:
-      master_dict.update(dict(
-        erp5_ca_country_code = 'XX',
-        erp5_ca_email = 'xx@example.com',
-        # XXX-BBB: State by mistake has been configured as string "('State',)"
-        #          string, so keep this for backward compatibility of existing
-        #          automatically setup CAs
-        erp5_ca_state = "('State',)",
-        erp5_ca_city = 'City',
-        erp5_ca_company = 'Company'
-      ))
-    prepend = open(self.options['snippet-master']).read() % dict(
-        part_list='  \n'.join(['  '+q for q in part_list]),
-        known_tid_storage_identifier_dict=known_tid_storage_identifier_dict,
-        haproxy_section="haproxy-%s" % backend_name,
-        zope_section=zope_id,
-        site_id=site_id,
-        **master_dict
-        )
-    output = prepend + output
-    with open(self.options['output'], 'w') as f:
-      f.write(output)
-
-  def _install(self):
-    if not os.path.exists(self.dirname):
-      os.mkdir(self.dirname)
-    if not "json" in self.parameter_dict:
-      # no json transimtted, nothing to do
-      with open(self.options['output'], 'w') as f:
-        f.write("[buildout]\nparts =\n")
-    else:
-      try:
-        self._generateRealTemplate()
-      except Exception:
-        print 'Ignored issue during template generation:\n%s' % \
-          traceback.format_exc()
-    return [self.dirname]

slapos/recipe/generatemac.py

-
 ##############################################################################
 #
 # Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
@@ -26,15 +25,26 @@
 #
 ##############################################################################
 import random
+import os
 
 from slapos.recipe.librecipe import GenericBaseRecipe
 
 class Recipe(GenericBaseRecipe):
 
   def __init__(self, buildout, name, options):
+    if os.path.exists(options['storage-path']):
+      open_file = open(options['storage-path'], 'r')
+      options['mac-address'] = open_file.read()
+      open_file.close()
+
+    if options.get('mac-address', '') == '':
       # First octet has to represent a locally administered address
       octet_list = [254] + [random.randint(0x00, 0xff) for x in range(5)]
       options['mac-address'] = ':'.join(['%02x' % x for x in octet_list])
+    return GenericBaseRecipe.__init__(self, buildout, name, options)
 
   def install(self):
-    return []
+    open_file = open(self.options['storage-path'], 'w')
+    open_file.write(self.options['mac-address'])
+    open_file.close()
+    return [self.options['storage-path']]

slapos/recipe/generatepassword.py

+##############################################################################
+#
+# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import random
+import os
+import binascii
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+  def __init__(self, buildout, name, options):
+    if os.path.exists(options['storage-path']):
+      open_file = open(options['storage-path'], 'r')
+      options['passwd'] = open_file.read()
+      open_file.close()
+
+    if options.get('passwd', '') == '':
+      options['passwd'] = binascii.hexlify(os.urandom(
+                            int(options.get('bytes', '24'))))
+    return GenericBaseRecipe.__init__(self, buildout, name, options)
+
+  def install(self):
+    open_file = open(self.options['storage-path'], 'w')
+    open_file.write(self.options['passwd'])
+    open_file.close()
+    return [self.options['storage-path']]

slapos/recipe/generic_cloudooo/template/cloudooo.cfg.in

@@ -32,6 +32,7 @@ limit_memory_used = 3000
 application_hostname = %(ip)s
 # OpenOffice Port
 openoffice_port = %(openoffice_port)s
+
 # LD_LIBRARY_PATH passed to OpenOffice
 env-LD_LIBRARY_PATH = %(LD_LIBRARY_PATH)s
 env-FONTCONFIG_FILE = %(FONTCONFIG_FILE)s
@@ -41,12 +42,30 @@ env-FONTCONFIG_FILE = %(FONTCONFIG_FILE)s
 # It is used to select the handler that will be used in conversion.
 # Priority matters, first match take precedence on next lines.
 mimetype_registry =
-  application/pdf * pdf
   application/vnd.oasis.opendocument* * ooo
   application/vnd.sun.xml* * ooo
-  text/* * ooo
-  image/* image/* imagemagick
+  application/pdf text/* pdf
+  application/pdf * ooo
   video/* * ffmpeg
+  audio/* * ffmpeg
+  application/x-shockwave-flash * ffmpeg
+  application/ogg * ffmpeg
+  application/ogv * ffmpeg
+  image/png image/jpeg imagemagick
+  image/png * ooo
+  image/* image/* imagemagick
+  text/* * ooo
+  application/zip * ooo
+  application/msword * ooo
+  application/vnd* * ooo
+  application/x-vnd* * ooo
+  application/postscript * ooo
+  application/wmf * ooo
+  application/csv * ooo
+  application/x-openoffice-gdimetafile * ooo
+  application/x-emf * ooo
+  application/emf * ooo
+  application/octet* * ooo
   * application/vnd.oasis.opendocument* ooo
 
 [server:main]

slapos/recipe/generic_mysql/__init__.py

@@ -31,8 +31,10 @@ class Recipe(GenericBaseRecipe):
 
   def _options(self, options):
     options['password'] = self.generatePassword()
+    if 'test-database' in options:
       options['test-password'] = self.generatePassword()
-    for x in xrange(0, int(options['parallel-test-database-amount'])):
+    options.setdefault('parallel-test-database-amount', '0')
+    for x in xrange(int(options['parallel-test-database-amount'])):
       options['test-password-%s' % x] = self.generatePassword()
 
   def install(self):
@@ -40,28 +42,27 @@ class Recipe(GenericBaseRecipe):
 
     template_filename = self.getTemplateFilename('my.cnf.in')
 
-    mysql_conf = dict(
-        ip=self.options['ip'],
-        data_directory=self.options['data-directory'],
-        tcp_port=self.options['port'],
-        pid_file=self.options['pid-file'],
-        socket=self.options['socket'],
-        error_log=self.options['error-log'],
-        slow_query_log=self.options['slow-query-log'],
-        mysql_database=self.options['database'],
-        mysql_user=self.options['user'],
-        mysql_password=self.options['password'],
-        mysql_test_database=self.options['test-database'],
-        mysql_test_user=self.options['test-user'],
-        mysql_test_password=self.options['test-password'],
-    )
-
     mysql_binary = self.options['mysql-binary']
-    socket = self.options['socket'],
+    socket = self.options['socket']
+
+    if 'ip' in self.options:
+      networking = 'port = %s\nbind-address = %s' % (
+        self.options['port'],
+        self.options['ip'],
+      )
+    else:
+      networking = 'skip-networking'
 
     mysql_conf_file = self.createFile(
       self.options['conf-file'],
-      self.substituteTemplate(template_filename, mysql_conf)
+      self.substituteTemplate(template_filename, {
+        'networking': networking,
+        'data_directory': self.options['data-directory'],
+        'pid_file': self.options['pid-file'],
+        'socket': self.options['socket'],
+        'error_log': self.options['error-log'],
+        'slow_query_log': self.options['slow-query-log'],
+      })
     )
     path_list.append(mysql_conf_file)
 
@@ -77,22 +78,23 @@ class Recipe(GenericBaseRecipe):
     mysql_script_list.append(self.substituteTemplate(
       self.getTemplateFilename('initmysql.sql.in'),
       {
-        'mysql_database': mysql_conf['mysql_database'],
-        'mysql_user': mysql_conf['mysql_user'],
-        'mysql_password': mysql_conf['mysql_password']
+        'mysql_database': self.options['database'],
+        'mysql_user': self.options['user'],
+        'mysql_password': self.options['password']
       }
     ))
     # default test database
+    if 'test-database' in self.options:
       mysql_script_list.append(self.substituteTemplate(
         self.getTemplateFilename('initmysql.sql.in'),
         {
-        'mysql_database': mysql_conf['mysql_test_database'],
-        'mysql_user': mysql_conf['mysql_test_user'],
-        'mysql_password': mysql_conf['mysql_test_password']
+          'mysql_database': self.options['test-database'],
+          'mysql_user': self.options['test-user'],
+          'mysql_password': self.options['test-password']
         }
       ))
     # parallel test databases
-    for x in xrange(0, int(self.options['parallel-test-database-amount'])):
+    for x in xrange(int(self.options['parallel-test-database-amount'])):
       mysql_script_list.append(self.substituteTemplate(
         self.getTemplateFilename('initmysql.sql.in'),
         {
@@ -122,22 +124,25 @@ class Recipe(GenericBaseRecipe):
       self.options['wrapper'],
       '%s.mysql.runMysql' % __name__,
       [dict(
+        mysql_base_directory=self.options['mysql-base-directory'],
         mysql_install_binary=self.options['mysql-install-binary'],
         mysqld_binary=mysqld_binary,
-        data_directory=mysql_conf['data_directory'],
+        data_directory=self.options['data-directory'],
         mysql_binary=mysql_binary,
         socket=socket,
         configuration_file=mysql_conf_file,
        )]
     )
     path_list.append(mysqld)
+    # TODO: move to a separate recipe (ack'ed by Cedric)
+    if 'backup-script' in self.options:
       # backup configuration
       full_backup = self.options['full-backup-directory']
       incremental_backup = self.options['incremental-backup-directory']
       innobackupex_argument_list = [self.options['perl-binary'],
           self.options['innobackupex-binary'],
           '--defaults-file=%s' % mysql_conf_file,
-        '--socket=%s' %mysql_conf['socket'].strip(), '--user=root',
+          '--socket=%s' % socket.strip(), '--user=root',
           '--ibbackup=%s'% self.options['xtrabackup-binary']]
       environment = dict(PATH='%s' % self.options['bin-directory'])
       innobackupex_incremental = self.createPythonScript(self.options['innobackupex-incremental'], 'slapos.recipe.librecipe.execute.executee', [innobackupex_argument_list + ['--incremental'], environment])
@@ -146,7 +151,8 @@ class Recipe(GenericBaseRecipe):
       path_list.append(innobackupex_full)
       backup_controller = self.createPythonScript(self.options['backup-script'], __name__ + '.innobackupex.controller', [innobackupex_incremental, innobackupex_full, full_backup, incremental_backup])
       path_list.append(backup_controller)
-    # maatkit installation
+    # TODO: move to a separate recipe (ack'ed by Cedric)
+    # percona toolkit (formerly known as maatkit) installation
     for pt_script_name in (
         'pt-archiver',
         'pt-config-diff',
@@ -174,10 +180,13 @@ class Recipe(GenericBaseRecipe):
         'pt-variable-advisor',
         'pt-visual-explain',
         ):
+      option_name = pt_script_name + '-binary'
+      if option_name not in self.options:
+        continue
       pt_argument_list = [self.options['perl-binary'],
-          self.options['%s-binary' % pt_script_name],
+          self.options[option_name],
           '--defaults-file=%s' % mysql_conf_file,
-          '--socket=%s' %mysql_conf['socket'].strip(), '--user=root',
+          '--socket=%s' % socket.strip(), '--user=root',
           ]
       pt_exe = self.createPythonScript(os.path.join(self.options['bin-directory'], pt_script_name), 'slapos.recipe.librecipe.execute.executee', [pt_argument_list, environment])
       path_list.append(pt_exe)

slapos/recipe/generic_mysql/mysql.py

@@ -16,8 +16,9 @@ def runMysql(args):
       # XXX: Protect with proper root password
       # XXX: Follow http://dev.mysql.com/doc/refman/5.0/en/default-privileges.html
       popen = subprocess.Popen([conf['mysql_install_binary'],
-        '--skip-name-resolve', '--no-defaults', '--datadir=%s' %
-        conf['data_directory']],
+        '--skip-name-resolve', '--no-defaults',
+        '--datadir=%s' % conf['data_directory'],
+        '--basedir=%s' % conf['mysql_base_directory']],
         stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
       result = popen.communicate()[0]
       if popen.returncode is None or popen.returncode != 0:

slapos/recipe/generic_mysql/template/my.cnf.in

@@ -8,9 +8,12 @@
 # Loud fail is really required in such case.
 sql-mode="NO_ENGINE_SUBSTITUTION"
 
+# Workaround for https://bugs.launchpad.net/maria/+bug/985828
+# that causes wrong result in Resource_zGetInventoryList etc.
+optimizer_switch = derived_merge=off
+
 skip-show-database
-port = %(tcp_port)s
-bind-address = %(ip)s
+%(networking)s
 socket = %(socket)s
 datadir = %(data_directory)s
 pid-file = %(pid_file)s

slapos/recipe/generic_mysql/template/mysql-init-function.sql.in

@@ -2,4 +2,4 @@ USE mysql;
 DROP FUNCTION IF EXISTS last_insert_grn_id;
 CREATE FUNCTION last_insert_grn_id RETURNS INTEGER SONAME 'ha_mroonga.so';
 DROP FUNCTION IF EXISTS sphinx_snippets;
-CREATE FUNCTION sphinx_snippets RETURNS STRING SONAME 'sphinx.so';
+#CREATE FUNCTION sphinx_snippets RETURNS STRING SONAME 'ha_sphinx.so';

slapos/recipe/generic_varnish/__init__.py

@@ -38,7 +38,7 @@ class Recipe(GenericSlapRecipe):
   def _install(self):
     ip = self.options['ip']
     backend_url = self.parameter_dict['tidstorage-url']
-    backend_ip, backend_port = self._getBackendServer(backend_url)
+    backend_server, backend_port = self._getBackendServer(backend_url)
     varnishd_manager_port = int(self.options['manager-port'])
     varnishd_server_port = int(self.options['server-port'])
     path_list = []
@@ -53,9 +53,8 @@ class Recipe(GenericSlapRecipe):
       varnish_data=self.options['varnish-data'],
       shell_path=self.options['shell-path'],
       vcl_file=self.options['vcl-file'],
-      backend_ip = backend_ip,
-      backend_port = backend_port,
-      backend_server = "[%s]" % backend_ip,
+      backend_port=backend_port,
+      backend_server=backend_server,
     )
 
     path_list.append(self.createExecutable(self.options['varnishd-wrapper'],
@@ -70,7 +69,7 @@ class Recipe(GenericSlapRecipe):
     return path_list
 
   def _getBackendServer(self, url):
-    r = re.compile('\/\/\[(.*)\]:(\d*)')
+    r = re.compile('\/\/(\[.+\]|[\d.]+):(\d*)')
     result = r.search(url)
     ip = result.groups()[0]
     port = result.groups()[1]

slapos/recipe/generic_varnish/template/default.vcl.in

@@ -5,7 +5,7 @@
 #server.
 #
 backend default {
-  .host = "%(backend_ip)s";
+    .host = "%(backend_server)s";
     .port = "%(backend_port)s";
     .probe = {
         .timeout = 30s;
@@ -20,13 +20,14 @@ backend default {
             "User-Agent: Varnish";
     }
 }
-#
-#Below is a commented-out copy of the default VCL logic.  If you
-#redefine any of these subroutines, the built-in logic will be
-#appended to your code.
-#
 
+# Called at the beginning of a request, after the complete request has been received and parsed
 sub vcl_recv {
+    # Force lookup if the request is a no-cache request from the client
+    if (req.http.cache-control ~ "no-cache") {
+        ban_url(req.url);
+    }
+    # Pass any requests that Varnish does not understand straight to the backend.
     if (req.request != "GET" &&
         req.request != "HEAD" &&
         req.request != "PUT" &&
@@ -36,14 +37,41 @@ sub vcl_recv {
         req.request != "PURGE" &&
         req.request != "DELETE") {
         /* Non-RFC2616 or CONNECT which is weird. */
-      pipe;
+        return(pipe);
     }
+    # Pass anything other than GET and HEAD and PURGE directly.
     if (req.request != "GET" && req.request != "HEAD" && req.request != "PURGE") {
         /* We only deal with GET and HEAD by default */
-      pass;
+        return(pass);
     }
+    if (req.http.Authorization) {
+        /* Not cacheable by default */
+        return (pass);
+    }
+
+    # no need to have cookies for the resources
+    if (req.url ~ "\.(css|js|ico)$") {
+        unset req.http.cookie;
+    }
+    # remove bogus cookies
+    if (req.http.Cookie) {
+        set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *__utm.=[^;]+;? *", "\1");
+        set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *__ac_name=\x22\x22;? *", "\1");
+        set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *__ac=\x22Og.3D.3D\x22;? *", "\1");
+    }
+    if (req.http.Cookie == "") {
         remove req.http.Cookie;
+    }
+    if (req.http.Cookie && req.http.Cookie ~ "(^|; ) *__ac=") {
+        /* Not cacheable for authorised users,
+           but KM images are cacheable */
+        if (!(req.url ~ "/km_img/.*\.(png|gif)$")) {
+            return (pass);
+        }
+    }
+    # XXX Is it OK to remove this of all the case?
     remove req.http.Set-Cookie;
+
     if (req.http.Accept-Encoding) {
         if (req.http.Accept-Encoding ~ "gzip") {
             set req.http.Accept-Encoding = "gzip";
@@ -54,71 +82,104 @@ sub vcl_recv {
             remove req.http.Accept-Encoding;
         }
     }
-  # Force deflate
-  remove req.http.Accept-Encoding;
     # We do not care about Accept-Language, this is url controlled
     remove req.http.Accept-Language;
-  #if (req.request == "PURGE") {
-  #  if (!client.ip ~ purge) {
-  #    error 405 "Not allowed.";
-  #  }
-  #  purge_url(req.url);
-  #  error 200 "HASHPURGED";
-  #  unset req.http.x;
-  #}
-  set req.grace = 30d;
-  lookup;
+
+    ## XXX login form can defer based on __ac_name cookie value
+    if (req.url ~ "/(login_form|WebSite_viewLoginDialog)($|\?)") {
+        return (pass);
+    }
+
+    if (req.backend.healthy) {
+        set req.grace = 1h;
+    } else {
+        set req.grace = 1w;
+    }
+    return(lookup);
 }
 
+# Creates the varnish cache key by the url
 sub vcl_hash {
-    set req.hash += req.url;
-    hash;
+    hash_data(req.url);
+    return(hash);
 }
 
+# Called after a cache lookup if the requested document was found in the cache
 sub vcl_hit {
-   #if (req.request == "PURGE" && client.ip ~ purge) {
-   #  set obj.ttl = 0s;
-   #  error 200 "Purged.";
-   #}
-
-   #if (client.ip ~ purge){
-   #  # Force refresh from localhost
-   #  set obj.ttl = 0s;
-   #  return (restart);
-   #}
     # According Vary Header do not return those headers
     remove req.http.Accept-Language;
     remove req.http.Accept-Encoding;
     remove req.http.Cookie;
-   deliver;
+    return(deliver);
 }
 
+# Called after a cache lookup if the requested document was not found in the cache
 sub vcl_miss {
-    fetch;
+    return(fetch);
 }
 
+# Called after a document has been successfully retrieved from the backend
 sub vcl_fetch {
+    # we only cache 200 (OK) and 304 (Not Modified) responses.
+    if (beresp.status != 200 && beresp.status != 304) {
+        set beresp.ttl = 0s;
+    }
+
+    if (beresp.http.cache-control ~ "no-cache") {
+        set beresp.ttl = 0s;
+    }
+
+    if (beresp.ttl == 0s) {
+        unset beresp.http.expires;
+        set beresp.http.cache-control = "no-cache";
+        return(hit_for_pass);
+    }
+
+    # we don't care haproxy's cookie.
+    if (beresp.http.Set-Cookie && beresp.http.Set-Cookie !~ "^SERVERID=[^;]+; path=/$") {
+        return(hit_for_pass);
+    }
+
+    if (req.url ~ "\.(css|js|ico)$") {
+        unset beresp.http.set-cookie;
+        set beresp.http.cache-control = regsub(beresp.http.cache-control, "^", "public,");
+        set beresp.http.cache-control = regsub(beresp.http.cache-control, ",$", "");
+    }
+
+    # remove some headers added by caching policy manager to avoid
+    # '304 Not Modified' in case of login <-> logout switching.
+    if (beresp.http.content-type ~ "^text/html") {
+       unset beresp.http.last-modified;
+    }
+
+    set beresp.grace = 1w;
     /* Never send request to backend even if client ask refreshed content */
-    if (obj.cacheable) {
+    if (beresp.ttl > 0s) {
         /* Setup grace period for 30days for all cacheable contents */
-      #set req.grace = 30d;
-      set obj.grace = 30d;
-      }
-   deliver;
+        set beresp.grace = 30d;
+        # /* Set the clients TTL on this object */
+        # set beresp.http.cache-control = "max-age = 300";
+        /* Set how long Varnish will keep it */
+        set beresp.ttl = 1w;
+        /* marker for vcl_deliver to reset Age: */
+        set beresp.http.magicmarker = "1";
     }
 
+    return(deliver);
+}
 
+# Called before a cached object is delivered to the client
 sub vcl_deliver {
+    if (resp.http.magicmarker) {
+        /* Remove the magic marker */
+        unset resp.http.magicmarker;
+        /* By definition we have a fresh object */
+        set resp.http.age = "0";
+    }
     if (obj.hits > 0) {
         set resp.http.X-Cache = obj.hits;
     } else {
         set resp.http.X-Cache = "MISS";
     }
-   #if (obj.hash) {
-   #  set resp.http.X-Hash = obj.hash;
-   #} else {
-   #  set resp.http.X-Hash = "No hash";
-   #}
-
-   deliver;
+    return(deliver);
 }

slapos/recipe/generic_varnish/template/varnishlog.in

 #!%(shell_path)s
 
-DAEMON_OPTS="-a %(varnish_ip)s:%(varnishd_server_port)s \
-             -n %(varnish_instance_name)s"
+DAEMON_OPTS="-a -n %(varnish_instance_name)s"
 
 exec %(varnishlog_binary)s ${DAEMON_OPTS} "$@"

slapos/recipe/generic_zope/__init__.py

@@ -93,7 +93,6 @@ class Recipe(GenericBaseRecipe):
 
     # Create zope configuration file
     zope_config = dict(
-        products=self.options['products'],
         thread_amount=self.options['thread-amount'],
         zodb_root_path=self.options['zodb-path'],
         zodb_cache_size=int(self.options['zodb-cache-size']),
@@ -112,14 +111,7 @@ class Recipe(GenericBaseRecipe):
     zope_config['z2_log'] = self.options['z2-log']
     zope_config['pid-filename'] = self.options['pid-file']
     zope_config['lock-filename'] = self.options['lock-file']
-    prefixed_products = []
-    for product in reversed(zope_config['products'].split()):
-      product = product.strip()
-      if product:
-        prefixed_products.append('products %s' % product)
-    prefixed_products.insert(0, 'products %s' % self.options[
-      'instance-products'])
-    zope_config['products'] = '\n'.join(prefixed_products)
+    zope_config['products'] = 'products %s' % self.options['instance-products']
     zope_config['address'] = '%s:%s' % (self.options['ip'], self.options['port'])
     zope_config.update(dump_url=self.options['deadlock-path'],
       secret=self.options['deadlock-password'])

slapos/recipe/generic_zope_zeo_client/__init__.py

@@ -43,7 +43,6 @@ def Zope2InitUser(path, username, password):
 class Recipe(GenericBaseRecipe):
   def _options(self, options):
     options['password'] = self.generatePassword()
-    options['deadlock-password'] = self.generatePassword()
 
   def install(self):
     """
@@ -91,25 +90,6 @@ class Recipe(GenericBaseRecipe):
         # Always provide a URL-Type
         append("file://" + link)
 
-    # Generate Zeo connections
-    zeo_snippet_template = open(self.getTemplateFilename('zope.zeo.entry.conf.in'
-      )).read()
-    zeo_snippet_list = []
-    for zeo_line in self.options['zeo-connection-string'].splitlines():
-      zeo_line.strip()
-      if not zeo_line:
-        continue
-      d = dict()
-      for param in zeo_line.split():
-        k, v = param.split('=')
-        d[k.strip()] = v.strip()
-      zeo_snippet_list.append(zeo_snippet_template % d)
-    # Create zope configuration file
-    zope_config = dict(
-        products=self.options['products'],
-        thread_amount=self.options['thread-amount'],
-        zodb_configuration='\n'.join(zeo_snippet_list)
-    )
     zope_environment = dict(
       TMP=self.options['tmp-path'],
       TMPDIR=self.options['tmp-path'],
@@ -134,44 +114,7 @@ class Recipe(GenericBaseRecipe):
     # configure default Zope2 zcml
     open(self.options['site-zcml'], 'w').write(open(self.getTemplateFilename(
         'site.zcml')).read())
-    zope_config['instance'] = self.options['instance-path']
-    zope_config['event_log'] = self.options['event-log']
-    zope_config['z2_log'] = self.options['z2-log']
-    zope_config['pid-filename'] = self.options['pid-file']
-    zope_config['lock-filename'] = self.options['lock-file']
-    prefixed_products = []
-    for product in reversed(zope_config['products'].split()):
-      product = product.strip()
-      if product:
-        prefixed_products.append('products %s' % product)
-    prefixed_products.insert(0, 'products %s' % self.options[
-      'instance-products'])
-    zope_config['products'] = '\n'.join(prefixed_products)
-    zope_config['address'] = '%s:%s' % (self.options['ip'], self.options['port'])
-    zope_config.update(dump_url=self.options['deadlock-path'],
-      secret=self.options['deadlock-password'])
-
-    zope_wrapper_template_location = self.getTemplateFilename('zope.conf.in')
-    zope_conf_content = self.substituteTemplate(zope_wrapper_template_location,
-      zope_config)
-    if self.isTrueValue(self.options['timeserver']):
-      zope_conf_content += self.substituteTemplate(self.getTemplateFilename(
-          'zope.conf.timeserver.in'), {})
-    if 'tidstorage-ip' in self.options:
-      zope_conf_content += self.substituteTemplate(self.getTemplateFilename(
-          'zope.conf.tidstorage.in'), {
-            'tidstorage-ip': self.options['tidstorage-ip'],
-            'tidstorage-port': self.options['tidstorage-port'],
-            })
-    if ('promise-path' in self.options) and ('site-id' in self.options):
-      zope_conf_content += self.substituteTemplate(self.getTemplateFilename(
-          'zope.conf.promise.in'), {
-            'site-id': self.options['site-id'],
-            'promise-path': self.options['promise-path'],
-            })
 
-    zope_conf_path = self.createFile(self.options['configuration-file'], zope_conf_content)
-    path_list.append(zope_conf_path)
     # Create init script
-    path_list.append(self.createPythonScript(self.options['wrapper'], 'slapos.recipe.librecipe.execute.executee', [[self.options['runzope-binary'].strip(), '-C', zope_conf_path], zope_environment]))
+    path_list.append(self.createPythonScript(self.options['wrapper'], 'slapos.recipe.librecipe.execute.executee', [[self.options['runzope-binary'].strip(), '-C', self.options['configuration-file']], zope_environment]))
     return path_list

slapos/recipe/gitinit.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import json
+import os
+
+from subprocess import check_call
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+    def install(self):
+
+        repolist = json.loads(self.options['repos'])
+        for repo in repolist:
+            absolute_path = os.path.join(self.options['base-directory'], '%s.git' % repo)
+            if not os.path.exists(absolute_path):
+                check_call([self.options['git-binary'], 'init',
+                            '--bare', absolute_path])
+                check_call([self.options['git-binary'], 'config', 'http.receivepack', 'true'],
+                           cwd=absolute_path)
+
+        return []

slapos/recipe/kvm/__init__.py

@@ -25,7 +25,6 @@
 #
 ##############################################################################
 from slapos.recipe.librecipe import GenericBaseRecipe
-import binascii
 import os
 import sys
 
@@ -33,11 +32,6 @@ class Recipe(GenericBaseRecipe):
   """
   kvm instance configuration.
   """
-
-  def __init__(self, buildout, name, options):
-    options['passwd'] = binascii.hexlify(os.urandom(4))
-    return GenericBaseRecipe.__init__(self, buildout, name, options)
-
   def install(self):
     config = dict(
       tap_interface=self.options['tap'],

slapos/recipe/kvm/template/kvm_run.in

@@ -32,7 +32,7 @@ if not os.path.exists(disk_path):
   subprocess.Popen(['%(qemu_img_path)s', 'create' ,'-f', 'qcow2',
       '%(disk_path)s', '%(disk_size)sG'])
 
-kvm_argument_list = ['kvm', '-net', 'nic,macaddr=%(mac_address)s',
+kvm_argument_list = ['%(qemu_path)s', '-enable-kvm', '-net', 'nic,macaddr=%(mac_address)s',
   '-net', 'tap,ifname=%(tap_interface)s,script=no,downscript=no',
   '-smp', '%(smp_count)s',
   '-m', '%(ram_size)s',

slapos/recipe/kvm_frontend/__init__.py

@@ -26,6 +26,7 @@
 ##############################################################################
 from slapos.recipe.librecipe import GenericBaseRecipe, GenericSlapRecipe
 import json
+import traceback
 import zc.buildout
 
 class Recipe(GenericSlapRecipe):
@@ -127,11 +128,15 @@ class Recipe(GenericSlapRecipe):
     # Send connection parameters of slave instances
     site_url = "https://%s:%s/" % (self.options['domain'], self.options['port'])
     for slave in rewrite_rule_list:
+      try:
         self.setConnectionDict(
             dict(url="%s%s" % (site_url, slave['resource']),
                  domainname=self.options['domain'],
-               port=self.options['port'],
+                 port=str(self.options['port']),
                  resource=slave['resource']),
             slave['reference'])
+      except:
+        self.logger.fatal("Error while sending slave %s informations: %s",
+           slave['reference'], traceback.format_exc())
 
     return [map_file, conf_file, runner_path]

slapos/recipe/librecipe/__init__.py

@@ -236,6 +236,8 @@ class BaseSlapRecipe:
     return 'insecure'
 
   def install(self):
+    self.logger.warning("BaseSlapRecipe has been deprecated. Use " \
+        "GenericBaseRecipe or GenericSlapRecipe instead.")
     self.slap.initializeConnection(self.server_url, self.key_file,
         self.cert_file)
     self.computer_partition = self.slap.registerComputerPartition(

slapos/recipe/librecipe/execute.py

@@ -47,15 +47,13 @@ def _wait_files_creation(file_list):
 
 def execute(args):
   """Portable execution with process replacement"""
-  # Note: Candidate for slapos.lib.recipe
-  os.execv(args[0], args + sys.argv[1:])
+  # XXX: Kept for backward compatibility
+  generic_exec([args[0], None, None])
 
 def execute_wait(args):
   """Execution but after all files in args[1] exists"""
-  exec_list = list(args[0])
-  file_list = list(args[1])
-  _wait_files_creation(file_list)
-  os.execv(exec_list[0], exec_list + sys.argv[1:])
+  # XXX: Kept for backward compatibility
+  generic_exec([args[0], args[1], None])
 
 
 child_pg = None
@@ -63,23 +61,27 @@ child_pg = None
 
 def executee(args):
   """Portable execution with process replacement and environment manipulation"""
-  exec_list = list(args[0])
-  environment = args[1]
-  env = os.environ.copy()
-  for k,v in environment.iteritems():
-    env[k] = v
-  os.execve(exec_list[0], exec_list + sys.argv[1:], env)
+  # XXX: Kept for backward compatibility
+  generic_exec([args[0], None, args[1]])
 
 def executee_wait(args):
   """Portable execution with process replacement and environment manipulation"""
+  # XXX: Kept for backward compatibility
+  generic_exec(args)
+
+def generic_exec(args):
   exec_list = list(args[0])
-  file_list = list(args[1])
-  environment = args[2]
-  env = os.environ.copy()
-  for k,v in environment.iteritems():
-    env[k] = v
+  file_list = args[1]
+  environment_overriding = args[2]
+
+  exec_env = os.environ.copy()
+  if environment_overriding is not None:
+      exec_env.update(environment_overriding)
+
+  if file_list is not None:
       _wait_files_creation(file_list)
-  os.execve(exec_list[0], exec_list + sys.argv[1:], env)
+
+  os.execve(exec_list[0], exec_list + sys.argv[1:], exec_env)
 
 def sig_handler(signal, frame):
   print 'Received signal %r, killing children and exiting' % signal

slapos/recipe/librecipe/generic.py

@@ -36,6 +36,10 @@ import pkg_resources
 import zc.buildout
 
 class GenericBaseRecipe(object):
+  """Boilerplate class for all Buildout recipes providing helpful methods like
+     creating configuration file, creating wrappers, generating passwords, etc.
+     Can be extended in SlapOS recipes to ease development.
+  """
 
   TRUE_VALUES = ['y', 'yes', '1', 'true']
   FALSE_VALUES = ['n', 'no', '0', 'false']
@@ -125,6 +129,15 @@ class GenericBaseRecipe(object):
         'template/%s' % template_name)
 
   def generatePassword(self, len_=32):
+    """
+    The purpose of this method is to generate a password which doesn't change
+    from one execution to the next, so the generated password doesn't change
+    on each slapgrid-cp execution.
+
+    Currently, it returns a hardcoded password because no decision has been
+    taken on where a generated password should be kept (so it is generated
+    once only).
+    """
     # TODO: implement a real password generator which remember the last
     # call.
     return "insecure"
@@ -145,9 +158,6 @@ class GenericBaseRecipe(object):
     * if the host is an ipv6 address, brackets will be added to surround it.
 
     """
-    # XXX-Antoine: I didn't find any standard module to join an url with
-    # login, password, ipv6 host and port.
-    # So instead of copy and past in every recipe I factorized it right here.
     netloc = ''
     if auth is not None:
       auth = tuple(auth)

slapos/recipe/librecipe/genericslap.py

@@ -30,7 +30,10 @@ import time
 from generic import GenericBaseRecipe
 
 class GenericSlapRecipe(GenericBaseRecipe):
-  """Base class for all slap.recipe.*"""
+  """Base class for all slap.recipe.* needing SLAP informations like instance
+     parameters.
+     recipes that don't explicitely need to retrieve from server informations
+     should use GenericBaseRecipe."""
 
   def __init__(self, buildout, name, options):
     """Default initialisation"""

slapos/recipe/mysql/__init__.py

@@ -58,7 +58,7 @@ class Recipe(GenericBaseRecipe):
     post_rotate = self.createPythonScript(
       self.options['logrotate-post'],
       'slapos.recipe.librecipe.execute.execute',
-      [mysql_binary, '--no-defaults', '-B', '--socket=%s' % socket, '-e',
+      [mysql_binary, '--no-defaults', '-B', '-u', 'root', '--socket=%s' % socket, '-e',
        'FLUSH LOGS']
     )
     path_list.append(post_rotate)

slapos/recipe/generic_onetimeupload/__init__.py → slapos/recipe/onetimeupload/__init__.py

@@ -33,11 +33,6 @@ class Recipe(GenericBaseRecipe):
   """
   kvm instance configuration.
   """
-
-  def __init__(self, buildout, name, options):
-    options['key'] = binascii.hexlify(os.urandom(24))
-    return GenericBaseRecipe.__init__(self, buildout, name, options)
-
   def install(self):
     config = dict(
       ip=self.options['ip'],

slapos/recipe/pwgen.py

@@ -42,4 +42,19 @@ class Recipe(GenericBaseRecipe):
     options['password'] = password
 
   def install(self):
+    os.chmod(self.options['file'], 0600)
     return []
+
+class StablePasswordGeneratorRecipe(GenericBaseRecipe):
+  """
+  The purpose of this class is to generate a password which doesn't change
+  from one execution to the next (hence "stable"), so the generated password
+  doesn't change on each slapgrid-cp execution.
+
+  See GenericBaseRecipe.generatePassword .
+  """
+
+  def _options(self, options):
+    options['password'] = self.generatePassword()
+
+  update = install = lambda self: []

slapos/recipe/request.py

@@ -29,37 +29,85 @@ import logging
 from slapos import slap as slapmodule
 
 class Recipe(object):
+  """
+  Request a partition to a slap master.
+  Can provide parameters to that partition and fetches its connection
+  parameters.
+
+  Input:
+    server-url
+    key-file (optional)
+    cert-file (optional)
+      Used to contact slap master.
+
+    computer-id
+    partition-id
+      Current partition's identifiers.
+      Must match key's credentials if given.
+
+    name (optional, defaults to section name)
+      Name (reference) of requested partition.
+
+    software-url
+      URL of a software definition to request an instance of.
+
+    software-type
+      Software type of requested instance, among those provided by the
+      definition from software-url.
+
+    slave (optional, defaults to false)
+      Set to "true" when requesting a slave instance, ie just setting a set of
+      parameters in an existing instance.
+
+    sla (optional)
+      Whitespace-separated list of Service Level Agreement names.
+      Each name must correspond to a "sla-<name>" option.
+      Used to specify what a suitable partition would be.
+      Possible names depend on master's capabilities.
+
+    config (optional)
+      Whitespace-separated list of partition parameter names.
+      Each name must correspond to a "config-<name>" option.
+      Possible names depend on requested partition's software type.
+
+    return (optional)
+      Whitespace-separated list of expected partition-published value names.
+      Options will be created from them, in the form of "connection-<name>"
+      As long as requested partition doesn't publish all those values,
+      installation of request section will fail.
+      Possible names depend on requested partition's software type.
+
+    Output:
+      See "return" input key.
+  """
+  failed = None
 
   def __init__(self, buildout, name, options):
     self.logger = logging.getLogger(name)
 
     slap = slapmodule.slap()
 
-    self.software_release_url = options['software-url']
+    software_url = options['software-url']
+    name = options['name']
 
     slap.initializeConnection(options['server-url'],
                               options.get('key-file'),
                               options.get('cert-file'),
                              )
-    computer_partition = slap.registerComputerPartition(
-      options['computer-id'], options['partition-id'])
-    self.request = computer_partition.request
+    request = slap.registerComputerPartition(
+      options['computer-id'], options['partition-id']).request
 
-    self.isSlave = False
-    if 'slave' in options:
-      self.isSlave = options['slave'].lower() in ['y', 'yes', 'true', '1']
+    isSlave = options.get('slave', '').lower() in ['y', 'yes', 'true', '1']
 
-    self.return_parameters = []
+    return_parameters = []
     if 'return' in options:
-      self.return_parameters = [str(parameter).strip()
+      return_parameters = [str(parameter).strip()
         for parameter in options['return'].split()]
     else:
       self.logger.debug("No parameter to return to main instance."
         "Be careful about that...")
 
-    software_type = 'RootInstanceSoftware'
-    if 'software-type' in options:
-      software_type = options['software-type']
+    software_type = options.get('software-type', 'RootInstanceSoftware')
 
     filter_kw = {}
     if 'sla' in options:
@@ -72,15 +120,14 @@ class Recipe(object):
         partition_parameter_kw[config_parameter] = \
             options['config-%s' % config_parameter]
 
-    self.instance = self.request(options['software-url'], software_type,
-      options.get('name', name), partition_parameter_kw=partition_parameter_kw,
-      filter_kw=filter_kw, shared=self.isSlave)
+    self.instance = instance = request(software_url, software_type,
+      name, partition_parameter_kw=partition_parameter_kw,
+      filter_kw=filter_kw, shared=isSlave)
 
-    self.failed = None
-    for param in self.return_parameters:
+    for param in return_parameters:
       try:
         options['connection-%s' % param] = str(
-            self.instance.getConnectionParameter(param))
+          instance.getConnectionParameter(param))
       except slapmodule.NotFoundError:
         options['connection-%s' % param] = ''
         if self.failed is None:
@@ -92,12 +139,14 @@ class Recipe(object):
       try:
         status = self.instance.getState()
       except slapmodule.NotFoundError:
-        status = "not ready yet, please try again"
-      # XXX-Cedric : currently raise an error. So swallow it...
+        status = 'not ready yet, please try again'
       except AttributeError:
-        status = "unknown"
-      raise KeyError("Connection parameter %s not found. "
-          "Status of requested instance is : %s." % (self.failed, status))
+        status = 'unknown'
+      error_message = 'Connection parameter %s not found. '\
+          'Status of requested instance is: %s. If this error persists, '\
+          'check status of this instance.' % (self.failed, status)
+      self.logger.error(error_message)
+      raise KeyError(error_message)
     return []
 
   update = install

slapos/recipe/requestoptional.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import logging
+
+from slapos import slap as slapmodule
+
+class Recipe(object):
+  """ Request a SlapOS instance. Won't fail if instance is not ready.
+  """
+
+  def __init__(self, buildout, name, options):
+    self.logger = logging.getLogger(name)
+
+    slap = slapmodule.slap()
+
+    self.software_release_url = options['software-url']
+    self.name = options['name']
+
+    slap.initializeConnection(options['server-url'],
+                              options.get('key-file'),
+                              options.get('cert-file'),
+                             )
+    computer_partition = slap.registerComputerPartition(
+      options['computer-id'], options['partition-id'])
+    self.request = computer_partition.request
+
+    self.isSlave = False
+    if 'slave' in options:
+      self.isSlave = options['slave'].lower() in ['y', 'yes', 'true', '1']
+
+    self.return_parameters = []
+    if 'return' in options:
+      self.return_parameters = [str(parameter).strip()
+                               for parameter in options['return'].split()]
+    else:
+      self.logger.debug("No parameter to return to main instance."
+                          "Be careful about that...")
+
+    software_type = 'RootSoftwareInstance'
+    if 'software-type' in options:
+      software_type = options['software-type']
+
+    filter_kw = {}
+    if 'sla' in options:
+      for sla_parameter in options['sla'].split():
+        filter_kw[sla_parameter] = options['sla-%s' % sla_parameter]
+
+    partition_parameter_kw = {}
+    if 'config' in options:
+      for config_parameter in options['config'].split():
+        partition_parameter_kw[config_parameter] = \
+            options['config-%s' % config_parameter]
+
+    self.instance = self.request(options['software-url'], software_type,
+      self.name, partition_parameter_kw=partition_parameter_kw,
+      filter_kw=filter_kw, shared=self.isSlave)
+
+    self.failed = None
+    for param in self.return_parameters:
+      try:
+        options['connection-%s' % param] = str(
+            self.instance.getConnectionParameter(param))
+      except slapmodule.NotFoundError:
+        options['connection-%s' % param] = ''
+        if self.failed is None:
+          self.failed = param
+
+  def install(self):
+    if self.failed is not None:
+      # Check instance status to know if instance has been deployed
+      try:
+        status = self.instance.getState()
+      except slapmodule.NotFoundError:
+        status = 'not ready yet'
+      except AttributeError:
+        status = 'unknown'
+      error_message = 'Connection parameter %s not found. '\
+          'Requested instance is currently %s. If this error persists, '\
+          'check status of this instance.' % (self.failed, status)
+      self.logger.error(error_message)
+    return []
+
+  update = install

slapos/recipe/seleniumrunner/__init__.py

@@ -29,79 +29,19 @@ import os
 import sys
 import zc.buildout
 from slapos.recipe.librecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import GenericBaseRecipe
 
-class Recipe(BaseSlapRecipe):
-  def _install(self):
-    """Set the connection dictionnary for the computer partition and create a list
-    of paths to the different wrappers."""
-    self.path_list = []
-    self.requirements, self.ws = self.egg.working_set()
+class Recipe(GenericBaseRecipe):
+  def install(self):
 
-    self.installTestrunner(self.getDisplay())
-    self.linkBinary()
+    runner = self.createPythonScript(
+      self.options['runner-path'],
+      __name__+'.testrunner.run',
+      arguments=[self.options['suite-url'],
+                 self.options['report-url'],
+                 self.options['report-project'],
+                 self.options['browser'],
+                 ])
 
-    return self.path_list
+    return [runner]
 
-  def getDisplay(self):
-    """Generate display id for the instance."""
-    display_list = [":%s" % i for i in range(123,144)]
-    for display_try in display_list:
-      lock_filepath = '/tmp/.X%s-lock' % display_try.replace(":", "")
-      if not os.path.exists(lock_filepath):
-        display = display_try
-        break
-    return display
-
-  def installTestrunner(self, display):
-    """Instanciate a wrapper for the browser and the test reports."""
-    arguments = dict(
-        xvfb_binary    = self.options['xvfb_binary'],
-        display        = display,
-        suite_name     = self.parameter_dict['suite_name'],
-        base_url       = self.parameter_dict['url'],
-        browser_argument_list = [],
-        user           = self.parameter_dict['user'],
-        password       = self.parameter_dict['password'],
-        project       = self.parameter_dict['project'],
-        test_report_instance_url = \
-            self.parameter_dict['test_report_instance_url'],
-        etc_directory  = self.etc_directory)
-
-    # Check wanted browser XXX-Cedric not yet used but can be useful
-    #if self.parameter_dict.get('browser', None) is None:
-    arguments['browser_binary'] = self.options['firefox_binary']
-    #elif self.parameter_dict['browser'].strip().lowercase() == 'chrome' or
-    #    self.parameter_dict['browser'].strip().lowercase() == 'chromium':
-    #  arguments['browser_binary'] = self.options['chromium_binary']
-    #  arguments['browser_argument_list'].extend['--ignore-certificate-errors',
-    #      option_translate = '--disable-translate',
-    #      option_security = '--disable-web-security']
-    #elif self.parameter_dict['browser'].strip().lowercase() == 'firefox':
-    #  arguments['browser_binary'] = self.options['firefox_binary']
-
-    self.path_list.extend(zc.buildout.easy_install.scripts([(
-        'testrunner',__name__+'.testrunner', 'run')], self.ws,
-        sys.executable, self.wrapper_directory,
-        arguments=[arguments]))
-
-  def linkBinary(self):
-    """Links binaries to instance's bin directory for easier exposal"""
-    for linkline in self.options.get('link_binary_list', '').splitlines():
-      if not linkline:
-        continue
-      target = linkline.split()
-      if len(target) == 1:
-        target = target[0]
-        path, linkname = os.path.split(target)
-      else:
-        linkname = target[1]
-        target = target[0]
-      link = os.path.join(self.bin_directory, linkname)
-      if os.path.lexists(link):
-        if not os.path.islink(link):
-          raise zc.buildout.UserError(
-            'Target link already %r exists but it is not link' % link)
-        os.unlink(link)
-      os.symlink(target, link)
-      self.logger.debug('Created link %r -> %r' % (link, target))
-      self.path_list.append(link)

slapos/recipe/seleniumrunner/testrunner.py

@@ -27,14 +27,30 @@
 
 from datetime import datetime
 from erp5functionaltestreporthandler import ERP5TestReportHandler
-from ERP5TypeFunctionalTestCase import Xvfb, Firefox, TimeoutError
+from ERP5TypeFunctionalTestCase import TimeoutError
 from time import sleep
 import time
 import os
 import urllib2
+import urlparse
+from subprocess import Popen, PIPE
+import signal
 
 def run(args):
-  config = args[0]
+  suite_url = args[0]
+  report_url = args[1]
+  project = args[2]
+  browser_binary = args[3]
+
+  suite_parsed = urlparse.urlparse(suite_url)
+
+  config = {
+    'suite_name': suite_parsed.path.split('/')[-1],
+    'base_url': "%s://%s%s" % (suite_parsed.scheme, suite_parsed.hostname,
+                               '/'.join(suite_parsed.path.split('/')[:-1])),
+    'user': suite_parsed.username,
+    'password': suite_parsed.password,
+    }
 
   test_url = assembleTestUrl(config['base_url'], config['suite_name'],
       config['user'], config['password'])
@@ -43,20 +59,17 @@ def run(args):
   timeout = 2.0 * 60 * 60
 
   while True:
-    erp5_report = ERP5TestReportHandler(config['test_report_instance_url'],
-        config['project'] + '@' + config['suite_name'])
+    erp5_report = ERP5TestReportHandler(report_url,
+        project + '@' + config['suite_name'])
     try:
-      os.environ['DISPLAY'] = config['display']
-      xvfb = Xvfb(config['etc_directory'], config['xvfb_binary'])
-      profile_dir = os.path.join(config['etc_directory'], 'profile')
-      # XXX-Cedric : change Firefox prefs.js generation so that it can take a
-      #              list of websites supposed to be reached instead of config['base_url']
-      browser = Firefox(profile_dir, config['base_url'], config['browser_binary'])
       try:
         start = time.time()
-        xvfb.run()
-        profile_dir = os.path.join(config['etc_directory'], 'profile')
-        browser.run(test_url , xvfb.display)
+        print("Running test on: %s" % test_url)
+        process = Popen('%s "%s"' % (browser_binary, test_url),
+                        stdout=PIPE,
+                        stderr=PIPE,
+                        shell=True,
+                        close_fds=True)
         erp5_report.reportStart()
         while not isTestFinished(config['base_url']):
           time.sleep(10)
@@ -66,8 +79,8 @@ def run(args):
       except TimeoutError:
         continue
       finally:
-        browser.quit()
-        xvfb.quit()
+        if process.pid:
+          os.kill(process.pid, signal.SIGTERM)
       print("Test has finished and Firefox has been killed.")
 
       erp5_report.reportFinished(getStatus(config['base_url']).encode("utf-8",

slapos/recipe/shellinabox.py

@@ -28,6 +28,7 @@ from getpass import getpass
 import pwd
 import grp
 import os
+import shlex
 
 from slapos.recipe.librecipe import GenericBaseRecipe
 
@@ -38,7 +39,9 @@ def login_shell(args):
   if entered_password != password:
     return 1
   else:
-    os.execl(args['shell'], args['shell'])
+    commandline = shlex.split(args['shell'])
+    path = commandline[0]
+    os.execv(path, commandline)
 
 def shellinabox(args):
   certificate_dir = args['certificate_dir']
@@ -69,6 +72,14 @@ def shellinabox(args):
     '-p', args['port'],
   ]
 
+  # XXX: By default shellinbox drop privileges
+  #      switching to nobody:nogroup user.
+  # This force root.
+  if group == 'root':
+    command_line.extend(['-g', group])
+  if user == 'root':
+    command_line.extend(['-u', group])
+
   os.execv(command_line[0], command_line)
 
 

slapos/recipe/signal_wrapper.py

+##############################################################################
+#
+# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+  def install(self):
+    return [
+      self.createPythonScript(
+        self.options['wrapper-path'],
+        'slapos.recipe.librecipe.execute.execute_with_signal_translation',
+        [self.options['wrapped-path']]
+      )
+    ]

slapos/recipe/slapconfiguration.py

+##############################################################################
+#
+# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import slapos.slap
+from ConfigParser import RawConfigParser
+from netaddr import valid_ipv4, valid_ipv6
+
+class Recipe(object):
+  """
+  Retrieves slap partition parameters, and makes them available to other
+  buildout section in various ways, and in various encodings.
+  Populates the buildout section it is used in with all slap partition
+  parameters.
+  Also provides access to partition properties: all IPv4, IPv6 and tap
+  interfaces it is allowed to use.
+
+  Input:
+    url
+      Slap server url.
+      Example:
+        ${slap-connection:server-url}
+    key & cert (optional)
+      Path of files containing key and certificate for secure connection to
+      slap server.
+      Example:
+        ${slap-connection:key-file}
+        ${slap-connection:cert-file}
+    computer
+      Computer identifier.
+      Example:
+        ${slap-connection:computer-id}
+    partition
+      Partition identifier.
+      Example:
+        ${slap-connection:partition-id}
+
+  Output:
+    slap-software-type
+      Current partition's software type.
+    ipv4
+      Set of IPv4 addresses.
+    ipv6
+      Set of IPv6 addresses.
+    tap
+      Set of TAP interfaces.
+    configuration
+      Dict of all parameters.
+    configuration.<key>
+      One key per partition parameter.
+      Partition parameter whose name cannot be represented unambiguously in
+      buildout syntax are ignored. They cannot be accessed from buildout syntax
+      anyway, and are available through "configuration" output key.
+  """
+
+  # XXX: used to detect if a configuration key is a valid section key. This
+  # assumes buildout uses ConfigParser - which is currently the case.
+  OPTCRE_match = RawConfigParser.OPTCRE.match
+
+  def __init__(self, buildout, name, options):
+      slap = slapos.slap.slap()
+      slap.initializeConnection(
+          options['url'],
+          options.get('key'),
+          options.get('cert'),
+      )
+      parameter_dict = slap.registerComputerPartition(
+          options['computer'],
+          options['partition'],
+      ).getInstanceParameterDict()
+      # XXX: those are not partition parameters, strictly speaking.
+      # Discard them, and make them available as separate section keys.
+      options['slap-software-type'] = parameter_dict.pop(
+          'slap_software_type')
+      ipv4_set = set()
+      v4_add = ipv4_set.add
+      ipv6_set = set()
+      v6_add = ipv6_set.add
+      tap_set = set()
+      tap_add = tap_set.add
+      for tap, ip in parameter_dict.pop('ip_list'):
+          tap_add(tap)
+          if valid_ipv4(ip):
+              v4_add(ip)
+          elif valid_ipv6(ip):
+              v6_add(ip)
+          # XXX: emit warning on unknown address type ?
+      options['ipv4'] = ipv4_set
+      options['ipv6'] = ipv6_set
+      options['tap'] = tap_set
+      options['configuration'] = parameter_dict
+      match = self.OPTCRE_match
+      for key, value in parameter_dict.iteritems():
+          if match(key) is not None:
+              continue
+          options['configuration.' + key] = value
+
+  install = update = lambda self: []

slapos/recipe/generate_cloudooo.py → slapos/recipe/slapmonitor/__init__.py

@@ -24,37 +24,31 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.recipe.librecipe import GenericSlapRecipe
-import os
-import json
-import traceback
+from slapos.recipe.librecipe import GenericBaseRecipe
 
+class Recipe(GenericBaseRecipe):
+  """
+  Slapmonitor instance configuration.
+  """
 
-class Recipe(GenericSlapRecipe):
-  def _options(self, options):
-    self.dirname = os.path.join(self.buildout['buildout']['parts-directory'],
-                                self.name)
-    options['output'] = os.path.join(self.dirname, self.name + '.cfg')
+  def __init__(self, buildout, name, options):
+    return GenericBaseRecipe.__init__(self, buildout, name, options)
 
-  def _generateRealTemplate(self):
-    # TODO check json against schema
-    json_data = {}
-    if self.parameter_dict.get('cloudooo-json', None):
-      json_data = json.loads(self.parameter_dict['cloudooo-json'])
-    # dymanic fonts
-    font_url_list = json_data.get('font_url_list', [])
-    fontconfig_template = open(self.options['template']).read()
-    fontconfig = open(self.options['snippet-fontconfig']).read()
-    fontconfig_extension = fontconfig % dict(font_url_list=' '.join(font_url_list))
-    with open(self.options['output'], 'w') as f:
-      f.write(fontconfig_template + fontconfig_extension)
+  def install(self):
+    config = dict(
+      pid_file_path=self.options['pid-file'],
+      database_path=self.options['database-path'],
+      slapmonitor_path = self.options['slapmonitor-path'],
+      shell_path=self.options['shell-path'],
+    )
 
-  def _install(self):
-    if not os.path.exists(self.dirname):
-      os.mkdir(self.dirname)
-    try:
-      self._generateRealTemplate()
-    except Exception:
-      print 'Ignored issue during template generation:\n%s' % \
-        traceback.format_exc()
-    return [self.dirname]
+    # Runners
+    runner_path = self.createExecutable(
+      self.options['path'],
+      self.substituteTemplate(self.getTemplateFilename('slapmonitor_run.in'),
+                              config))
+
+    return [runner_path]
+
+  def update(self):
+    pass

slapos/recipe/slapmonitor/template/slapmonitor_run.in

+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+#
+exec %(slapmonitor_path)s %(pid_file_path)s %(database_path)s
+

slapos/recipe/slapreport/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+  """
+  Slapmonitor instance configuration.
+  """
+
+  def __init__(self, buildout, name, options):
+    return GenericBaseRecipe.__init__(self, buildout, name, options)
+
+  def install(self):
+    config = dict(
+      pid_file_path=self.options['pid-file'],
+      consumption_log_path=self.options['consumption-log-path'],
+      database_path=self.options['database-path'],
+      slapreport_path = self.options['slapreport-path'],
+      logbox_ip = self.options['logbox-ip'],
+      logbox_port = self.options['logbox-port'],
+      logbox_user = self.options['logbox-user'],
+      logbox_passwd = self.options['logbox-passwd'],
+      shell_path=self.options['shell-path'],
+    )
+
+    # Runners
+    runner_path = self.createExecutable(
+      self.options['path'],
+      self.substituteTemplate(self.getTemplateFilename('slapreport_run.in'),
+                              config))
+
+    return [runner_path]
+
+  def update(self):
+    pass

slapos/recipe/slapreport/template/slapreport_run.in

+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+#
+exec %(slapreport_path)s %(pid_file_path)s %(consumption_log_path)s %(database_path)s %(logbox_ip)s %(logbox_port)s %(logbox_user)s %(logbox_passwd)s

slapos/recipe/slaprunner/__init__.py

@@ -24,74 +24,72 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.recipe.librecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import GenericBaseRecipe
 import os
-import pkg_resources
-import sys
-import zc.buildout
-import zc.recipe.egg
 
+class Recipe(GenericBaseRecipe):
+
+  def _options(self, options):
+    self.ipv4 = options['ipv4'].strip()
+    self.ipv6 = options['ipv6'].strip()
+    self.proxy_port = options['proxy_port'].strip()
+    self.runner_port = options['runner_port'].strip()
+    self.workdir = options['working-directory'].strip()
+    self.software_directory = options['software-directory'].strip()
+    self.instance_directory = options['instance-directory'].strip()
+    self.partition_amount = options['partition-amount'].strip()
+    self.cloud9_url = options['cloud9-url'].strip()
+    # Set slaprunner access URL
+    options['access-url'] = 'http://[%s]:%s' % (self.ipv6, self.runner_port)
+
+  def install(self):
+    path_list = []
 
-class Recipe(BaseSlapRecipe):
-  def _install(self):
-    self.path_list = []
-    self.requirements, self.ws = self.egg.working_set()
-    ipv4 = self.getLocalIPv4Address()
-    ipv6 = self.getGlobalIPv6Address()
-    proxy_port = '50000'
-    runner_port = '50000'
-    cloud9_port = '30000'
-    workdir = self.createDataDirectory('runner')
-    software_root = os.path.join(workdir, 'software')
-    instance_root = os.path.join(workdir, 'instance')
     configuration = dict(
-        software_root=software_root,
-        instance_root=instance_root,
-        master_url='http://%s:%s/' % (ipv4, proxy_port),
+        software_root=self.software_directory,
+        instance_root=self.instance_directory,
+        master_url='http://%s:%s/' % (self.ipv4, self.proxy_port),
         computer_id='slaprunner',
-        partition_amount=7,
+        partition_amount=self.partition_amount,
         slapgrid_sr=self.options['slapgrid_sr'],
         slapgrid_cp=self.options['slapgrid_cp'],
         slapproxy=self.options['slapproxy'],
         supervisor=self.options['supervisor'],
-        supervisord_config=os.path.join(instance_root, 'etc',
+        supervisord_config=os.path.join(self.instance_directory, 'etc',
           'supervisord.conf'),
-        runner_workdir=workdir,
-        runner_host=ipv6,
-        runner_port=runner_port,
-        ipv4_address=ipv4,
-        ipv6_address=ipv6,
-        proxy_host=ipv4,
-        proxy_port=proxy_port,
-        proxy_database=os.path.join(workdir, 'proxy.db'),
-	git=self.options['git'],
-	cloud9_url='http://[%s]:%s' % (ipv6, cloud9_port),
+        runner_workdir=self.workdir,
+        etc_dir=self.options['etc_dir'],
+        runner_host=self.ipv6,
+        runner_port=self.runner_port,
+        ipv4_address=self.ipv4,
+        ipv6_address=self.ipv6,
+        proxy_host=self.ipv4,
+        proxy_port=self.proxy_port,
+        proxy_database=os.path.join(self.workdir, 'proxy.db'),
+        git=self.options['git-binary'],
         ssh_client=self.options['ssh_client'],
         public_key=self.options['public_key'],
         private_key=self.options['private_key'],
-
+        cloud9_url=self.cloud9_url
     )
-    config_file = self.createConfigurationFile('slapos.cfg',
-        self.substituteTemplate(pkg_resources.resource_filename(__name__,
-          'template/slapos.cfg.in'), configuration))
-    self.path_list.append(config_file)
+
+    config_file = self.createFile(self.options['slapos.cfg'],
+        self.substituteTemplate(self.getTemplateFilename('slapos.cfg.in'),
+        configuration))
+    path_list.append(config_file)
 
     environment = dict(
-        PATH=os.path.dirname(self.options['git']) + ':' + os.environ['PATH'],
+        PATH=os.path.dirname(self.options['git-binary']) + ':' + os.environ['PATH'],
         GIT_SSH=self.options['ssh_client']
     )
-    workdir = os.path.join(workdir, 'project')
-    if not os.path.exists(workdir):
-      os.mkdir(workdir)
-    launch_args = [self.options['slaprunner'].strip(), config_file, '--debug']
-    cloud9_args = [self.options['node-bin'].strip(), self.options['cloud9'].strip(),
-                   '-l', ipv6, '-p', cloud9_port, '-w', workdir]
-    self.path_list.extend(zc.buildout.easy_install.scripts([('slaprunner',
-      'slapos.recipe.librecipe.execute', 'executee')], self.ws, sys.executable,
-      self.wrapper_directory, arguments=[launch_args, environment]))
-    self.path_list.extend(zc.buildout.easy_install.scripts([('cloud9IDE',
-      'slapos.recipe.librecipe.execute', 'executee')], self.ws, sys.executable,
-      self.wrapper_directory, arguments=[cloud9_args, environment]))
-    self.setConnectionDict(dict(slaprunner_url='http://[%s]:%s' % (ipv6, runner_port),
-                            cloud9_url='http://[%s]:%s' % (ipv6, cloud9_port)))
-    return self.path_list
+    launch_args = [self.options['slaprunner'].strip(), config_file]
+    if self.optionIsTrue('debug', default=False):
+      launch_args.append('--debug')
+
+    wrapper = self.createPythonScript(self.options['wrapper'],
+        'slapos.recipe.librecipe.execute.executee',
+        (launch_args, environment)
+    )
+    path_list.append(wrapper)
+
+    return path_list

slapos/recipe/slaprunner/template/slapos.cfg.in

@@ -3,6 +3,7 @@ software_root = %(software_root)s
 instance_root = %(instance_root)s
 master_url = %(master_url)s
 computer_id = %(computer_id)s
+maximal_delay = 0
 
 [slapformat]
 partition_amount = %(partition_amount)s
@@ -18,6 +19,7 @@ runner_host = %(runner_host)s
 runner_port = %(runner_port)s
 ipv4_address = %(ipv4_address)s
 ipv6_address = %(ipv6_address)s
+etc_dir = %(etc_dir)s
 
 [slapproxy]
 host = %(proxy_host)s

slapos/recipe/softwaretype.py

@@ -128,6 +128,8 @@ class Recipe:
     for key, value in self.buildout['slap_connection'].iteritems():
       # XXX: Waiting for SlapBaseRecipe to use dash instead of underscores
       buildout.set('slap-connection', key.replace('_', '-'), value)
+    # XXX: Needed for lxc. Use non standard API
+    buildout.set('slap-connection', 'requested', self.computer_partition._requested_state)
 
     work_directory = os.path.abspath(self.buildout['buildout'][
       'directory'])

slapos/recipe/template.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+    def install(self):
+        mapping = self.options.copy()
+        for key in ('output', 'template', 'recipe', 'mode'):
+            if key in mapping:
+                del mapping[key]
+
+        with open(self.options['output'], 'w') as output, \
+             open(self.options['template'], 'r') as template:
+            output.write(template.read() % mapping)
+
+        if 'mode' in self.options:
+            os.chmod(self.options['output'], int(self.options['mode'], 8))
+
+        return [self.options['output'], ]

slapos/recipe/testnode/profile_testnode.py

@@ -126,8 +126,8 @@ def run(args):
           subprocess.check_call([config['git_binary'], 'checkout', '--force',
             '--track', '-b', config['branch'], 'origin/'+config['branch']],
             cwd=repository_clone)
-        subprocess.check_call([config['git_binary'], 'pull', '--rebase'],
-            cwd=repository_clone)
+        subprocess.check_call([config['git_binary'], 'reset', '--hard',
+          '@{upstream}'], cwd=repository_clone)
       except Exception:
         print 'Retrying git in 60s'
         time.sleep(60)

slapos/recipe/web_checker/__init__.py

@@ -36,13 +36,16 @@ class Recipe(GenericSlapRecipe):
     path_list = []
     web_checker_mail_address = self.parameter_dict['web-checker-mail-address']
     web_checker_smtp_host = self.parameter_dict['web-checker-smtp-host']
+    web_checker_frontend_url = self.parameter_dict.get(
+                                 'web-checker-frontend-url',
+                                 self.options['frontend-url'])
     web_checker_working_directory = \
       self.options['web-checker-working-directory']
     config = dict(
       web_checker_mail_address = web_checker_mail_address,
       web_checker_smtp_host = web_checker_smtp_host,
       web_checker_working_directory = web_checker_working_directory,
-      frontend_url = self.options['frontend-url'],
+      frontend_url = web_checker_frontend_url,
       wget_binary_path = self.options['wget-binary-path'],
       varnishlog_binary_path = self.options['varnishlog-binary-path'],
       web_checker_log = self.options['web-checker-log'],

slapos/recipe/web_checker/template/web_checker.cfg.in

@@ -9,7 +9,6 @@ debug_level = debug
 file_log_path = %(web_checker_log)s
 
 [header_list]
-Last-Modified = True
 Expires = True
 Vary = Accept-Language, Cookie, Accept-Encoding
   Accept-Language, Cookie
@@ -18,6 +17,8 @@ Vary = Accept-Language, Cookie, Accept-Encoding
   Accept-Encoding
 Cache-Control = max-age=300
   max-age=3600
+  public,max-age=300
+  public,max-age=3600
 
 [header url=(.*_form)]
 Vary = Accept-Encoding
@@ -25,7 +26,13 @@ Vary = Accept-Encoding
 [header url=.*/favicon.ico]
 Last-Modified = True
 
-[no_header content-type=(image/.*|text/css|.*/javascript)]
+[header content-type=(text/css|.*/javascript)]
+Last-Modified = True
+Cache-Control = public,max-age=300
+  public,max-age=3600
+  public
+
+[no_header content-type=(image/.*|application/font)]
 Vary = None
 
 [erp5_extension_list]

slapos/recipe/wrapper.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import shlex
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+    def install(self):
+
+        command_line = shlex.split(self.options['command-line'])
+
+        wait_files = self.options.get('wait-for-files')
+        if wait_files is not None:
+            wait_files = [filename.strip() for filename in wait_files.split()
+                          if filename.strip()]
+
+        environment = self.options.get('environment')
+        if environment is not None:
+            environment = {k.strip(): v.strip() for k, v in [
+                             line.split('=')
+                             for line in environment.split('\n')
+                           ]}
+
+        return [self.createPythonScript(
+            self.options['output'],
+            'slapos.recipe.librecipe.execute.generic_exec',
+            (command_line, wait_files, environment,),
+        )]

slapos/recipe/xvfb/__init__.py

+##############################################################################
+#
+# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+#############################################################################
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+  def install(self):
+
+    config = {
+      'xvfb_binary': self.options['xvfb-path'],
+      'shell_path': self.options['shell-path'],
+      'fbdir_path': self.options['fbdir-path'],
+      'tmp_path': self.options['tmp-path'],
+      }
+
+    xvfb_path = self.createExecutable(
+      self.options['runner-path'],
+      self.substituteTemplate(self.getTemplateFilename('xvfb_run.in'),
+                              config))
+    result = [xvfb_path]
+
+    # Allow to take screenshot if needed
+    if ('xwd-path' in self.options) and ('xwd-hook-path' in self.options):
+
+      config['xwd_binary'] = self.options['xwd-path']
+      result.append(self.createExecutable(
+        self.options['xwd-hook-path'],
+        self.substituteTemplate(self.getTemplateFilename('xwd_run.in'),
+                                config)))
+
+    return result
+

slapos/recipe/xvfb/template/xvfb_run.in

+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+
+export TMPDIR=%(tmp_path)s 
+exec %(xvfb_binary)s -screen 0 1024x768x24 -fbdir %(fbdir_path)s

slapos/recipe/xvfb/template/xwd_run.in

+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+
+export DISPLAY=:0
+export TMPDIR=%(tmp_path)s 
+exec %(xwd_binary)s -root -out $1

slapos/recipe/zabbixagent/__init__.py

@@ -124,5 +124,6 @@ class Recipe(BaseSlapRecipe):
                                                   self.parameter_dict['hostname'],
                                                   self.parameter_dict['server'])
     self.setConnectionDict(dict(ip=zabbix_agentd_conf['ip'],
-      name=zabbix_agentd_conf['hostname'], port=zabbix_agentd_conf['port']))
+      name=zabbix_agentd_conf['hostname'],
+      port=str(zabbix_agentd_conf['port'])))
     return self.path_list

slapos/recipe/zabbixagent/template/zabbix_agentd.conf.in

@@ -229,5 +229,13 @@ ListenIP=%(ip)s
 # Mandatory: no
 # Default:
 # UserParameter=
+UserParameter=custom_sensor.temp1,sensors | grep "temp1" | sed -e "s/.*  +//" | sed -e "s/.C.*//"
+UserParameter=custom_sensor.temp2,sensors | grep "temp2" | sed -e "s/.*  +//" | sed -e "s/.C.*//"
+UserParameter=custom_sensor.core0,sensors | grep "Core 0" | sed -e "s/.*  +//" | sed -e "s/.C.*//"
+UserParameter=custom_sensor.core1,sensors | grep "Core 1" | sed -e "s/.*  +//" | sed -e "s/.C.*//"
+UserParameter=custom_sensor.core2,sensors | grep "Core 2" | sed -e "s/.*  +//" | sed -e "s/.C.*//"
+UserParameter=custom_sensor.core3,sensors | grep "Core 3" | sed -e "s/.*  +//" | sed -e "s/.C.*//"
+UserParameter=custom_sensor.fan1,sensors | grep "fan1" | sed -e "s/.*  //" | sed -e "s/ .*//"
+UserParameter=custom_sensor.fan2,sensors | grep "fan2" | sed -e "s/.*  //" | sed -e "s/ .*//"
 
 %(user_parameter_string)s

slapos/recipe/zeo/template/zeo-filestorage-snippet.conf.in

 <filestorage %(storage_name)s>
   path %(path)s
+  # pack-gc false
 </filestorage>
 

software/MediaWiki/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/MediaWiki/software.cfg

@@ -79,7 +79,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/SilverStripe/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/SilverStripe/software.cfg

@@ -63,7 +63,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/agent/README.testing_agent.txt

+testing agent
+=============
+
+Testing agent simulates a normal user interacting with vifib master. It requests software release installation or software instance instiaction randomly from time to time. SlapOS clients then run these commands remotely. It is the testing agent determining whether an error occurs.
+
+Usage
+=====
+Request a testing agent instance from vifib with following parameters:
+<?xml version='1.0' encoding='utf-8'?>
+<instance>
+<parameter id="configuration">[DEFAULT]
+# ConfigParser's magic section.
+computer_list = ["COMP-607"]
+master_url = https://slap.vifib.com/
+# Note that certificates are now literally in the configuration, meaning
+# you may decide to specify different ones for each test. Likewise for
+# master_url.
+key = -----BEGIN PRIVATE KEY-----
+  MII[...]
+  [...]
+  -----END PRIVATE KEY-----
+cert = -----BEGIN CERTIFICATE-----
+  MII[...]
+  [...]
+  -----END CERTIFICATE-----
+
+[agent]
+# This section is special: it contains configuration.
+# Does not make use of values coming from [DEFAULT] (well, it
+# necessarily contains them, but they are not used).
+node_title = ...
+test_title = ...
+project_title = ...
+task_count = 2 # Number of tests to run concurrently
+report_url = # report_url, find details in erp5 for details
+
+# All other sections are individual tests, whatever they are named.
+[test-apache]
+# Software release URL
+url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+# Optional request_kw parameters: if not provided, will only test SR
+# build. Depending on your slap version, it may be required to provide
+# a "software_type" parameter, even if you want the default type.
+request_kw = {
+    "filter_kw": {"computer_guid": "..."},
+    "partition_parameter_kw": {
+      "domain": "example.com"
+    }
+  }
+# All are in seconds.
+max_install_duration = 3000
+max_uninstall_duration = 360
+max_request_duration = 700
+max_destroy_duration = 360
+
+[impossible-apache]
+url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+max_install_duration = 1
+max_uninstall_duration = 1
+
+[impossible-apache-2]
+url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+max_install_duration = 660
+max_uninstall_duration = 1
+</parameter>
+</instance>
+

software/agent/instance.cfg

+[buildout]
+parts =
+  instance
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+[instance]
+recipe = ${instance-recipe:egg}:${instance-recipe:module}
+agent_binary = ${buildout:directory}/bin/agent
+report_start = ${buildout:directory}/bin/report_start
+report_stop = ${buildout:directory}/bin/report_stop
+dcrond_binary = ${dcron:location}/sbin/crond
+python_binary = ${python2.7:location}/bin/python
+pidfile = $${rootdirectory:run}/agent.pid
+log = $${rootdirectory:agentlog}/agent.log
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+run = $${buildout:directory}/etc/run
+agentlog = $${buildout:directory}/var/log/agent
+srv = $${buildout:directory}/srv
+bin = $${buildout:directory}/bin

software/agent/software.cfg

+[buildout]
+extends =
+  ../../component/dcron/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../stack/slapos.cfg
+
+parts =
+  template
+  eggs
+  instance-recipe-egg
+  dcron
+  python2.7
+  script
+
+[instance-recipe]
+egg = slapos.cookbook
+module = agent
+
+[instance-recipe-egg]
+recipe = zc.recipe.egg
+python = python2.7
+eggs = ${instance-recipe:egg}
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+output = ${buildout:directory}/template.cfg
+md5sum = c7cb98594f394d05baedabe424643f6f
+mode = 0644
+
+[eggs]
+python = python2.7
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  slapos.cookbook
+  slapos.toolbox
+  erp5.util
+
+[lxml-python]
+python = python2.7
+
+[script]
+recipe = z3c.recipe.scripts
+python = python2.7
+eggs =
+  zc.buildout
+  ${lxml-python:egg}
+  slapos.core
+  slapos.cookbook
+  slapos.toolbox[agent]
+
+[networkcache]
+# signature certificates of the following uploaders.
+#   Romain Courteaud
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
+  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
+  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
+  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
+  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
+  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
+  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
+  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
+  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
+  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
+  QUUGLQ==
+  -----END CERTIFICATE-----

software/apache-frontend/README.apache_frontend.txt

+apache_frontend
+===============
+
+Frontend system using Apache, allowing to rewrite and proxy URLs like
+myinstance.myfrontenddomainname.com to real IP/URL of myinstance.
+
+apache_frontend works using the master instance / slave instance design.
+It means that a single main instance of Apache will be used to act as frontend
+for many slaves.
+
+
+How to use
+==========
+
+First, you will need to request a "master" instance of Apache Frontend with
+"domain" parameter, like::
+  <?xml version='1.0' encoding='utf-8'?>
+  <instance>
+   <parameter id="domain">moulefrite.org</parameter>
+   <parameter id="port">443</parameter>
+  </instance>
+
+Then, it is possible to request many slave instances
+(currently only from slapconsole, UI doesn't work yet)
+of Apache Frontend, like::
+  instance = request(
+    software_release=apache_frontend,
+    partition_reference='frontend2',
+    shared=True,
+    partition_parameter_kw={"url":"https://[1:2:3:4]:1234/someresource"}
+  )
+Those slave instances will be redirected to the "master" instance,
+and you will see on the "master" instance the associated RewriteRules of
+all slave instances.
+
+Finally, the slave instance will be accessible from:
+https://someidentifier.moulefrite.org.
+
+Instance Parameters
+===================
+
+Master Instance Parameters
+--------------------------
+
+domain
+~~~~~~
+name of the domain to be used (example: mydomain.com). Subdomains of this
+domain will be used for the slave instances (example:
+instance12345.mydomain.com). It is then recommended to add a wildcard in DNS
+for the subdomains of the chosen domain like::
+  *.mydomain.com. IN A 123.123.123.123
+Using the IP given by the Master Instance.
+"domain" is a mandatory Parameter.
+
+port
+~~~~
+Port used by Apache. Optional parameter, defaults to 4443.
+
+plain_http_port
+Port used by apache to serve plain http (only used to redirect to https).
+Optional parameter, defaults to 8080.
+
+Slave Instance Parameters
+-------------------------
+
+url
+~~~
+url of backend to use.
+"url" is a mandatory parameter.
+Example: http://mybackend.com/myresource
+
+cache
+~~~~~
+Specify if slave instance should use a varnish / stunnel to connect to backend.
+Possible values: "true", "false".
+"cache" is an optional parameter. Defaults to "false". 
+Example: true
+
+type
+~~~~
+Specify if slave instance will redirect to a zope backend. If specified, Apache
+RewriteRule will use Zope's Virtual Host Daemon.
+Possible values: "zope", "default".
+"type" is an optional parameter. Defaults to "default". 
+Example: zope
+
+custom_domain
+~~~~~~~~~~~~~
+Domain name to use as frontend. The frontend will be accessible from this domain.
+"custom_domain" is an optional parameter. Defaults to
+[instancereference].[masterdomain]. 
+Example: www.mycustomdomain.com
+
+
+Advanced example
+================
+
+Request slave frontend instance using a Zope backend, with Varnish activated,
+listening to a custom domain::
+  instance = request(
+    software_release=apache_frontend,
+    partition_reference='frontend2',
+    shared=True,
+    partition_parameter_kw={
+        "url":"https://[1:2:3:4]:1234/someresource",
+        "cache":"true",
+        "type":"zope",
+        "custom_domain":"mycustomdomain.com",
+    }
+  )
+
+Notes
+=====
+
+It is not possible with slapos to listen to port <= 1024, because process are
+not run as root. It is a good idea then to go on the node where the instance is
+and set some iptables rules like (if using default ports)::
+  iptables -t nat -A PREROUTING -p tcp -d {public ip} --dport 443 -j DNAT --to-destination {listening ip}:4443
+  iptables -t nat -A PREROUTING -p tcp -d {public_ip} --dport 80 -j DNAT --to-destination {listening ip}:8080

software/apache-frontend/instance.cfg

@@ -7,7 +7,7 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
 
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
-httpd_binary = ${apache:location}/bin/httpd
+httpd_binary = ${apache-2.2:location}/bin/httpd
 logrotate_binary = ${logrotate:location}/usr/sbin/logrotate
 openssl_binary = ${openssl:location}/bin/openssl
 dcrond_binary = ${dcron:location}/sbin/crond

software/apache-frontend/software.cfg

@@ -17,8 +17,8 @@ parts =
   template
   binutils
   gcc-java-minimal
-  apache
-  apache-antiloris
+  apache-2.2
+  apache-antiloris-apache-2.2
 
   stunnel
   varnish-2.1
@@ -50,78 +50,72 @@ eggs =
 # Default template for apache instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 17180caef7d1c477fbb037d28b705e8b
+md5sum = 74c0f41246d167c020854a212e919ce4
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-004
 Jinja2 = 2.6
 Werkzeug = 0.8.3
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.8
 rdiff-backup = 1.0.5
-slapos.recipe.template = 2.2
-slapos.cookbook = 0.40.1
+slapos.cookbook = 0.52
+slapos.recipe.template = 2.3
 
 # Required by:
-# slapos.core==0.23
+# slapos.core==0.24
 Flask = 0.8
 
 # Required by:
-# slapos.cookbook==0.40.1
+# slapos.cookbook==0.52
 PyXML = 0.8.4
 
 # Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# Required by:
-# slapos.cookbook==0.40.1
+# slapos.cookbook==0.52
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.cookbook==0.40.1
-# slapos.core==0.23
+# slapos.cookbook==0.52
+# slapos.core==0.24
 # xml-marshaller==0.9.7
-lxml = 2.3.3
+lxml = 2.3.4
 
 # Required by:
-# slapos.cookbook==0.40.1
+# slapos.cookbook==0.52
 netaddr = 0.7.6
 
 # Required by:
-# slapos.core==0.23
+# slapos.core==0.24
 netifaces = 0.8
 
 # Required by:
-# slapos.cookbook==0.40.1
-# slapos.core==0.23
+# slapos.cookbook==0.52
+# slapos.core==0.24
 # zc.buildout==1.6.0-dev-SlapOS-004
 # zc.recipe.egg==1.3.2
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.40.1
-slapos.core = 0.23
+# slapos.cookbook==0.52
+slapos.core = 0.24
 
 # Required by:
-# slapos.core==0.23
+# slapos.core==0.24
 supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.40.1
+# slapos.cookbook==0.52
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.40.1
+# slapos.cookbook==0.52
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.23
-zope.interface = 3.8.0
+# slapos.core==0.24
+zope.interface = 4.0.0
 
 [networkcache]
 # Cedric de Saint Martin signature certificate

software/b2evolution/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/b2evolution/software.cfg

@@ -64,7 +64,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/cloudooo/development.cfg

-[buildout]
-extends = software.cfg
-auto-checkout = cloudooo

software/cloudooo/instance-cloudoo.cfg.in

+{% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
+[buildout]
+parts =
+  publish-cloudooo-connection-information
+  cloudooo-test-runner
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[publish-cloudooo-connection-information]
+recipe = slapos.cookbook:publishurl
+url = cloudooo://${cloudooo-instance:ip}:${cloudooo-instance:port}/
+
+[cloudooo-instance]
+recipe = slapos.cookbook:generic.cloudooo
+
+# Network options
+ip = ${slap-network-information:local-ipv4}
+port = 23000
+openoffice-port = 23060
+
+# Paths
+configuration-file = ${rootdirectory:etc}/cloudooo.cfg
+wrapper = ${basedirectory:services}/cloudooo
+
+# Paths: Data
+data-directory = ${directory:cloudooo-data}
+
+environment =
+  LD_LIBRARY_PATH = {{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['zlib'] }}/lib
+  FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
+  PATH = ${binary-link:target-directory}
+
+# Binary information
+# cloudooo specific configuration
+ooo-binary-path = {{ parameter_dict['libreoffice-bin'] }}/program
+ooo-paster = {{ bin_directory }}/cloudooo_paster
+ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program
+
+[cloudooo-test-runner]
+recipe = slapos.cookbook:cloudooo.test
+
+prepend-path = ${buildout:bin-directory}
+run-unit-test = ${buildout:bin-directory}/runUnitTest
+run-test-suite = ${buildout:bin-directory}/runTestSuite
+
+ooo-paster = ${cloudooo-instance:ooo-paster}
+configuration-file = ${cloudooo-instance:configuration-file}
+
+run-unit-test-binary = {{ bin_directory }}/runCloudoooUnitTest
+run-test-suite-binary = {{ bin_directory }}/runCloudoooTestSuite
+
+[fontconfig-instance]
+recipe = slapos.cookbook:fontconfig
+conf-path = ${rootdirectory:etc}/font.conf
+font-system-folder = {{ parameter_dict['fonts'] }}
+font-folder = ${directory:font}
+url-list =
+service-folder = ${basedirectory:services}
+onetimedownload_path = {{ bin_directory }}/onetimedownload
+
+[binary-link]
+recipe = slapos.cookbook:symbolic.link
+target-directory = ${rootdirectory:bin}
+link-binary =
+  {{ parameter_dict['coreutils'] }}/bin/basename
+  {{ parameter_dict['coreutils'] }}/bin/cat
+  {{ parameter_dict['coreutils'] }}/bin/cp
+  {{ parameter_dict['coreutils'] }}/bin/ls
+  {{ parameter_dict['coreutils'] }}/bin/tr
+  {{ parameter_dict['coreutils'] }}/bin/uname
+  {{ parameter_dict['coreutils'] }}/bin/dirname
+  {{ parameter_dict['imagemagick'] }}/bin/convert
+  {{ parameter_dict['imagemagick'] }}/bin/identify
+  {{ parameter_dict['poppler'] }}/bin/pdfinfo
+  {{ parameter_dict['poppler'] }}/bin/pdftotext
+  {{ parameter_dict['poppler'] }}/bin/pdftohtml
+  {{ parameter_dict['pdftk'] }}/bin/pdftk
+
+# rest of parts are candidates for some generic stuff
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+services = ${rootdirectory:etc}/run
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+cloudooo-data = ${rootdirectory:srv}/cloudooo
+font = ${rootdirectory:srv}/font
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+srv = ${buildout:directory}/srv
+bin = ${buildout:directory}/bin

software/cloudooo/instance.cfg

-[buildout]
-parts =
-  instance
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-
-[instance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
-
-# cloudooo specific configuration
-ooo_binary_path = ${libreoffice-bin:location}/program
-ooo_paster = ${buildout:bin-directory}/cloudooo_paster
-ooo_uno_path = ${libreoffice-bin:location}/basis-link/program
-
-link_binary_list =
-  ${xpdf:location}/bin/pdfinfo
-  ${xpdf:location}/bin/pdftotext
-  ${ffmpeg:location}/bin/ffmpeg
-  ${ffmpeg:location}/bin/ffprobe
-  ${imagemagick:location}/bin/convert
-  ${imagemagick:location}/bin/identify
-  ${pdftk:location}/bin/pdftk
-
-environment =
-  LD_LIBRARY_PATH = ${file:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libICE:location}/lib:${libpng12:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib:${libXext:location}/lib:${libxcb:location}/lib:${libXrender:location}/lib:${zlib:location}/lib

software/cloudooo/instance.cfg.in

+[buildout]
+parts =
+  switch-softwaretype
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[jinja2-template-base]
+recipe = slapos.recipe.template:jinja2
+rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
+extra-context =
+context =
+    key eggs_directory buildout:eggs-directory
+    key develop_eggs_directory buildout:develop-eggs-directory
+    ${:extra-context}
+
+[dynamic-template-cloudooo-parameters]
+file = {{ file_location }}
+fontconfig = {{ fontconfig_location }}
+freetype = {{ freetype_location }}
+libICE = {{ libICE_location }}
+libpng12 = {{ libpng12_location }}
+libSM = {{ libSM_location }}
+libX11 = {{ libX11_location }}
+libXau = {{ libXau_location }}
+libXdmcp = {{ libXdmcp_location }}
+libXext = {{ libXext_location }}
+libxcb = {{ libxcb_location }}
+libXrender = {{ libXrender_location }}
+zlib = {{ zlib_location }}
+libreoffice-bin = {{ libreoffice_bin_location }}
+fonts = {{ fonts_location }}
+coreutils = {{ coreutils_location }}
+imagemagick = {{ imagemagick_location }}
+poppler = {{ poppler_location }}
+pdftk = {{ pdftk_location }}
+buildout-bin-directory = {{ buildout_bin_directory }}
+
+[dynamic-template-cloudooo]
+< = jinja2-template-base
+template = {{ template_cloudooo }}
+filename = instance-cloudoo.cfg
+extra-context =
+    section parameter_dict dynamic-template-cloudooo-parameters
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${dynamic-template-cloudooo:rendered}
+
+[slap-connection]
+# part to migrate to new - separated words
+computer-id = ${slap_connection:computer_id}
+partition-id = ${slap_connection:partition_id}
+server-url = ${slap_connection:server_url}
+software-release-url = ${slap_connection:software_release_url}
+key-file = ${slap_connection:key_file}
+cert-file = ${slap_connection:cert_file}

software/cloudooo/software.cfg

 [buildout]
-extensions =
-  slapos.rebootstrap
-  slapos.zcbworkarounds
-  mr.developer
-
-find-links =
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-    http://dist.repoze.org
-    http://www.nexedi.org/static/packages/source/
-
 extends =
+  ../../stack/shacache-client.cfg
   ../../stack/cloudooo.cfg
 
 versions = versions
 
+# Local development
+develop =
+  ${:parts-directory}/slapos.cookbook-repository
+  ${:parts-directory}/cloudooo-repository
+
 parts +=
+# Local development
+  slapos.cookbook-repository
+  check-recipe
+  slapos.cookbook-python2.6
+  slapos.recipe.template-python2.6
 # Create instance template
   template
 
@@ -23,16 +24,169 @@ parts +=
 # development / fast switching environment for whole software
 unzip = true
 
-[instance-recipe]
-# Note: In case if specific instantiation recipe is used this is the place to
-# put its name
-egg = slapos.cookbook
-module = cloudooo
+# Local development
+[slapos.cookbook-repository]
+recipe = plone.recipe.command
+stop-on-error = true
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+command = ${git:location}/bin/git clone --branch cloudooo --quiet http://git.erp5.org/repos/slapos.git ${:location}
+update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
+
+[check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+
+[slapos.cookbook-python2.6]
+recipe = zc.recipe.egg
+eggs = slapos.cookbook
+scripts =
+python = python2.6
+ugly-depend-on = ${slapos.cookbook-repository:command} ${slapos.cookbook-repository:update-command}
+
+[slapos.recipe.template-python2.6]
+recipe = zc.recipe.egg
+eggs = slapos.recipe.template
+scripts =
+python = python2.6
+
+[template-jinja2-base]
+recipe = slapos.recipe.template:jinja2
+template = ${:_profile_base_location_}/${:filename}.in
+rendered = ${buildout:directory}/${:filename}
+# XXX: extra-context is needed because we cannot append to a key of an extended
+# section.
+extra-context =
+context =
+    key bin_directory buildout:bin-directory
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key eggs_directory buildout:eggs-directory
+    ${:extra-context}
 
 [template]
-# Default template for erp5 instance.
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-md5sum = 49da453a38dc5462c170747a029037b7
-output = ${buildout:directory}/template.cfg
-mode = 0644
+< = template-jinja2-base
+# XXX: "template.cfg" is hardcoded in instanciation recipe
+filename = template.cfg
+template = ${:_profile_base_location_}/instance.cfg.in
+md5sum = ea305baf481766227752e08d287c0bf8
+extra-context =
+    key buildout_bin_directory buildout:bin-directory
+    key dcron_location dcron:location
+    key file_location file:location
+    key fontconfig_location fontconfig:location
+    key fonts_location fonts:location
+    key freetype_location freetype:location
+    key git_location git:location
+    key imagemagick_location imagemagick:location
+    key libICE_location libICE:location
+    key libSM_location libSM:location
+    key libX11_location libX11:location
+    key libXau_location libXau:location
+    key libXdmcp_location libXdmcp:location
+    key libXext_location libXext:location
+    key libXrender_location libXrender:location
+    key libpng12_location libpng12:location
+    key libreoffice_bin_location libreoffice-bin:location
+    key libxcb_location libxcb:location
+    key openssl_location openssl:location
+    key pdftk_location pdftk:location
+    key poppler_location poppler:location
+    key template_cloudooo template-cloudooo:target
+    key zlib_location zlib:location
+    key coreutils_location coreutils:location
+
+[template-cloudooo]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
+md5sum = fd5964a038613ea3e0b54f87564fe248
+mode = 640
+
+
+[networkcache]
+# signature certificates of the following uploaders.
+#   Romain Courteaud
+#   Sebastien Robin
+#   Kazuhiko Shiozaki
+#   Cedric de Saint Martin
+#   Yingjie Xu
+#   Gabriel Monnerat
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
+  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
+  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
+  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
+  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
+  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
+  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
+  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
+  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
+  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
+  QUUGLQ==
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
+  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
+  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
+  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
+  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
+  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
+  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
+  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
+  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
+  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
+  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
+  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
+  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
+  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
+  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
+  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
+  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
+  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
+  vaZhjNYKWQf79l6zXfOvphzJ
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
+  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
+  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
+  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
+  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
+  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
+  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
+  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
+  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
+  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
+  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
+  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
+  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
+  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
+  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
+  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
+  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
+  -----END CERTIFICATE-----

software/cmsmadesimple/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/cmsmadesimple/software.cfg

@@ -63,7 +63,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/coppermine/instance.cfg

@@ -11,7 +11,8 @@ template = ${application-template:location}/${application-template:filename}
 configuration = ${application-configuration:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/coppermine/software.cfg

@@ -74,7 +74,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/davstorage/software.cfg

@@ -77,7 +77,7 @@ Jinja2 = 2.6
 Werkzeug = 0.7.1
 buildout-versions = 1.6
 hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 meld3 = 0.6.7
 slapos.cookbook = 0.26
 

software/dotclear/instance.cfg

@@ -11,7 +11,8 @@ template = ${application-template:location}/${application-template:filename}
 configuration = ${application-configuration:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/dotclear/software.cfg

@@ -74,7 +74,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/dotproject/instance.cfg

@@ -11,7 +11,8 @@ template = ${application-template:location}/${application-template:filename}
 configuration = ${application-configuration:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/dotproject/software.cfg

@@ -74,7 +74,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/drupal/instance.cfg

-[buildout]
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-
-parts = instance
-
-[instance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
-source = ${application:location}
-
-httpd_binary = ${apache:location}/bin/httpd
-mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
-mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld

software/drupal/settings.php.in

+<?php
+
+/**
+ * @file
+ * Drupal site-specific configuration file.
+ *
+ * IMPORTANT NOTE:
+ * This file may have been set to read-only by the Drupal installation
+ * program. If you make changes to this file, be sure to protect it again
+ * after making your modifications. Failure to remove write permissions
+ * to this file is a security risk.
+ *
+ * The configuration file to be loaded is based upon the rules below.
+ *
+ * The configuration directory will be discovered by stripping the
+ * website's hostname from left to right and pathname from right to
+ * left. The first configuration file found will be used and any
+ * others will be ignored. If no other configuration file is found
+ * then the default configuration file at 'sites/default' will be used.
+ *
+ * For example, for a fictitious site installed at
+ * http://www.drupal.org/mysite/test/, the 'settings.php'
+ * is searched in the following directories:
+ *
+ * - sites/www.drupal.org.mysite.test
+ * - sites/drupal.org.mysite.test
+ * - sites/org.mysite.test
+ *
+ * - sites/www.drupal.org.mysite
+ * - sites/drupal.org.mysite
+ * - sites/org.mysite
+ *
+ * - sites/www.drupal.org
+ * - sites/drupal.org
+ * - sites/org
+ *
+ * - sites/default
+ *
+ * If you are installing on a non-standard port number, prefix the
+ * hostname with that number. For example,
+ * http://www.drupal.org:8080/mysite/test/ could be loaded from
+ * sites/8080.www.drupal.org.mysite.test/.
+ */
+
+/**
+ * Database settings:
+ *
+ * The $databases array specifies the database connection or
+ * connections that Drupal may use.  Drupal is able to connect
+ * to multiple databases, including multiple types of databases,
+ * during the same request.
+ *
+ * Each database connection is specified as an array of settings,
+ * similar to the following:
+ * @code
+ * array(
+ *   'driver' => 'mysql',
+ *   'database' => 'databasename',
+ *   'username' => 'username',
+ *   'password' => 'password',
+ *   'host' => 'localhost',
+ *   'port' => 3306,
+ *   'prefix' => 'myprefix_',
+ *   'collation' => 'utf8_general_ci',
+ * );
+ * @endcode
+ *
+ * The "driver" property indicates what Drupal database driver the
+ * connection should use.  This is usually the same as the name of the
+ * database type, such as mysql or sqlite, but not always.  The other
+ * properties will vary depending on the driver.  For SQLite, you must
+ * specify a database file name in a directory that is writable by the
+ * webserver.  For most other drivers, you must specify a
+ * username, password, host, and database name.
+ *
+ * Some database engines support transactions.  In order to enable
+ * transaction support for a given database, set the 'transactions' key
+ * to TRUE.  To disable it, set it to FALSE.  Note that the default value
+ * varies by driver.  For MySQL, the default is FALSE since MyISAM tables
+ * do not support transactions.
+ *
+ * For each database, you may optionally specify multiple "target" databases.
+ * A target database allows Drupal to try to send certain queries to a
+ * different database if it can but fall back to the default connection if not.
+ * That is useful for master/slave replication, as Drupal may try to connect
+ * to a slave server when appropriate and if one is not available will simply
+ * fall back to the single master server.
+ *
+ * The general format for the $databases array is as follows:
+ * @code
+ * $databases['default']['default'] = $info_array;
+ * $databases['default']['slave'][] = $info_array;
+ * $databases['default']['slave'][] = $info_array;
+ * $databases['extra']['default'] = $info_array;
+ * @endcode
+ *
+ * In the above example, $info_array is an array of settings described above.
+ * The first line sets a "default" database that has one master database
+ * (the second level default).  The second and third lines create an array
+ * of potential slave databases.  Drupal will select one at random for a given
+ * request as needed.  The fourth line creates a new database with a name of
+ * "extra".
+ *
+ * For a single database configuration, the following is sufficient:
+ * @code
+ * $databases['default']['default'] = array(
+ *   'driver' => 'mysql',
+ *   'database' => 'databasename',
+ *   'username' => 'username',
+ *   'password' => 'password',
+ *   'host' => 'localhost',
+ *   'prefix' => 'main_',
+ *   'collation' => 'utf8_general_ci',
+ * );
+ * @endcode
+ *
+ * You can optionally set prefixes for some or all database table names
+ * by using the 'prefix' setting. If a prefix is specified, the table
+ * name will be prepended with its value. Be sure to use valid database
+ * characters only, usually alphanumeric and underscore. If no prefixes
+ * are desired, leave it as an empty string ''.
+ *
+ * To have all database names prefixed, set 'prefix' as a string:
+ * @code
+ *   'prefix' => 'main_',
+ * @endcode
+ * To provide prefixes for specific tables, set 'prefix' as an array.
+ * The array's keys are the table names and the values are the prefixes.
+ * The 'default' element is mandatory and holds the prefix for any tables
+ * not specified elsewhere in the array. Example:
+ * @code
+ *   'prefix' => array(
+ *     'default'   => 'main_',
+ *     'users'     => 'shared_',
+ *     'sessions'  => 'shared_',
+ *     'role'      => 'shared_',
+ *     'authmap'   => 'shared_',
+ *   ),
+ * @endcode
+ * You can also use a reference to a schema/database as a prefix. This maybe
+ * useful if your Drupal installation exists in a schema that is not the default
+ * or you want to access several databases from the same code base at the same
+ * time.
+ * Example:
+ * @code
+ *   'prefix' => array(
+ *     'default'   => 'main.',
+ *     'users'     => 'shared.',
+ *     'sessions'  => 'shared.',
+ *     'role'      => 'shared.',
+ *     'authmap'   => 'shared.',
+ *   );
+ * @endcode
+ * NOTE: MySQL and SQLite's definition of a schema is a database.
+ *
+ * Advanced users can add or override initial commands to execute when
+ * connecting to the database server, as well as PDO connection settings. For
+ * example, to enable MySQL SELECT queries to exceed the max_join_size system
+ * variable, and to reduce the database connection timeout to 5 seconds:
+ *
+ * @code
+ * $databases['default']['default'] = array(
+ *   'init_commands' => array(
+ *     'big_selects' => 'SET SQL_BIG_SELECTS=1',
+ *   ),
+ *   'pdo' => array(
+ *     PDO::ATTR_TIMEOUT => 5,
+ *   ),
+ * );
+ * @endcode
+ *
+ * WARNING: These defaults are designed for database portability. Changing them
+ * may cause unexpected behavior, including potential data loss.
+ *
+ * @see DatabaseConnection_mysql::__construct
+ * @see DatabaseConnection_pgsql::__construct
+ * @see DatabaseConnection_sqlite::__construct
+ *
+ * Database configuration format:
+ * @code
+ *   $databases['default']['default'] = array(
+ *     'driver' => 'mysql',
+ *     'database' => 'databasename',
+ *     'username' => 'username',
+ *     'password' => 'password',
+ *     'host' => 'localhost',
+ *     'prefix' => '',
+ *   );
+ *   $databases['default']['default'] = array(
+ *     'driver' => 'pgsql',
+ *     'database' => 'databasename',
+ *     'username' => 'username',
+ *     'password' => 'password',
+ *     'host' => 'localhost',
+ *     'prefix' => '',
+ *   );
+ *   $databases['default']['default'] = array(
+ *     'driver' => 'sqlite',
+ *     'database' => '/path/to/databasefilename',
+ *   );
+ * @endcode
+ */
+$databases['default']['default'] = array(
+  'driver' => 'mysql',
+  'database' => '%(mysql_database)s',
+  'username' => '%(mysql_user)s',
+  'password' => '%(mysql_password)s',
+  'host' => '%(mysql_host)s',
+  'prefix' => '',
+);
+
+/**
+ * Access control for update.php script.
+ *
+ * If you are updating your Drupal installation using the update.php script but
+ * are not logged in using either an account with the "Administer software
+ * updates" permission or the site maintenance account (the account that was
+ * created during installation), you will need to modify the access check
+ * statement below. Change the FALSE to a TRUE to disable the access check.
+ * After finishing the upgrade, be sure to open this file again and change the
+ * TRUE back to a FALSE!
+ */
+$update_free_access = FALSE;
+
+/**
+ * Salt for one-time login links and cancel links, form tokens, etc.
+ *
+ * This variable will be set to a random value by the installer. All one-time
+ * login links will be invalidated if the value is changed. Note that if your
+ * site is deployed on a cluster of web servers, you must ensure that this
+ * variable has the same value on each server. If this variable is empty, a hash
+ * of the serialized database credentials will be used as a fallback salt.
+ *
+ * For enhanced security, you may set this variable to a value using the
+ * contents of a file outside your docroot that is never saved together
+ * with any backups of your Drupal files and database.
+ *
+ * Example:
+ *   $drupal_hash_salt = file_get_contents('/home/example/salt.txt');
+ *
+ */
+$drupal_hash_salt = '';
+
+/**
+ * Base URL (optional).
+ *
+ * If Drupal is generating incorrect URLs on your site, which could
+ * be in HTML headers (links to CSS and JS files) or visible links on pages
+ * (such as in menus), uncomment the Base URL statement below (remove the
+ * leading hash sign) and fill in the absolute URL to your Drupal installation.
+ *
+ * You might also want to force users to use a given domain.
+ * See the .htaccess file for more information.
+ *
+ * Examples:
+ *   $base_url = 'http://www.example.com';
+ *   $base_url = 'http://www.example.com:8888';
+ *   $base_url = 'http://www.example.com/drupal';
+ *   $base_url = 'https://www.example.com:8888/drupal';
+ *
+ * It is not allowed to have a trailing slash; Drupal will add it
+ * for you.
+ */
+# $base_url = 'http://www.example.com';  // NO trailing slash!
+
+/**
+ * PHP settings:
+ *
+ * To see what PHP settings are possible, including whether they can be set at
+ * runtime (by using ini_set()), read the PHP documentation:
+ * http://www.php.net/manual/en/ini.list.php
+ * See drupal_initialize_variables() in includes/bootstrap.inc for required
+ * runtime settings and the .htaccess file for non-runtime settings. Settings
+ * defined there should not be duplicated here so as to avoid conflict issues.
+ */
+
+/**
+ * Some distributions of Linux (most notably Debian) ship their PHP
+ * installations with garbage collection (gc) disabled. Since Drupal depends on
+ * PHP's garbage collection for clearing sessions, ensure that garbage
+ * collection occurs by using the most common settings.
+ */
+ini_set('session.gc_probability', 1);
+ini_set('session.gc_divisor', 100);
+
+/**
+ * Set session lifetime (in seconds), i.e. the time from the user's last visit
+ * to the active session may be deleted by the session garbage collector. When
+ * a session is deleted, authenticated users are logged out, and the contents
+ * of the user's $_SESSION variable is discarded.
+ */
+ini_set('session.gc_maxlifetime', 200000);
+
+/**
+ * Set session cookie lifetime (in seconds), i.e. the time from the session is
+ * created to the cookie expires, i.e. when the browser is expected to discard
+ * the cookie. The value 0 means "until the browser is closed".
+ */
+ini_set('session.cookie_lifetime', 2000000);
+
+/**
+ * If you encounter a situation where users post a large amount of text, and
+ * the result is stripped out upon viewing but can still be edited, Drupal's
+ * output filter may not have sufficient memory to process it.  If you
+ * experience this issue, you may wish to uncomment the following two lines
+ * and increase the limits of these variables.  For more information, see
+ * http://php.net/manual/en/pcre.configuration.php.
+ */
+# ini_set('pcre.backtrack_limit', 200000);
+# ini_set('pcre.recursion_limit', 200000);
+
+/**
+ * Drupal automatically generates a unique session cookie name for each site
+ * based on its full domain name. If you have multiple domains pointing at the
+ * same Drupal site, you can either redirect them all to a single domain (see
+ * comment in .htaccess), or uncomment the line below and specify their shared
+ * base domain. Doing so assures that users remain logged in as they cross
+ * between your various domains. Make sure to always start the $cookie_domain
+ * with a leading dot, as per RFC 2109.
+ */
+# $cookie_domain = '.example.com';
+
+/**
+ * Variable overrides:
+ *
+ * To override specific entries in the 'variable' table for this site,
+ * set them here. You usually don't need to use this feature. This is
+ * useful in a configuration file for a vhost or directory, rather than
+ * the default settings.php. Any configuration setting from the 'variable'
+ * table can be given a new value. Note that any values you provide in
+ * these variable overrides will not be modifiable from the Drupal
+ * administration interface.
+ *
+ * The following overrides are examples:
+ * - site_name: Defines the site's name.
+ * - theme_default: Defines the default theme for this site.
+ * - anonymous: Defines the human-readable name of anonymous users.
+ * Remove the leading hash signs to enable.
+ */
+# $conf['site_name'] = 'My Drupal site';
+# $conf['theme_default'] = 'garland';
+# $conf['anonymous'] = 'Visitor';
+
+/**
+ * A custom theme can be set for the offline page. This applies when the site
+ * is explicitly set to maintenance mode through the administration page or when
+ * the database is inactive due to an error. It can be set through the
+ * 'maintenance_theme' key. The template file should also be copied into the
+ * theme. It is located inside 'modules/system/maintenance-page.tpl.php'.
+ * Note: This setting does not apply to installation and update pages.
+ */
+# $conf['maintenance_theme'] = 'bartik';
+
+/**
+ * Reverse Proxy Configuration:
+ *
+ * Reverse proxy servers are often used to enhance the performance
+ * of heavily visited sites and may also provide other site caching,
+ * security, or encryption benefits. In an environment where Drupal
+ * is behind a reverse proxy, the real IP address of the client should
+ * be determined such that the correct client IP address is available
+ * to Drupal's logging, statistics, and access management systems. In
+ * the most simple scenario, the proxy server will add an
+ * X-Forwarded-For header to the request that contains the client IP
+ * address. However, HTTP headers are vulnerable to spoofing, where a
+ * malicious client could bypass restrictions by setting the
+ * X-Forwarded-For header directly. Therefore, Drupal's proxy
+ * configuration requires the IP addresses of all remote proxies to be
+ * specified in $conf['reverse_proxy_addresses'] to work correctly.
+ *
+ * Enable this setting to get Drupal to determine the client IP from
+ * the X-Forwarded-For header (or $conf['reverse_proxy_header'] if set).
+ * If you are unsure about this setting, do not have a reverse proxy,
+ * or Drupal operates in a shared hosting environment, this setting
+ * should remain commented out.
+ *
+ * In order for this setting to be used you must specify every possible
+ * reverse proxy IP address in $conf['reverse_proxy_addresses'].
+ * If a complete list of reverse proxies is not available in your
+ * environment (for example, if you use a CDN) you may set the
+ * $_SERVER['REMOTE_ADDR'] variable directly in settings.php.
+ * Be aware, however, that it is likely that this would allow IP
+ * address spoofing unless more advanced precautions are taken.
+ */
+# $conf['reverse_proxy'] = TRUE;
+
+/**
+ * Specify every reverse proxy IP address in your environment.
+ * This setting is required if $conf['reverse_proxy'] is TRUE.
+ */
+# $conf['reverse_proxy_addresses'] = array('a.b.c.d', ...);
+
+/**
+ * Set this value if your proxy server sends the client IP in a header
+ * other than X-Forwarded-For.
+ */
+# $conf['reverse_proxy_header'] = 'HTTP_X_CLUSTER_CLIENT_IP';
+
+/**
+ * Page caching:
+ *
+ * By default, Drupal sends a "Vary: Cookie" HTTP header for anonymous page
+ * views. This tells a HTTP proxy that it may return a page from its local
+ * cache without contacting the web server, if the user sends the same Cookie
+ * header as the user who originally requested the cached page. Without "Vary:
+ * Cookie", authenticated users would also be served the anonymous page from
+ * the cache. If the site has mostly anonymous users except a few known
+ * editors/administrators, the Vary header can be omitted. This allows for
+ * better caching in HTTP proxies (including reverse proxies), i.e. even if
+ * clients send different cookies, they still get content served from the cache.
+ * However, authenticated users should access the site directly (i.e. not use an
+ * HTTP proxy, and bypass the reverse proxy if one is used) in order to avoid
+ * getting cached pages from the proxy.
+ */
+# $conf['omit_vary_cookie'] = TRUE;
+
+/**
+ * CSS/JS aggregated file gzip compression:
+ *
+ * By default, when CSS or JS aggregation and clean URLs are enabled Drupal will
+ * store a gzip compressed (.gz) copy of the aggregated files. If this file is
+ * available then rewrite rules in the default .htaccess file will serve these
+ * files to browsers that accept gzip encoded content. This allows pages to load
+ * faster for these users and has minimal impact on server load. If you are
+ * using a webserver other than Apache httpd, or a caching reverse proxy that is
+ * configured to cache and compress these files itself you may want to uncomment
+ * one or both of the below lines, which will prevent gzip files being stored.
+ */
+# $conf['css_gzip_compression'] = FALSE;
+# $conf['js_gzip_compression'] = FALSE;
+
+/**
+ * String overrides:
+ *
+ * To override specific strings on your site with or without enabling locale
+ * module, add an entry to this list. This functionality allows you to change
+ * a small number of your site's default English language interface strings.
+ *
+ * Remove the leading hash signs to enable.
+ */
+# $conf['locale_custom_strings_en'][''] = array(
+#   'forum'      => 'Discussion board',
+#   '@count min' => '@count minutes',
+# );
+
+/**
+ *
+ * IP blocking:
+ *
+ * To bypass database queries for denied IP addresses, use this setting.
+ * Drupal queries the {blocked_ips} table by default on every page request
+ * for both authenticated and anonymous users. This allows the system to
+ * block IP addresses from within the administrative interface and before any
+ * modules are loaded. However on high traffic websites you may want to avoid
+ * this query, allowing you to bypass database access altogether for anonymous
+ * users under certain caching configurations.
+ *
+ * If using this setting, you will need to add back any IP addresses which
+ * you may have blocked via the administrative interface. Each element of this
+ * array represents a blocked IP address. Uncommenting the array and leaving it
+ * empty will have the effect of disabling IP blocking on your site.
+ *
+ * Remove the leading hash signs to enable.
+ */
+# $conf['blocked_ips'] = array(
+#   'a.b.c.d',
+# );
+
+/**
+ * Fast 404 pages:
+ *
+ * Drupal can generate fully themed 404 pages. However, some of these responses
+ * are for images or other resource files that are not displayed to the user.
+ * This can waste bandwidth, and also generate server load.
+ *
+ * The options below return a simple, fast 404 page for URLs matching a
+ * specific pattern:
+ * - 404_fast_paths_exclude: A regular expression to match paths to exclude,
+ *   such as images generated by image styles, or dynamically-resized images.
+ *   If you need to add more paths, you can add '|path' to the expression.
+ * - 404_fast_paths: A regular expression to match paths that should return a
+ *   simple 404 page, rather than the fully themed 404 page. If you don't have
+ *   any aliases ending in htm or html you can add '|s?html?' to the expression.
+ * - 404_fast_html: The html to return for simple 404 pages.
+ *
+ * Add leading hash signs if you would like to disable this functionality.
+ */
+$conf['404_fast_paths_exclude'] = '/\/(?:styles)\//';
+$conf['404_fast_paths'] = '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i';
+$conf['404_fast_html'] = '<html xmlns="http://www.w3.org/1999/xhtml"><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>';
+
+/**
+ * By default, fast 404s are returned as part of the normal page request
+ * process, which will properly serve valid pages that happen to match and will
+ * also log actual 404s to the Drupal log. Alternatively you can choose to
+ * return a 404 now by uncommenting the following line. This will reduce server
+ * load, but will cause even valid pages that happen to match the pattern to
+ * return 404s, rather than the actual page. It will also prevent the Drupal
+ * system log entry. Ensure you understand the effects of this before enabling.
+ *
+ * To enable this functionality, remove the leading hash sign below.
+ */
+# drupal_fast_404();
+
+/**
+ * Authorized file system operations:
+ *
+ * The Update manager module included with Drupal provides a mechanism for
+ * site administrators to securely install missing updates for the site
+ * directly through the web user interface by providing either SSH or FTP
+ * credentials. This allows the site to update the new files as the user who
+ * owns all the Drupal files, instead of as the user the webserver is running
+ * as. However, some sites might wish to disable this functionality, and only
+ * update the code directly via SSH or FTP themselves. This setting completely
+ * disables all functionality related to these authorized file operations.
+ *
+ * Remove the leading hash signs to disable.
+ */
+# $conf['allow_authorize_operations'] = FALSE;

software/drupal/software.cfg

 [buildout]
-versions = versions
-
-parts =
-  template
-  apache-php
-  mariadb
-  eggs
-  instance-recipe-egg
-  downloadcache-workaround
 
 extends =
-  ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
+  ../../stack/lamp/buildout.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked
-url = http://ftp.drupal.org/files/projects/drupal-7.8.tar.gz
-md5sum = e0226b56e8d5c57c6b126e8ed5866b1f
-  
-[instance-recipe]
-egg = slapos.cookbook
-module = lamp.simple
-
-[template]
-# Default template for the instance.
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-#md5sum = Student shall put md5 of instance.cfg here
-output = ${buildout:directory}/template.cfg
+url = http://ftp.drupal.org/files/projects/drupal-7.15.tar.gz
+md5sum = f42c9baccd74e1d035d61ff537ae21b4
+
+[application-template]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/settings.php.in
+md5sum = add9e4e96094a9d3fb7cf0f4d26ae544
+download-only = True
+filename = template.in
 mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-eggs = ${instance-recipe:egg}
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
-
-Jinja2 = 2.6
-MySQL-python = 1.2.3
-Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
-buildout-versions = 1.7
-hexagonit.recipe.cmmi = 1.5.0
-meld3 = 0.6.7
-plone.recipe.command = 1.1
-slapos.cookbook = 0.34
-slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
-slapos.recipe.template = 2.2
-slapos.toolbox = 0.10
-
-# Required by:
-# slapos.core==0.18
-# slapos.toolbox==0.10
-Flask = 0.8
-
-# Required by:
-# slapos.cookbook==0.34
-PyXML = 0.8.4
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-# xml-marshaller==0.9.7
-lxml = 2.3.1
-
-# Required by:
-# slapos.cookbook==0.34
-netaddr = 0.7.6
-
-# Required by:
-# slapos.core==0.18
-netifaces = 0.5
-
-# Required by:
-# slapos.toolbox==0.10
-paramiko = 1.7.7.1
-
-# Required by:
-# slapos.toolbox==0.10
-psutil = 0.3.0
-
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
-# Required by:
-# slapos.cookbook==0.34
-# slapos.toolbox==0.10
-slapos.core = 0.18
-
-# Required by:
-# slapos.core==0.18
-supervisor = 3.0a10
-
-# Required by:
-# slapos.cookbook==0.34
-# slapos.toolbox==0.10
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.34
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.18
-zope.interface = 3.8.0
-
-[downloadcache-workaround]
-# workaround irritating problem of hexagonit.recipe.cmmi which automatically
-# creates download cache, which in turn switches builout to "semi-offline" mode
-recipe = plone.recipe.command
-# in hexagonit.recipe.cmmi if there is no ${buildout:download-cache} set it resolves
-# to ${buildout:directory}/downloads but this variable is available late, that's
-# why it is hardcoded only for required case
-download-cache = ${buildout:directory}/downloads
-command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
-update-command = ${:command}
-stop-on-error = True
+[application-configuration]
+location = sites/default/default.settings.php

software/eSKUeL/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/eSKUeL/software.cfg

@@ -63,7 +63,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/erp5/README.txt

+TODO: improve
+
+Instance Parameters
+===================
+
+Zope Parameters
+---------------
+Needed by software-type development (default) and zope.
+
+frontend-software-url
+~~~~~~~~~~~~~~~~~~~~~
+Software URL of an existing frontend.
+XXX: meaning should change (or it will go away) in order to be resilient to
+software updates - as they are visible at software-url level.
+If it is not provided, no frontend will be requested.
+
+frontend-instance-guid
+~~~~~~~~~~~~~~~~~~~~~~
+GUID of frontend instance.
+Not perfect yet: if that instance is replaced, slaves have to be reconfigured.
+Mandatory only if frontend-software-url is also provided.
+XXX: should be complemented (or replaced) by more flexible and precise
+criteria.
+
+frontend-software-type (optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Frontend software type as defined by the software relase at
+frontend-software-url.
+
+frontend-domain (optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+Domain name frontend must recognise as belonging to this instance.
+

software/erp5/configuration.json

-{
-  "name":"Parameter",
-  "title": "Default parameter schema for ERP5 Software Release.",
-  "type": "object",
-  "additionalProperties": false,
-  "properties": {
-    "flavour" : {
-        "type" : "string",
-        "title" : "Sofware Release Flavour",
-        "optional": true,
-        "default" : "default",
-        "enum" : ["default", "configurator"]
-      },
-
-    "bt5_list": {
-       "type":"array",
-       "title" : "Business Template List",
-       "items" : {"type": "string"},
-       "optional" : true
-      },
-
-    "bt5_repository_list": {
-       "type" : "array",
-       "title" : "Business Template Repository List",
-       "items" : {"type": "string"},
-       "optional" : true
-     }
-  }
-}

software/erp5/instance-cloudooo.cfg

-[buildout]
-parts =
-  publish-cloudooo-connection-information
-  cloudooo-instance
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[publish-cloudooo-connection-information]
-recipe = slapos.cookbook:publishurl
-url = cloudooo://$${cloudooo-instance:ip}:$${cloudooo-instance:port}/
-
-[cloudooo-instance]
-recipe = slapos.cookbook:generic.cloudooo
-
-# Network options
-ip = $${slap-network-information:local-ipv4}
-port = 23000
-openoffice-port = 23060
-
-# Paths
-configuration-file = $${rootdirectory:etc}/cloudooo.cfg
-wrapper = $${basedirectory:services}/cloudooo
-
-# Paths: Data
-data-directory = $${directory:cloudooo-data}
-
-environment =
-  LD_LIBRARY_PATH = ${file:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libICE:location}/lib:${libpng12:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib:${libXext:location}/lib:${libxcb:location}/lib:${libXrender:location}/lib:${zlib:location}/lib
-  FONTCONFIG_FILE = $${fontconfig-instance:conf-path}
-
-# Binary information
-# cloudooo specific configuration
-ooo-binary-path = ${libreoffice-bin:location}/program
-ooo-paster = ${buildout:bin-directory}/cloudooo_paster
-ooo-uno-path = ${libreoffice-bin:location}/basis-link/program
-
-[fontconfig-instance]
-recipe = slapos.cookbook:fontconfig
-conf-path = $${rootdirectory:etc}/font.conf
-font-system-folder = ${fonts:location}
-font-folder = $${directory:font}
-url-list = $${dynamic-fontconfig-instance:url-list}
-service-folder = $${basedirectory:services}
-onetimedownload_path = ${buildout:bin-directory}/onetimedownload
-
-# rest of parts are candidates for some generic stuff
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-cloudooo-data = $${rootdirectory:srv}/cloudooo
-font = $${rootdirectory:srv}/font
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-srv = $${buildout:directory}/srv

software/erp5/instance-erp5-development.cfg

-#############################
-#
-# Request erp5 development environnment
-#
-#############################
-[buildout]
-
-extends = ${template-zope:output}
-parts +=
-  request-mariadb
-  request-cloudooo
-  request-memcached
-  request-kumofs
-  basedirectory
-  erp5-update
-  test-runner
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[slap-parameter]
-# default site id
-site-id = erp5
-cloudooo-json =
-
-[test-runner]
-recipe = slapos.cookbook:erp5.test
-certificate-authority-path = $${test-certificate-authority:ca-dir}
-mysql-url = $${request-mariadb:connection-url}
-kumofs-url = $${request-kumofs:connection-url}
-memcached-url = $${request-memcached:connection-url}
-cloudooo-url = $${request-cloudooo:connection-url}
-test-instance-path = $${directory:unit-test-path}
-
-prepend-path = $${buildout:bin-directory}
-run-unit-test = $${buildout:bin-directory}/runUnitTest
-run-test-suite = $${buildout:bin-directory}/runTestSuite
-
-openssl-binary = $${test-certificate-authority:openssl-binary}
-run-unit-test-binary = ${buildout:bin-directory}/runUnitTest
-run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
-
-[test-certificate-authority]
-recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
-ca-dir = $${directory:test-ca-dir}
-requests-directory = $${test-cadirectory:requests}
-wrapper = $${basedirectory:services}/test-ca
-ca-private = $${test-cadirectory:private}
-ca-certs = $${test-cadirectory:certs}
-ca-newcerts = $${test-cadirectory:newcerts}
-ca-crl = $${test-cadirectory:crl}
-
-[test-cadirectory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:test-ca-dir}/requests
-private = $${directory:test-ca-dir}/private
-certs = $${directory:test-ca-dir}/certs
-newcerts = $${directory:test-ca-dir}/newcerts
-crl = $${directory:test-ca-dir}/crl
-
-[erp5-update]
-recipe = slapos.cookbook:erp5.update
-
-# Configuration
-url = http://$${zope-instance:user}:$${zope-instance:password}@$${zope-instance:ip}:$${zope-instance:port}/
-mysql-url = $${request-mariadb:connection-url}
-kumofs-url = $${request-kumofs:connection-url}
-memcached-url = $${request-memcached:connection-url}
-cloudooo-url = $${request-cloudooo:connection-url}
-site-id = $${slap-parameter:site-id}
-openssl-binary = ${openssl:location}/bin/openssl
-cadir-path = $${erp5-certificate-authority:ca-dir}
-
-# Paths
-update-wrapper = $${basedirectory:services}/erp5-update
-
-# Defaults
-configurator-bt5-list = erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_ung erp5_configurator_run_my_doc
-bt5-repository-list = $${zope-instance:bt5-repository-list}
-
-[request-common]
-recipe = slapos.cookbook:request
-software-url = $${slap-connection:software-release-url}
-sla = computer_guid
-sla-computer_guid = $${slap-connection:computer-id}
-return = url
-server-url = $${slap-connection:server-url}
-key-file = $${slap-connection:key-file}
-cert-file = $${slap-connection:cert-file}
-computer-id = $${slap-connection:computer-id}
-partition-id = $${slap-connection:partition-id}
-
-[request-mariadb]
-<=request-common
-name = MariaDB DataBase
-software-type = mariadb
-
-[request-cloudooo]
-<=request-common
-name = Cloudooo
-config = cloudooo-json
-config-cloudooo-json = $${slap-parameter:cloudooo-json}
-software-type = cloudooo
-
-[request-memcached]
-<=request-common
-name = Memcached
-software-type = memcached
-
-[request-kumofs]
-<=request-common
-name = KumoFS
-software-type = kumofs
-
-# rest of parts are candidates for some generic stuff
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-
-[directory]
-test-ca-dir = $${rootdirectory:srv}/test-ca
-test-instance-path = $${rootdirectory:srv}/test-instance
-unit-test-path = $${:test-instance-path}/unit_test

software/erp5/instance-kumofs.cfg

-[buildout]
-parts =
-  publish-kumofs-connection-information
-  kumofs-instance
-  logrotate
-  logrotate-entry-kumofs
-  cron
-  cron-entry-logrotate
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[publish-kumofs-connection-information]
-recipe = slapos.cookbook:publishurl
-url = memcached://$${kumofs-instance:ip}:$${kumofs-instance:gateway-port}/
-
-[kumofs-instance]
-recipe = slapos.cookbook:generic.kumofs
-
-# Network options
-ip = $${slap-network-information:local-ipv4}
-manager-port = 13101
-server-port = 13201
-server-listen-port = 13202
-gateway-port = 13301
-
-# Paths: Running wrappers
-gateway-wrapper = $${basedirectory:services}/kumofs_gateway
-manager-wrapper = $${basedirectory:services}/kumofs_manager
-server-wrapper = $${basedirectory:services}/kumofs_server
-
-# Paths: Data
-data-directory = $${directory:kumofs-data}
-
-# Paths: Logs
-kumo-gateway-log = $${basedirectory:log}/kumo-gateway.log
-kumo-manager-log = $${basedirectory:log}/kumo-manager.log
-kumo-server-log = $${basedirectory:log}/kumo-server.log
-
-# Binary information
-kumo-gateway-binary = ${kumo:location}/bin/kumo-gateway
-kumo-manager-binary = ${kumo:location}/bin/kumo-manager
-kumo-server-binary = ${kumo:location}/bin/kumo-server
-shell-path = ${dash:location}/bin/dash
-
-[logrotate-entry-kumofs]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = kumofs
-log = $${kumofs-instance:kumo-gateway-log} $${kumofs-instance:kumo-manager-log}
-  $${kumofs-instance:kumo-server-log}
-
-# rest of parts are candidates for some generic stuff
-
-[logrotate]
-recipe = slapos.cookbook:logrotate
-# Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = ${gzip:location}/bin/gzip
-gunzip-binary = ${gzip:location}/bin/gunzip
-# Directories
-wrapper = $${rootdirectory:bin}/logrotate
-conf = $${rootdirectory:etc}/logrotate.conf
-logrotate-entries = $${directory:logrotate-entries}
-backup = $${directory:logrotate-backup}
-state-file = $${rootdirectory:srv}/logrotate.status
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log
-services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-backup = $${rootdirectory:srv}/backup
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
-cronstamps = $${rootdirectory:etc}/cronstamps
-logrotate-backup = $${basedirectory:backup}/logrotate
-logrotate-entries = $${rootdirectory:etc}/logrotate.d
-kumofs-data = $${rootdirectory:srv}/kumofs
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
-
-[cron]
-recipe = slapos.cookbook:cron
-dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${directory:cron-entries}
-crontabs = $${directory:crontabs}
-cronstamps = $${directory:cronstamps}
-catcher = $${cron-simplelogger:wrapper}
-binary = $${basedirectory:services}/crond
-
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/cron.log
-
-[cron-entry-logrotate]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = logrotate
-frequency = 0 0 * * *
-command = $${logrotate:wrapper}

software/erp5/instance-mariadb.cfg

-[buildout]
-parts =
-  publish-mariadb-url
-  mariadb-instance
-  logrotate
-  logrotate-entry-mariadb
-  cron
-  cron-entry-logrotate
-  cron-entry-mariadb-backup
-  binary-link
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[publish-mariadb-url]
-recipe = slapos.cookbook:publishurl
-url = mysql://$${mariadb-instance:user}:$${mariadb-instance:password}@$${mariadb-instance:ip}:$${mariadb-instance:port}/$${mariadb-instance:database}
-
-[cron-entry-mariadb-backup]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = mariadb-backup
-frequency = 0 0 * * *
-command = $${mariadb-instance:backup-script}
-
-[mariadb-instance]
-recipe = slapos.cookbook:generic.mysql
-
-# Options
-user = user
-parallel-test-database-amount = 100
-port = 45678
-ip = $${slap-network-information:local-ipv4}
-database = erp5
-test-user = erp5_test
-test-database = erp5_test
-mysql-test-database-base = testdb
-mysql-test-user-base = testuser
-
-# Paths
-wrapper = $${basedirectory:services}/mariadb
-update-wrapper = $${basedirectory:services}/mariadb_update
-backup-script = $${rootdirectory:bin}/innobackupex-controller
-full-backup-directory = $${directory:mariadb-backup-full}
-incremental-backup-directory = $${directory:mariadb-backup-incremental}
-data-directory = $${directory:mariadb-data}
-pid-file = $${basedirectory:run}/mariadb.pid
-socket = $${basedirectory:run}/mariadb.sock
-error-log = $${basedirectory:log}/mariadb_error.log
-slow-query-log = $${basedirectory:log}/mariadb_slowquery.log
-conf-file = $${rootdirectory:etc}/mariadb.cnf
-dumpname = dump.sql.gz
-bin-directory = $${rootdirectory:bin}
-innobackupex-incremental = $${rootdirectory:bin}/innobackupex-incremental
-innobackupex-full = $${rootdirectory:bin}/innobackupex-full
-
-# Binary information
-innobackupex-binary = ${xtrabackup:location}/bin/innobackupex
-mysql-binary = ${mariadb:location}/bin/mysql
-mysql-install-binary = ${mariadb:location}/bin/mysql_install_db
-mysql-upgrade-binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld-binary = ${mariadb:location}/libexec/mysqld
-pt-archiver-binary = ${perl:siteprefix}/bin/pt-archiver
-pt-config-diff-binary = ${perl:siteprefix}/bin/pt-config-diff
-pt-deadlock-logger-binary = ${perl:siteprefix}/bin/pt-deadlock-logger
-pt-duplicate-key-checker-binary = ${perl:siteprefix}/bin/pt-duplicate-key-checker
-pt-fifo-split-binary = ${perl:siteprefix}/bin/pt-fifo-split
-pt-find-binary = ${perl:siteprefix}/bin/pt-find
-pt-fk-error-logger-binary = ${perl:siteprefix}/bin/pt-fk-error-logger
-pt-heartbeat-binary = ${perl:siteprefix}/bin/pt-heartbeat
-pt-index-usage-binary = ${perl:siteprefix}/bin/pt-index-usage
-pt-kill-binary = ${perl:siteprefix}/bin/pt-kill
-pt-log-player-binary = ${perl:siteprefix}/bin/pt-log-player
-pt-online-schema-change-binary = ${perl:siteprefix}/bin/pt-online-schema-change
-pt-query-advisor-binary = ${perl:siteprefix}/bin/pt-query-advisor
-pt-query-digest-binary = ${perl:siteprefix}/bin/pt-query-digest
-pt-show-grants-binary = ${perl:siteprefix}/bin/pt-show-grants
-pt-slave-delay-binary = ${perl:siteprefix}/bin/pt-slave-delay
-pt-slave-find-binary = ${perl:siteprefix}/bin/pt-slave-find
-pt-slave-restart-binary = ${perl:siteprefix}/bin/pt-slave-restart
-pt-table-checksum-binary = ${perl:siteprefix}/bin/pt-table-checksum
-pt-table-sync-binary = ${perl:siteprefix}/bin/pt-table-sync
-pt-tcp-model-binary = ${perl:siteprefix}/bin/pt-tcp-model
-pt-trend-binary = ${perl:siteprefix}/bin/pt-trend
-pt-upgrade-binary = ${perl:siteprefix}/bin/pt-upgrade
-pt-variable-advisor-binary = ${perl:siteprefix}/bin/pt-variable-advisor
-pt-visual-explain-binary = ${perl:siteprefix}/bin/pt-visual-explain
-xtrabackup-binary = ${xtrabackup:location}/bin/xtrabackup_51
-perl-binary = ${perl:location}/bin/perl
-
-[logrotate]
-recipe = slapos.cookbook:logrotate
-# Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = ${gzip:location}/bin/gzip
-gunzip-binary = ${gzip:location}/bin/gunzip
-# Directories
-wrapper = $${rootdirectory:bin}/logrotate
-conf = $${rootdirectory:etc}/logrotate.conf
-logrotate-entries = $${directory:logrotate-entries}
-backup = $${directory:logrotate-backup}
-state-file = $${rootdirectory:srv}/logrotate.status
-
-[logrotate-entry-mariadb]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = mariadb
-log = $${mariadb-instance:error-log} $${mariadb-instance:slow-query-log}
-post = $${mariadb-instance:mysql-binary} --no-defaults -B --socket=$${mariadb-instance:socket} -e "FLUSH LOGS"
-
-[cron]
-recipe = slapos.cookbook:cron
-dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${directory:cron-entries}
-crontabs = $${directory:crontabs}
-cronstamps = $${directory:cronstamps}
-catcher = $${cron-simplelogger:wrapper}
-binary = $${basedirectory:services}/crond
-
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/cron.log
-
-[cron-entry-logrotate]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = logrotate
-frequency = 0 0 * * *
-command = $${logrotate:wrapper}
-
-[binary-link]
-recipe = slapos.cookbook:symbolic.link
-target-directory = $${rootdirectory:bin}
-link-binary = 
-  ${coreutils:location}/bin/basename
-  ${coreutils:location}/bin/cat
-  ${coreutils:location}/bin/cp
-  ${coreutils:location}/bin/ls
-  ${coreutils:location}/bin/tr
-  ${coreutils:location}/bin/uname
-  ${gettext:location}/lib/gettext/hostname
-  ${grep:location}/bin/grep
-  ${sed:location}/bin/sed
-  ${mariadb:location}/bin/mysql
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log
-services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-backup = $${rootdirectory:srv}/backup
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
-cronstamps = $${rootdirectory:etc}/cronstamps
-ca-dir = $${rootdirectory:srv}/ssl
-mariadb-backup-full = $${basedirectory:backup}/mariadb-full
-mariadb-backup-incremental = $${basedirectory:backup}/mariadb-incremental
-mariadb-data = $${rootdirectory:srv}/mariadb
-logrotate-backup = $${basedirectory:backup}/logrotate
-logrotate-entries = $${rootdirectory:etc}/logrotate.d
-

software/erp5/instance-sphinx.cfg

-[buildout]
-parts =
-  publish-sphinx-url
-  sphinxd-instance
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[publish-sphinx-url]
-recipe = slapos.cookbook:publish
-url-sphinx = sphinx://$${sphinxd-instance:ip}:$${sphinxd-instance:sphinx-port}
-url-sphinx-sql = mysql://$${sphinxd-instance:ip}:$${sphinxd-instance:sql-port}
-
-[sphinxd-instance]
-recipe = slapos.cookbook:sphinx
-data-directory = $${directory:sphinx-data}
-configuration-file = $${rootdirectory:etc}/sphinx.conf
-searchd-log = $${basedirectory:log}/sphinx-searchd.log
-query-log = $${basedirectory:log}/sphinx-query.log
-pid = $${basedirectory:run}/sphinx-searchd.pid
-ip = $${slap-network-information:local-ipv4}
-sphinx-port = 9312
-sql-port = 9306
-wrapper = $${basedirectory:services}/sphinxd
-sphinx-searchd-binary = ${sphinx:location}/bin/searchd
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log
-services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-sphinx-data = $${rootdirectory:srv}/sphinx

software/erp5/instance-varnish.cfg

-[buildout]
-parts =
-  publish-varnish-connection-information
-  varnish-instance
-  web-checker
-  cron
-  cron-entry-logrotate
-  cron-entry-web-checker
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[publish-varnish-connection-information]
-recipe = slapos.cookbook:publishurl
-url = http://$${varnish-instance:ip}:$${varnish-instance:server-port}/
-
-[varnish-instance]
-recipe = slapos.cookbook:generic.varnish
-
-# Network options
-ip = $${slap-network-information:local-ipv4}
-server-port = 6001
-manager-port = 6002
-
-# Paths: Running wrappers
-varnishd-wrapper = $${basedirectory:services}/varnishd
-varnishlog-wrapper = $${rootdirectory:bin}/varnishlog
-
-# Binary information
-varnishd-binary = ${varnish:location}/sbin/varnishd
-varnishlog-binary = ${varnish:location}/bin/varnishlog
-shell-path = ${dash:location}/bin/dash
-# Configuration by VCL
-vcl-file = $${rootdirectory:etc}/default.vcl
-pid-file = $${basedirectory:run}/varnishd.pid
-varnish-data = $${directory:varnish-data}
-# this will pass at -n option
-varnish-instance-name = $${directory:varnish-instance}
-web-checker = ${buildout:bin-directory}/web_checker_utility
-
-[cron-entry-web-checker]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = web-checker
-frequency = 0 0 * * *
-command = $${varnish-instance:web-checker} $${web-checker:web-checker-config}
-
-[web-checker]
-recipe = slapos.cookbook:webchecker
-web-checker-config = $${rootdirectory:etc}/web_checker.cfg
-web-checker-working-directory = $${directory:web-checker}
-# for now frontend-url is varnish, it will replace with the real front-end one.
-frontend-url = $${varnish-instance:ip}:$${varnish-instance:server-port}
-wget-binary-path = ${wget:location}/bin/wget
-varnishlog-binary-path = $${varnish-instance:varnishlog-wrapper}
-web-checker-log = $${basedirectory:log}/web-checker.log
-
-[cron]
-recipe = slapos.cookbook:cron
-dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${directory:cron-entries}
-crontabs = $${directory:crontabs}
-cronstamps = $${directory:cronstamps}
-binary = $${basedirectory:services}/crond
-catcher = $${cron-simplelogger:wrapper}
-
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/cron.log
-
-[cron-entry-logrotate]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = logrotate
-frequency = 0 0 * * *
-command = $${logrotate:wrapper}
-
-[logrotate]
-recipe = slapos.cookbook:logrotate
-# Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = ${gzip:location}/bin/gzip
-gunzip-binary = ${gzip:location}/bin/gunzip
-# Directories
-wrapper = $${rootdirectory:bin}/logrotate
-conf = $${rootdirectory:etc}/logrotate.conf
-logrotate-entries = $${directory:logrotate-entries}
-backup = $${directory:logrotate-backup}
-state-file = $${rootdirectory:srv}/logrotate.status
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-backup = $${rootdirectory:srv}/backup
-log = $${rootdirectory:var}/log
-backup = $${rootdirectory:srv}/backup
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-varnish-data = $${rootdirectory:srv}/varnish
-varnish-instance = $${directory:varnish-data}/instance
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
-cronstamps = $${rootdirectory:etc}/cronstamps
-logrotate-backup = $${basedirectory:backup}/logrotate
-logrotate-entries = $${rootdirectory:etc}/logrotate.d
-web-checker = $${rootdirectory:srv}/web-checker
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
-

software/erp5/instance-zope.cfg

-[buildout]
-parts =
-  certificate-authority
-  publish-apache-zope-backend-connection-string
-  zope-instance
-  apache-zope-backend-instance
-  ca-apache-zope-backend
-  logrotate
-  erp5-certificate-authority
-  logrotate-entry-zope
-  cron
-  cron-entry-logrotate
-  binary-link
-  bt5-erp5-link
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[slap-parameter]
-# By default, if no white list is specified, backend allows access to everyone
-access-control-string = all
-
-[publish-apache-zope-backend-connection-string]
-recipe = slapos.cookbook:publish
-url = https://$${zope-instance:user}:$${zope-instance:password}@[$${apache-zope-backend-instance:ip}]:$${apache-zope-backend-instance:port}
-url-deadlock = $${:url}/$${zope-instance:deadlock-path}?$${zope-instance:deadlock-password}
-
-[apache-zope-backend-instance]
-recipe = slapos.cookbook:apache.zope.backend
-backend = http://$${zope-instance:ip}:$${zope-instance:port}/
-ip = $${slap-network-information:global-ipv6}
-port = 16001
-wrapper = $${rootdirectory:bin}/apache
-key-file = $${directory:apache-conf}/apache.key
-cert-file = $${directory:apache-conf}/apache.crt
-configuration-file = $${directory:apache-conf}/apache.conf
-access-control-string = $${slap-parameter:access-control-string}
-pid-file = $${basedirectory:run}/apache.pid
-lock-file = $${basedirectory:run}/apache.lock
-ssl-session-cache = $${basedirectory:log}/apache-ssl-session-cache
-error-log = $${basedirectory:log}/apache-error.log
-access-log = $${basedirectory:log}/apache-access.log
-apache-binary = ${apache:location}/bin/httpd
-scheme = https
-
-[ca-apache-zope-backend]
-<= certificate-authority
-recipe = slapos.cookbook:certificate_authority.request
-key-file = $${apache-zope-backend-instance:key-file}
-cert-file = $${apache-zope-backend-instance:cert-file}
-executable = $${apache-zope-backend-instance:wrapper}
-wrapper = $${basedirectory:services}/apache
-
-[zope-instance]
-recipe = slapos.cookbook:generic.zope
-
-# XXX: products won't be needed as soon as all ERP5 (and products-deps)
-# products will be eggified so then it will be possible to use them thanks to
-# availability in software's eggs
-products = ${products:list}
-
-# Options
-user = zope
-port = 12001
-ip = $${slap-network-information:local-ipv4}
-zodb-cache-size = 5000
-thread-amount = 4
-zodb-path = $${directory:zodb}/main.fs
-deadlock-path = /manage_debug_threads
-
-# Paths
-wrapper = $${basedirectory:services}/zope-development
-instance-path = $${directory:instance}
-instance-etc = $${directory:instance-etc}
-instance-products = $${directory:instance-products}
-bt5-repository = $${rootdirectory:var}/bt5_repository
-tmp-path = $${rootdirectory:tmp}
-bin-path = $${rootdirectory:bin}
-site-zcml = $${:instance-etc}/site.zcml
-logrotate-post = $${rootdirectory:bin}/zope-post-logrotate
-pid-file = $${basedirectory:run}/zope.pid
-lock-file = $${basedirectory:run}/zope.lock
-event-log = $${basedirectory:log}/zope-event.log
-z2-log = $${basedirectory:log}/zope-Z2.log
-configuration-file = $${rootdirectory:etc}/zope.conf
-inituser = $${:instance-path}/inituser
-# Binary information
-runzope-binary = ${buildout:bin-directory}/runzope
-
-# Defaults
-bt5-repository-list =
-
-[logrotate]
-recipe = slapos.cookbook:logrotate
-# Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = ${gzip:location}/bin/gzip
-gunzip-binary = ${gzip:location}/bin/gunzip
-# Directories
-wrapper = $${rootdirectory:bin}/logrotate
-conf = $${rootdirectory:etc}/logrotate.conf
-logrotate-entries = $${directory:logrotate-entries}
-backup = $${directory:logrotate-backup}
-state-file = $${rootdirectory:srv}/logrotate.status
-
-[logrotate-entry-zope]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = zope
-log = $${zope-instance:event-log} $${zope-instance:z2-log}
-frequency = daily
-rotate-num = 30
-post = ${buildout:bin-directory}/killpidfromfile $${zope-instance:pid-file} SIGUSR2
-sharedscripts = true
-notifempty = true
-create = true
-
-[logrotate-entry-apache-zope-backend]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = zope
-log = $${apache-zope-backend-instance:error-log} $${apache-zope-backend-instance:access-log}
-frequency = daily
-rotate-num = 30
-post = ${buildout:bin-directory}/killpidfromfile $${apache-zope-backend-instance:pid-file} SIGUSR1
-sharedscripts = true
-notifempty = true
-create = true
-
-[cron]
-recipe = slapos.cookbook:cron
-dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${directory:cron-entries}
-crontabs = $${directory:crontabs}
-cronstamps = $${directory:cronstamps}
-catcher = $${cron-simplelogger:wrapper}
-binary = $${basedirectory:services}/crond
-
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/cron.log
-
-[cron-entry-logrotate]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = logrotate
-frequency = 0 0 * * *
-command = $${logrotate:wrapper}
-
-[binary-link]
-recipe = slapos.cookbook:symbolic.link
-target-directory = $${rootdirectory:bin}
-link-binary = 
-  ${coreutils:location}/bin/basename
-  ${coreutils:location}/bin/cat
-  ${coreutils:location}/bin/cp
-  ${coreutils:location}/bin/ls
-  ${coreutils:location}/bin/tr
-  ${coreutils:location}/bin/uname
-  ${git:location}/bin/git
-  ${graphviz:location}/bin/dot
-  ${grep:location}/bin/grep
-  ${imagemagick:location}/bin/convert
-  ${imagemagick:location}/bin/identify
-  ${mariadb:location}/bin/mysql
-  ${mariadb:location}/bin/mysqldump
-  ${pdftk:location}/bin/pdftk
-  ${sed:location}/bin/sed
-  ${tesseract:location}/bin/tesseract
-  ${w3m:location}/bin/w3m
-  ${poppler:location}/bin/pdfinfo
-  ${poppler:location}/bin/pdftotext
-  ${poppler:location}/bin/pdftohtml
-[certificate-authority]
-recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
-ca-dir = $${directory:ca-dir}
-requests-directory = $${cadirectory:requests}
-wrapper = $${basedirectory:services}/ca
-ca-private = $${cadirectory:private}
-ca-certs = $${cadirectory:certs}
-ca-newcerts = $${cadirectory:newcerts}
-ca-crl = $${cadirectory:crl}
-
-[bt5-erp5-link]
-recipe = slapos.cookbook:symbolic.link
-target-directory = $${basedirectory:bt5-erp5}
-link-binary =
-  ${erp5:location}/product/ERP5/bootstrap
-  ${erp5:location}/bt5
-
-[cadirectory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:ca-dir}/requests
-private = $${directory:ca-dir}/private
-certs = $${directory:ca-dir}/certs
-newcerts = $${directory:ca-dir}/newcerts
-crl = $${directory:ca-dir}/crl
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-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
-log = $${rootdirectory:var}/log
-services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-backup = $${rootdirectory:srv}/backup
-bt5-erp5 = $${rootdirectory:var}/bt5_erp5
-
-[erp5-certificate-authority]
-recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
-ca-dir = $${directory:erp5-ca-dir}
-requests-directory = $${erp5-cadirectory:requests}
-wrapper = $${basedirectory:services}/erp5-ca
-ca-private = $${erp5-cadirectory:private}
-ca-certs = $${erp5-cadirectory:certs}
-ca-newcerts = $${erp5-cadirectory:newcerts}
-ca-crl = $${erp5-cadirectory:crl}
-
-[erp5-cadirectory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:erp5-ca-dir}/requests
-private = $${directory:erp5-ca-dir}/private
-certs = $${directory:erp5-ca-dir}/certs
-newcerts = $${directory:erp5-ca-dir}/newcerts
-crl = $${directory:erp5-ca-dir}/crl
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-zodb = $${rootdirectory:srv}/zodb
-instance = $${rootdirectory:srv}/erp5shared
-instance-etc = $${:instance}/etc
-apache-conf = $${rootdirectory:etc}/apache
-instance-etc-package-include = $${:instance}/etc/package-include
-# because of bug in slapos.recipe.template keys are lowercased
-instance-document = $${:instance}/Document
-instance-propertysheet = $${:instance}/PropertySheet
-instance-products = $${:instance}/Products
-instance-extensions = $${:instance}/Extensions
-instance-constraint = $${:instance}/Constraint
-instance-import = $${:instance}/import
-instance-lib = $${:instance}/lib
-instance-tests = $${:instance}/tests
-erp5-ca-dir = $${rootdirectory:srv}/erp5-ca
-ca-dir = $${rootdirectory:srv}/ssl
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
-cronstamps = $${rootdirectory:etc}/cronstamps
-logrotate-backup = $${basedirectory:backup}/logrotate
-logrotate-entries = $${rootdirectory:etc}/logrotate.d

software/erp5/snippet-backend.cfg

-[apache-public-%(backend_name)s]
-recipe = slapos.cookbook:apache.zope.backend
-backend = http://$${haproxy-%(backend_name)s:ip}:$${haproxy-%(backend_name)s:port}/
-ip = $${slap-network-information:global-ipv6}
-port = %(apache_public_port)s
-scheme = http
-wrapper = $${basedirectory:services}/apache-public-%(backend_name)s
-configuration-file = $${directory:apache-conf}/apache-public-%(backend_name)s.conf
-access-control-string = %(access_control_string)s
-pid-file = $${basedirectory:run}/apache-public-%(backend_name)s.pid
-lock-file = $${basedirectory:run}/apache-public-%(backend_name)s.lock
-error-log = $${basedirectory:log}/apache-public-%(backend_name)s-error.log
-access-log = $${basedirectory:log}/apache-public-%(backend_name)s-access.log
-apache-binary = ${apache:location}/bin/httpd
-
-[apache-%(backend_name)s]
-recipe = slapos.cookbook:apache.zope.backend
-backend = http://$${haproxy-%(backend_name)s:ip}:$${haproxy-%(backend_name)s:port}
-ip = $${slap-network-information:global-ipv6}
-port = %(apache_port)s
-wrapper = $${rootdirectory:bin}/apache-%(backend_name)s
-scheme = https
-key-file = $${directory:apache-conf}/apache-%(backend_name)s.key
-cert-file = $${directory:apache-conf}/apache-%(backend_name)s.crt
-configuration-file = $${directory:apache-conf}/apache-%(backend_name)s.conf
-access-control-string = %(access_control_string)s
-pid-file = $${basedirectory:run}/apache-%(backend_name)s.pid
-lock-file = $${basedirectory:run}/apache-%(backend_name)s.lock
-ssl-session-cache = $${basedirectory:log}/apache-ssl-session-cache
-error-log = $${basedirectory:log}/apache-%(backend_name)s-error.log
-access-log = $${basedirectory:log}/apache-%(backend_name)s-access.log
-apache-binary = ${apache:location}/bin/httpd
-ssl-authentication = %(ssl_authentication)s
-backend-path = %(backend_path)s
-# Note: Without erp5-certificate-authority main certificate have to be hardcoded
-ssl-authentication-certificate = $${erp5-certificate-authority:ca-dir}/cacert.pem
-ssl-authentication-crl = $${erp5-certificate-authority:ca-crl}
-
-[ca-apache-%(backend_name)s]
-<= certificate-authority
-recipe = slapos.cookbook:certificate_authority.request
-key-file = $${apache-%(backend_name)s:key-file}
-cert-file = $${apache-%(backend_name)s:cert-file}
-executable = $${apache-%(backend_name)s:wrapper}
-wrapper = $${basedirectory:services}/apache-%(backend_name)s
-
-[logrotate-entry-apache-public-%(backend_name)s]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = apache-public-%(backend_name)s
-log = $${apache-public-%(backend_name)s:error-log} $${apache-public-%(backend_name)s:access-log}
-post = ${buildout:bin-directory}/killpidfromfile $${apache-public-%(backend_name)s:pid-file} SIGUSR1
-
-[logrotate-entry-apache-%(backend_name)s]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = apache-%(backend_name)s
-log = $${apache-%(backend_name)s:error-log} $${apache-%(backend_name)s:access-log}
-post = ${buildout:bin-directory}/killpidfromfile $${apache-%(backend_name)s:pid-file} SIGUSR1
-
-[haproxy-%(backend_name)s]
-recipe = slapos.cookbook:haproxy
-name = %(backend_name)s
-conf-path = $${rootdirectory:etc}/haproxy-%(backend_name)s.cfg
-ip = $${slap-network-information:local-ipv4}
-port = %(haproxy_port)s
-maxconn = %(maxconn)s
-server-check-path = %(server_check_path)s
-wrapper-path = $${basedirectory:services}/haproxy-%(backend_name)s
-binary-path = ${haproxy:location}/sbin/haproxy
-backend-list = %(haproxy_backend_list)s

software/erp5/snippet-fontconfig.cfg

-[dynamic-fontconfig-instance]
-url-list = %(font_url_list)s

software/erp5/snippet-master.cfg

-[buildout]
-parts =
-  logrotate
-  cron
-  cron-entry-logrotate
-  certificate-authority
-  erp5-certificate-authority
-  tidstorage
-  cron-entry-tidstorage-backup
-  logrotate-entry-tidstorage
-  binary-link
-  erp5-promise
-  erp5-bootstrap
-  %(part_list)s
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[tidstorage]
-recipe = slapos.cookbook:tidstorage
-known-tid-storage-identifier-dict = %(known_tid_storage_identifier_dict)s
-base-url = http://$${%(haproxy_section)s:ip}:$${%(haproxy_section)s:port}/%%s/serialize
-configuration-path = $${rootdirectory:etc}/tidstorage.py
-ip = $${slap-network-information:local-ipv4}
-port = 6001
-timestamp-file-path = $${directory:tidstorage}/repozo_tidstorage_timestamp.log
-logfile-name = $${basedirectory:log}/tidstorage.log
-pidfile-name = $${basedirectory:run}/tidstorage.pid
-status-file = $${directory:tidstorage}/tidstorage.tid
-tidstorage-repozo-binary = ${buildout:bin-directory}/tidstorage_repozo
-tidstoraged-binary = ${buildout:bin-directory}/tidstoraged
-repozo-binary = ${buildout:bin-directory}/repozo
-tidstorage-wrapper = $${basedirectory:services}/tidstoraged
-repozo-wrapper = $${buildout:bin-directory}/tidstorage-repozo
-
-[cron-entry-tidstorage-backup]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = tidstorage
-frequency = 0 0 * * *
-command = $${tidstorage:repozo-wrapper}
-
-[logrotate-entry-tidstorage]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = tidstorage
-log = $${tidstorage:logfile-name}
-post = ${buildout:bin-directory}/killpidfromfile $${tidstorage:pidfile-name} SIGHUP
-
-[cron]
-recipe = slapos.cookbook:cron
-dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${directory:cron-entries}
-crontabs = $${directory:crontabs}
-cronstamps = $${directory:cronstamps}
-catcher = $${cron-simplelogger:wrapper}
-binary = $${basedirectory:services}/crond
-
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/cron.log
-
-[cron-entry-logrotate]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = logrotate
-frequency = 0 0 * * *
-command = $${logrotate:wrapper}
-
-[logrotate]
-recipe = slapos.cookbook:logrotate
-# Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = ${gzip:location}/bin/gzip
-gunzip-binary = ${gzip:location}/bin/gunzip
-# Directories
-wrapper = $${rootdirectory:bin}/logrotate
-conf = $${rootdirectory:etc}/logrotate.conf
-logrotate-entries = $${directory:logrotate-entries}
-backup = $${directory:logrotate-backup}
-state-file = $${rootdirectory:srv}/logrotate.status
-
-[zeo-instance-entry-common]
-recipe = slapos.cookbook:zeo
-ip = $${slap-network-information:local-ipv4}
-binary-path = ${buildout:bin-directory}/runzeo
-
-[erp5-certificate-authority]
-recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
-ca-dir = $${directory:erp5-ca-dir}
-requests-directory = $${erp5-cadirectory:requests}
-wrapper = $${basedirectory:services}/erp5-ca
-ca-private = $${erp5-cadirectory:private}
-ca-certs = $${erp5-cadirectory:certs}
-ca-newcerts = $${erp5-cadirectory:newcerts}
-ca-crl = $${erp5-cadirectory:crl}
-country-code = %(erp5_ca_country_code)s
-email = %(erp5_ca_email)s
-state = %(erp5_ca_state)s
-city = %(erp5_ca_city)s
-company = %(erp5_ca_company)s
-
-[erp5-cadirectory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:erp5-ca-dir}/requests
-private = $${directory:erp5-ca-dir}/private
-certs = $${directory:erp5-ca-dir}/certs
-newcerts = $${directory:erp5-ca-dir}/newcerts
-crl = $${directory:erp5-ca-dir}/crl
-
-[certificate-authority]
-recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
-ca-dir = $${directory:ca-dir}
-requests-directory = $${cadirectory:requests}
-wrapper = $${basedirectory:services}/ca
-ca-private = $${cadirectory:private}
-ca-certs = $${cadirectory:certs}
-ca-newcerts = $${cadirectory:newcerts}
-ca-crl = $${cadirectory:crl}
-
-[cadirectory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:ca-dir}/requests
-private = $${directory:ca-dir}/private
-certs = $${directory:ca-dir}/certs
-newcerts = $${directory:ca-dir}/newcerts
-crl = $${directory:ca-dir}/crl
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-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
-log = $${rootdirectory:var}/log
-services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-backup = $${rootdirectory:srv}/backup
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-tidstorage = $${rootdirectory:srv}/tidstorage
-zodb = $${rootdirectory:srv}/zodb
-zodb-backup = $${basedirectory:backup}/zodb
-instance = $${rootdirectory:srv}/erp5shared
-instance-etc = $${:instance}/etc
-apache-conf = $${rootdirectory:etc}/apache
-instance-etc-package-include = $${:instance}/etc/package-include
-# because of bug in slapos.recipe.template keys are lowercased
-instance-document = $${:instance}/Document
-instance-propertysheet = $${:instance}/PropertySheet
-instance-products = $${:instance}/Products
-instance-extensions = $${:instance}/Extensions
-instance-constraint = $${:instance}/Constraint
-instance-import = $${:instance}/import
-instance-lib = $${:instance}/lib
-instance-tests = $${:instance}/tests
-erp5-ca-dir = $${rootdirectory:srv}/erp5-ssl
-ca-dir = $${rootdirectory:srv}/ssl
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
-cronstamps = $${rootdirectory:etc}/cronstamps
-logrotate-backup = $${basedirectory:backup}/logrotate
-logrotate-entries = $${rootdirectory:etc}/logrotate.d
-
-[binary-link]
-recipe = slapos.cookbook:symbolic.link
-target-directory = $${rootdirectory:bin}
-link-binary = 
-  ${coreutils:location}/bin/basename
-  ${coreutils:location}/bin/cat
-  ${coreutils:location}/bin/cp
-  ${coreutils:location}/bin/ls
-  ${coreutils:location}/bin/tr
-  ${coreutils:location}/bin/uname
-  ${git:location}/bin/git
-  ${graphviz:location}/bin/dot
-  ${grep:location}/bin/grep
-  ${imagemagick:location}/bin/convert
-  ${imagemagick:location}/bin/identify
-  ${mariadb:location}/bin/mysql
-  ${mariadb:location}/bin/mysqldump
-  ${pdftk:location}/bin/pdftk
-  ${sed:location}/bin/sed
-  ${tesseract:location}/bin/tesseract
-  ${w3m:location}/bin/w3m
-  ${poppler:location}/bin/pdfinfo
-  ${poppler:location}/bin/pdftotext
-  ${poppler:location}/bin/pdftohtml
-
-[erp5-bootstrap]
-recipe = slapos.cookbook:erp5.bootstrap
-runner-path = $${basedirectory:services}/erp5-bootstrap
-mysql-url = %(mysql-url)s
-zope-url = http://$${%(zope_section)s:user}:$${%(zope_section)s:password}@$${%(zope_section)s:ip}:$${%(zope_section)s:port}/%(site_id)s
-
-[erp5-promise]
-recipe = slapos.cookbook:erp5.promise
-promise-path = $${rootdirectory:etc}/erp5promise.cfg
-kumofs-url = %(kumofs-url)s
-memcached-url = %(memcached-url)s
-cloudooo-url = %(cloudooo-url)s
-smtp-url = $${slap-parameter:smtp-url}
-bt5 = $${slap-parameter:bt5}
-bt5-repository-url = $${slap-parameter:bt5-repository-url}
-

software/erp5/snippet-zeo.cfg

-[zeo-instance-%(zeo_id)s]
-<= zeo-instance-entry-common
-log-path = $${basedirectory:log}/zeo-%(zeo_id)s.log
-pid-path = $${basedirectory:run}/zeo-%(zeo_id)s.pid
-conf-path = $${rootdirectory:etc}/zeo-%(zeo_id)s.conf
-port = %(zeo_port)s
-storage =
-  %(storage_list)s
-wrapper-path = $${basedirectory:services}/zeo-%(zeo_id)s
-
-[logrotate-entry-zeo-%(zeo_id)s]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = zeo-%(zeo_id)s
-log = $${zeo-instance-%(zeo_id)s:log-path}
-post = ${buildout:bin-directory}/killpidfromfile $${zeo-instance-%(zeo_id)s:pid-path} SIGUSR2

software/erp5/snippet-zope.cfg

-[%(zope_id)s]
-recipe = slapos.cookbook:generic.zope.zeo.client
-
-# XXX: products won't be needed as soon as all ERP5 (and products-deps)
-# products will be eggified so then it will be possible to use them thanks to
-# availability in software's eggs
-products = ${products:list}
-
-# Options
-user = zope
-port = %(zope_port)s
-ip = $${slap-network-information:local-ipv4}
-thread-amount = %(zope_thread_amount)s
-deadlock-path = /manage_debug_threads
-timezone = %(timezone)s
-zeo-connection-string =
-  %(zeo_connection_string)s
-
-timeserver = %(zope_timeserver)s
-tidstorage-ip = $${tidstorage:ip}
-tidstorage-port = $${tidstorage:port}
-
-# long request
-longrequest-logger-file = %(longrequest_logger_file)s
-longrequest-logger-timeout = %(longrequest_logger_timeout)s
-longrequest-logger-interval = %(longrequest_logger_interval)s
-
-# Paths
-wrapper = $${basedirectory:services}/%(zope_id)s
-instance-path = $${directory:instance}
-instance-etc = $${directory:instance-etc}
-instance-products = $${directory:instance-products}
-bt5-repository = $${rootdirectory:var}/bt5_repository
-tmp-path = $${rootdirectory:tmp}
-bin-path = $${rootdirectory:bin}
-site-zcml = $${:instance-etc}/site.zcml
-pid-file = $${basedirectory:run}/%(zope_id)s.pid
-lock-file = $${basedirectory:run}/%(zope_id)s.lock
-event-log = $${basedirectory:log}/%(zope_id)s-event.log
-z2-log = $${basedirectory:log}/%(zope_id)s-Z2.log
-configuration-file = $${rootdirectory:etc}/%(zope_id)s.conf
-inituser = $${:instance-path}/inituser
-# Binary information
-runzope-binary = ${buildout:bin-directory}/runzope
-
-# BT5 Configuration
-bt5-repository-list =
-
-promise-path = $${erp5-promise:promise-path}
-site-id = %(site_id)s
-
-[logrotate-entry-%(zope_id)s]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = %(zope_id)s
-log = $${%(zope_id)s:event-log} $${%(zope_id)s:z2-log}
-post = ${buildout:bin-directory}/killpidfromfile $${%(zope_id)s:pid-file} SIGUSR2

software/erp5/software.cfg

 [buildout]
 extends =
-  ../../stack/shacache-client.cfg
-  ../../stack/erp5.cfg
-
-versions = versions
-
-# Local development
-develop =
-  ${:parts-directory}/slapos.cookbook-repository
-parts +=
-# Local development
-  slapos.cookbook-repository
-  check-recipe
-  slapos.cookbook-python2.6
-# Create instance template
-  template
-  validator
-
-# XXX: Workaround of SlapOS limitation
-# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
-# development / fast switching environment for whole software
-unzip = true
-
-# Local development
-[slapos.cookbook-repository]
-recipe = plone.recipe.command
-stop-on-error = true
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = ${git:location}/bin/git clone --branch erp5 --quiet http://git.erp5.org/repos/slapos.git ${:location}
-update-command = cd ${:location} && GIT_COMMITTER_EMAIL=nobody@example.com GIT_AUTHOR_NAME=Nobody GIT_AUTHOR_EMAIL=nobody@example.com ${git:location}/bin/git pull --quiet
-
-[check-recipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
-
-[slapos.cookbook-python2.6]
-recipe = zc.recipe.egg
-eggs = slapos.cookbook
-scripts =
-python = python2.6
-ugly-depend-on = ${slapos.cookbook-repository:command} ${slapos.cookbook-repository:update-command}
-
-[template-mariadb]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-mariadb.cfg
-md5sum = 6580f1d431f65281c7aa1358a51cc292
-output = ${buildout:directory}/template-mariadb.cfg
-mode = 0644
-
-[template-sphinx]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-sphinx.cfg
-md5sum = b6d196fb9014222dacef13a0d12a445d
-output = ${buildout:directory}/template-sphinx.cfg
-mode = 0644
-
-[template-zope]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-zope.cfg
-md5sum = d3d221255f93a9ced82dcca9ca57f84e
-output = ${buildout:directory}/template-zope.cfg
-mode = 0644
-
-[template-cloudooo]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-cloudooo.cfg
-md5sum = e7698a0537785339e249bdc57f369e93
-output = ${buildout:directory}/template-cloudooo.cfg
-mode = 0644
-
-[template-snippet-fontconfig]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/snippet-fontconfig.cfg
-md5sum = 76c5d4cd1c8d48648684d9873f1ffed3
-output = ${buildout:directory}/template-snippet-fontconfig.cfg
-mode = 0644
-
-[template-kumofs]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-kumofs.cfg
-md5sum = 9746823ccbbedf42b3e759c3e7150252
-output = ${buildout:directory}/template-kumofs.cfg
-mode = 0644
-
-[template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-md5sum = f3443d071d8d7330b3453583e096fef0
-output = ${buildout:directory}/template.cfg
-mode = 0644
-
-[template-memcached]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-memcached.cfg
-md5sum = 7ed1d93dafa76adc025acb2f0e08c05f
-output = ${buildout:directory}/template-memcached.cfg
-mode = 0644
-
-[template-erp5-development]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-erp5-development.cfg
-md5sum = 4bc5a2ec8c04b206dab8b98258a69efd
-output = ${buildout:directory}/template-erp5-development.cfg
-mode = 0644
-
-[template-erp5-production]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-erp5-production.cfg
-md5sum = 54ad3c5e92af02d0db98d1085adf986d
-output = ${buildout:directory}/template-erp5-production.cfg
-mode = 0644
-
-[template-snippet-zeo]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/snippet-zeo.cfg
-md5sum = ca9ee3825ff90c5c894ff1da8c601552
-output = ${buildout:directory}/template-snippet-zeo.cfg
-mode = 0644
-
-[template-snippet-master]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/snippet-master.cfg
-md5sum = 14ffe48453a74190bdd289169220739f
-output = ${buildout:directory}/template-snippet-master.cfg
-mode = 0644
-
-[template-snippet-zope]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/snippet-zope.cfg
-md5sum = bcc68c31a16b35bee7111f9c6e02b781
-output = ${buildout:directory}/template-snippet-zope.cfg
-mode = 0644
-
-[template-snippet-backend]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/snippet-backend.cfg
-md5sum = 3a1b359b57bf21a226bb96c0c18f1924
-output = ${buildout:directory}/template-snippet-backend.cfg
-mode = 0644
-
-[template-varnish]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-varnish.cfg
-md5sum = 70fb0ccadf0d6723ddb0fe55a1549ca5
-output = ${buildout:directory}/template-varnish.cfg
-mode = 0644
-
-[validator]
-# Default json schema for instance parameters.
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/configuration.json
-md5sum = cbe1d75339c6cb20e1aef818797face1
-output = ${buildout:directory}/schema.json
-mode = 0644
+  ../../stack/erp5/buildout.cfg
 
 [networkcache]
 # signature certificates of the following uploaders.
@@ -164,6 +10,7 @@ mode = 0644
 #   Cedric de Saint Martin
 #   Yingjie Xu
 #   Gabriel Monnerat
+#   Łukasz Nowak
 signature-certificate-list =
   -----BEGIN CERTIFICATE-----
   MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
@@ -243,3 +90,16 @@ signature-certificate-list =
   Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
   yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
   -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
+  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
+  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
+  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
+  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
+  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
+  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
+  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
+  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
+  -----END CERTIFICATE-----

software/erp5scalabilitytestbed/software.cfg

@@ -27,8 +27,8 @@ command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
 recipe = plone.recipe.command
 stop-on-error = true
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = git clone -b erp5scalabilitytestbed --quiet http://git.erp5.org/repos/slapos.git ${:location}
-update-command = cd ${:location} && git pull --quiet
+command = git clone -b erp5scalabilitytestbed --quiet http://git.erp5.org/repos/slapos.git "${:location}"
+update-command = cd "${:location}" && git fetch --quiet && git reset --hard @{upstream}
 
 [eggs]
 dummy = ${slapos.cookbook:location}

software/erp5testnode/software.cfg

@@ -60,8 +60,8 @@ unzip = true
 recipe = plone.recipe.command
 stop-on-error = true
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = ${git:location}/bin/git clone --quiet http://git.erp5.org/repos/slapos.git ${:location}
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
+command = "${git:location}/bin/git" clone --quiet http://git.erp5.org/repos/slapos.git "${:location}"
+update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && "${git:location}/bin/git" reset --hard @{upstream}
 
 [check-recipe]
 recipe = plone.recipe.command
@@ -106,7 +106,14 @@ mode = 0644
 md5sum = 2349e62d4fa46fc88e05d855f49b7c38
 
 [networkcache]
-# Romain Courteaud + Sebastien Robin + Antoine Catton signature certificate
+# signature certificates of the following uploaders.
+#   Romain Courteaud
+#   Sebastien Robin
+#   Kazuhiko Shiozaki
+#   Cedric de Saint Martin
+#   Yingjie Xu
+#   Gabriel Monnerat
+#   Antoine Catton
 signature-certificate-list =
   -----BEGIN CERTIFICATE-----
   MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
@@ -135,6 +142,58 @@ signature-certificate-list =
   hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
   -----END CERTIFICATE-----
   -----BEGIN CERTIFICATE-----
+  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
+  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
+  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
+  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
+  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
+  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
+  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
+  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
+  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
+  vaZhjNYKWQf79l6zXfOvphzJ
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
+  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
+  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
+  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
+  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
+  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
+  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
+  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
+  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
+  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
+  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
+  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
+  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
+  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
+  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
+  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
+  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
   MIIB8DCCAVmgAwIBAgIJAJ5iKK7w6AQVMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
   BAMMBkNPTVAtMTAeFw0xMTExMjkxNjU1NDZaFw0xMjExMjgxNjU1NDZaMBExDzAN
   BgNVBAMMBkNPTVAtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6IBOEnQP
@@ -173,7 +232,7 @@ PyXML = 0.8.5
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.38

software/ezpublish/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/ezpublish/software.cfg

@@ -63,7 +63,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/gitrepo/git-http-backend.cgi.in

+#!/usr/bin/env sh
+
+GIT_PROJECT_ROOT="%(projectdir)s" GIT_HTTP_EXPORT_ALL= exec "%(githttpbackend)s" $@

software/gitrepo/gitweb.cgi.in

+#!/usr/bin/env sh
+
+GITWEB_CONFIG="%(gitwebconf)s" exec "%(perl)s" "%(gitweb)s" $@

software/gitrepo/gitweb.conf.in

+$projectroot = '%(projectdir)s';
+
+$site_name = '%(sitename)s';
+
+# Beautiful URLs
+$feature{'pathinfo'}{'default'} = [1];

software/gitrepo/httpd.conf.in

+PidFile "%(pidfile)s"
+Listen %(ip)s:%(port)s
+ServerAdmin someone@email
+
+ErrorLog "%(errorlog)s"
+LogLevel warn
+
+ScriptSock "%(cgidsock)s"
+
+<Directory />
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+</Directory>
+
+Alias "/static/" "%(gitwebstaticdir)s"
+<Directory "%(gitwebstaticdir)s">
+    Options FollowSymLinks
+    Order deny,allow
+    Allow from all
+</Directory>
+
+# This is Static Accelerated git pull
+AliasMatch "^/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$"          "%(projectdir)s/$1"
+AliasMatch "^/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$" "%(projectdir)s/$1"
+
+# When it can't be statically delivered, we rely on git-http-backend
+ScriptAliasMatch \
+        "(?x)^/(.*/(HEAD | \
+                        info/refs | \
+                        objects/info/[^/]+ | \
+                        git-(upload|receive)-pack))$" \
+        "%(githttpbackend)s/$1"
+
+# Everything else is gitweb interface
+ScriptAlias "/"                                                "%(gitwebscript)s/"
+
+<Location />
+    Order deny,allow
+    Allow from all
+</Location>
+
+<LocationMatch "^/.*/git-receive-pack$">
+    AuthType Basic
+    AuthName "Git Push Access"
+    AuthBasicProvider file
+    AuthUserFile "%(passwdfile)s"
+    Require valid-user
+    SetEnv REMOTE_USER $REDIRECT_REMOTE_USER
+</LocationMatch>
+
+
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule alias_module modules/mod_alias.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authn_file_module modules/mod_authn_file.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule authz_user_module modules/mod_authz_user.so
+LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule cgid_module modules/mod_cgid.so
+LoadModule env_module modules/mod_env.so
+LoadModule unixd_module modules/mod_unixd.so

software/gitrepo/instance-gitrepo.cfg

+[buildout]
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+parts =
+  httpd
+  publish
+
+[publish]
+recipe = slapos.cookbook:publish
+url = http://$${pwgen:user}:$${pwgen:password}@[$${httpd-conf:ip}]:$${httpd-conf:port}/
+
+[httpd]
+recipe = slapos.cookbook:wrapper
+command-line = ${apache:location}/bin/httpd -DFOREGROUND -f "$${httpd-conf:output}"
+output = $${basedirectory:services}/httpd
+
+
+[httpd-conf]
+recipe = slapos.cookbook:template
+template = ${template-httpd-conf:location}/${template-httpd-conf:filename}
+output = $${rootdirectory:etc}/httpd.conf
+
+pidfile = $${basedirectory:run}/httpd.pid
+errorlog = $${basedirectory:log}/httpd-errorlog.log
+gitwebstaticdir = ${gitweb:location}/share/gitweb/static/
+gitwebscript = $${gitweb-cgi:output}
+githttpbackend = $${git-http-backend-cgi:output}
+cgidsock = $${basedirectory:run}/cgid.sock
+projectdir = $${gitweb-conf:projectdir}
+passwdfile = $${htpasswd:output}
+ip = $${slap-network-information:global-ipv6}
+port = 8080
+
+
+[gitweb-conf]
+recipe = slapos.cookbook:template
+template = ${template-gitweb-conf:location}/${template-gitweb-conf:filename}
+output = $${rootdirectory:etc}/gitweb.conf
+
+projectdir = $${git-repos:base-directory}
+sitename = $${slap-parameter:title}
+
+[gitweb-cgi]
+recipe = slapos.cookbook:template
+template = ${template-gitweb-cgi:location}/${template-gitweb-cgi:filename}
+output = $${rootdirectory:bin}/gitweb.cgi
+mode = 700
+
+perl = ${perl:location}/bin/perl
+gitweb = ${gitweb:location}/share/gitweb/gitweb.cgi
+gitwebconf = $${gitweb-conf:output}
+
+
+[git-http-backend-cgi]
+recipe = slapos.cookbook:template
+template = ${template-git-http-backend-cgi:location}/${template-git-http-backend-cgi:filename}
+output = $${rootdirectory:bin}/git-http-backend.cgi
+mode = 700
+
+projectdir = $${git-repos:base-directory}
+githttpbackend = ${git:location}/libexec/git-core/git-http-backend
+
+
+[htpasswd]
+recipe = collective.recipe.cmd
+output = $${rootdirectory:etc}/httpd.htpasswd
+on_install = true
+on_udptae = true
+cmds =
+  ${apache:location}/bin/htpasswd -cb $${:output} $${pwgen:user} $${pwgen:password}
+
+[pwgen]
+recipe = slapos.cookbook:pwgen
+file = $${buildout:directory}/.password
+pwgen-binary = ${pwgen:location}/bin/pwgen
+user = slapos
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+srv = $${buildout:directory}/srv/
+var = $${buildout:directory}/var/
+bin = $${buildout:directory}/bin/
+
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+services = $${rootdirectory:etc}/run/
+run = $${rootdirectory:var}/run/
+git-repos = $${rootdirectory:srv}/git/
+log = $${rootdirectory:var}/log/
+
+
+[git-repos]
+recipe = slapos.cookbook:gitinit
+base-directory = $${basedirectory:git-repos}
+repos = $${slap-parameter:repos}
+git-binary = ${git:location}/bin/git
+
+[slap-parameter]
+title = GitSlap

software/gitrepo/instance.cfg

+[buildout]
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+parts =
+  switch-softwaretype
+
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${template-gitrepo:output}

software/gitrepo/software.cfg

+[buildout]
+
+extends =
+  ../../component/apache/buildout.cfg
+  ../../component/perl/buildout.cfg
+  ../../component/git/buildout.cfg
+  ../../component/pwgen/buildout.cfg
+  ../../stack/slapos.cfg
+
+parts =
+  apache
+  perl
+  git
+  gitweb
+  slapos-cookbook
+  template
+  template-gitrepo
+  collective-recipe-cmd
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = 5917cf0a9d6cc5d6d184e89ca2d72a91
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[template-gitrepo]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-gitrepo.cfg
+md5sum = 79ebc1f23443562b3facd4945f031fcf
+output = ${buildout:directory}/template-gitrepo.cfg
+mode = 0644
+
+[template-download]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+
+[template-gitweb-cgi]]
+<= template-download
+filename = gitweb.cgi.in
+md5sum = 977d23296605d6a7f33f4f83d5bd29c8
+
+[template-gitweb-conf]
+<= template-download
+filename = gitweb.conf.in
+md5sum = bdf4b9e616e7b8e436040304bf1ac312
+
+[template-git-http-backend-cgi]
+<= template-download
+filename = git-http-backend.cgi.in
+md5sum = 814393f919dd0204c913aa77e6183b9c
+
+[template-httpd-conf]
+<= template-download
+filename = httpd.conf.in
+md5sum = 442ffed44a671eb3c5810a6bfa8a3515
+
+[collective-recipe-cmd]
+recipe = zc.recipe.egg
+eggs =
+  collective.recipe.cmd
+
+
+[version]
+slapos.cookbook = 0.62

software/joomla/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/joomla/software.cfg

@@ -64,7 +64,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/kumofs/software.cfg

@@ -89,7 +89,7 @@ PyXML = 0.8.5
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.38

software/kvm/instance-frontend.cfg

@@ -12,7 +12,6 @@ parts =
   ca-frontend
   certificate-authority
   frontend-promise
-  publish-kvm-frontend-connection-information
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -48,7 +47,7 @@ logrotate-entries = $${rootdirectory:etc}/logrotate.d
 recipe = slapos.cookbook:kvm.frontend
 domain = $${ca-frontend:name}
 # port = $${slap-parameter:port}
-ip = $${slap-network-information:global-ipv6}
+ip = $${slap-network-information:local-ipv4}
 port = $${slap-parameter:port}
 http-redirection = $${slap-parameter:http-redirection}
 ssl-key-path = $${ca-frontend:key-file}
@@ -130,11 +129,6 @@ logrotate-entries = $${directory:logrotate-entries}
 backup = $${directory:logrotate-backup}
 state-file = $${rootdirectory:srv}/logrotate.status
 
-[publish-kvm-frontend-connection-information]
-recipe = slapos.cookbook:publish
-ip = $${frontend-instance:ip}
-port = $${frontend-instance:port}
-
 [slap-parameter]
 # Default value if no port is specified
 port = 4443

software/kvm/instance-kvm.cfg

@@ -5,11 +5,13 @@
 #############################
 [buildout]
 parts =
-  request-slave-frontend
   certificate-authority
+  publish-kvm-backend-connection-information
+  publish-kvm-frontend-connection-information
   kvm-promise
+  websockify-sighandler
   novnc-promise
-  publish-kvm-connection-information
+  frontend-promise
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -32,6 +34,12 @@ ca-dir = $${rootdirectory:srv}/ssl
 
 [create-mac]
 recipe = slapos.cookbook:generate.mac
+storage-path = $${rootdirectory:srv}/mac
+
+[gen-passwd]
+recipe = slapos.cookbook:generate.password
+storage-path = $${rootdirectory:srv}/passwd
+bytes = 4
 
 [kvm-instance]
 recipe = slapos.cookbook:kvm
@@ -52,6 +60,7 @@ controller-path = $${basedirectory:services}/kvm_controller
 shell-path = ${dash:location}/bin/dash
 qemu-path = ${kvm:location}/bin/qemu-system-x86_64
 qemu-img-path = ${kvm:location}/bin/qemu-img
+passwd = $${gen-passwd:passwd}
 
 [kvm-promise]
 recipe = slapos.cookbook:check_port_listening
@@ -59,6 +68,7 @@ path = $${basedirectory:promises}/vnc_promise
 hostname = $${kvm-instance:vnc-ip}
 port = $${kvm-instance:vnc-port}
 
+
 [novnc-instance]
 recipe = slapos.cookbook:novnc
 path = $${ca-novnc:executable}
@@ -71,6 +81,11 @@ websockify-path = ${buildout:directory}/bin/websockify
 ssl-key-path = $${ca-novnc:key-file}
 ssl-cert-path = $${ca-novnc:cert-file}
 
+[websockify-sighandler]
+recipe = slapos.cookbook:signalwrapper
+wrapper-path = $${basedirectory:services}/websockify
+wrapped-path = $${novnc-instance:path}
+
 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
 openssl-binary = ${openssl:location}/bin/openssl
@@ -96,7 +111,7 @@ recipe = slapos.cookbook:certificate_authority.request
 key-file = $${basedirectory:novnc-conf}/novnc.key
 cert-file = $${basedirectory:novnc-conf}/novnc.crt
 executable = $${rootdirectory:bin}/novnc
-wrapper = $${basedirectory:services}/websockify
+wrapper = $${rootdirectory:bin}/websockify
 
 [novnc-promise]
 recipe = slapos.cookbook:check_port_listening
@@ -104,33 +119,50 @@ path = $${basedirectory:promises}/novnc_promise
 hostname = $${novnc-instance:ip}
 port = $${novnc-instance:port}
 
+
 [kvm-monitor]
 recipe = slapos.cookbook:generic.slapmonitor
 db-path = $${rootdirectory:srv}/slapmonitor_database
 
-[request-common]
-recipe = slapos.cookbook:request
-software-url = $${slap-connection:software-release-url}
-sla = computer_guid
-sla-computer_guid = $${slap-connection:computer-id}
+
+[request-slave-frontend]
+recipe = slapos.cookbook:requestoptional
+software-url = $${slap-parameter:frontend-software-url}
 server-url = $${slap-connection:server-url}
 key-file = $${slap-connection:key-file}
 cert-file = $${slap-connection:cert-file}
 computer-id = $${slap-connection:computer-id}
 partition-id = $${slap-connection:partition-id}
-
-[request-slave-frontend]
-<=request-common
 name = SlaveFrontend
-software-type = frontend
+software-type = $${slap-parameter:frontend-software-type}
 slave = true
 config = host port
 config-host = $${novnc-instance:ip}
 config-port = $${novnc-instance:port}
 return = url resource port domainname
+sla = instance_guid
+sla-instance_guid = $${slap-parameter:frontend-instance-guid}
 
-[publish-kvm-connection-information]
+[publish-kvm-backend-connection-information]
 recipe = slapos.cookbook:publish
 backend_url = https://[$${novnc-instance:ip}]:$${novnc-instance:port}/vnc_auto.html?host=[$${novnc-instance:ip}]&port=$${novnc-instance:port}&encrypt=1
-url = $${request-slave-frontend:connection-url}/vnc_auto.html?host=$${request-slave-frontend:connection-domainname}&port=$${request-slave-frontend:connection-port}&encrypt=1&path=$${request-slave-frontend:connection-resource}
 password = $${kvm-instance:passwd}
+
+[publish-kvm-frontend-connection-information]
+<= publish-kvm-backend-connection-information
+url = $${request-slave-frontend:connection-url}/vnc_auto.html?host=$${request-slave-frontend:connection-domainname}&port=$${request-slave-frontend:connection-port}&encrypt=1&path=$${request-slave-frontend:connection-resource}
+
+[frontend-promise]
+recipe = slapos.cookbook:check_url_available
+path = $${basedirectory:promises}/frontend_promise
+url = $${publish-kvm-frontend-connection-information:url}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+
+[slap-parameter]
+# Default values if not specified
+frontend-instance-guid = SOFTINST-11031
+frontend-software-type = frontend
+frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg
+nbd_port = 1024
+nbd_ip = debian.nbd.vifib.net

software/kvm/instance-kvmplus.cfg

@@ -4,24 +4,9 @@
 #
 #############################
 [buildout]
-extends = instance-kvm.cfg
+extends = ${template-kvm:output}
 
 [kvm-instance]
-recipe = slapos.cookbook:kvm
-vnc-ip = $${slap-network-information:local-ipv4}
-vnc-port = 5901
-nbd-ip = $${slap-parameter:nbd_ip}
-nbd-port = $${slap-parameter:nbd_port}
-tap = $${slap-network-information:network-interface}
-disk-path = $${rootdirectory:srv}/virtual.qcow2
 disk-size = 20
-socket-path = $${rootdirectory:var}/qmp_socket
-pid-path = $${basedirectory:run}/pid_file
 smp-count = 2
 ram-size = 2048
-mac-address = $${create-mac:mac-address}
-runner-path = $${basedirectory:services}/kvm
-controller-path = $${basedirectory:services}/kvm_controller
-shell-path = ${dash:location}/bin/dash
-qemu-path = ${kvm:location}/bin/qemu-system-x86_64
-qemu-img-path = ${kvm:location}/bin/qemu-img

software/kvm/instance-nbd.cfg

@@ -40,15 +40,21 @@ path = $${basedirectory:promises}/nbd_promise
 hostname = $${nbd-instance:ip}
 port = $${nbd-instance:port}
 
+[gen-passwd]
+recipe = slapos.cookbook:generate.password
+storage-path = $${rootdirectory:srv}/passwd
+bytes = 24
+
 [onetimeupload-instance]
-recipe = slapos.cookbook:generic.onetimeupload
+recipe = slapos.cookbook:onetimeupload
 ip = $${slap-network-information:global-ipv6}
-port = 9999
+port = 8080
 image-path = $${rootdirectory:srv}/cdrom.iso
 log-path = $${rootdirectory:log}/onetimeupload.log
 shell-path = ${dash:location}/bin/dash
 onetimeupload-path = ${buildout:bin-directory}/onetimeupload
 path = $${basedirectory:services}/onetimeupload
+key = $${gen-passwd:passwd}
 
 [onetimeupload-promise]
 recipe = slapos.cookbook:check_port_listening

software/kvm/software.cfg

@@ -14,6 +14,7 @@ extends =
   ../../component/openssl/buildout.cfg
   ../../component/dash/buildout.cfg
   ../../component/lxml-python/buildout.cfg
+  ../../component/curl/buildout.cfg
   ../../stack/nodejs.cfg
 
 develop =
@@ -49,11 +50,8 @@ versions = versions
 
 [kvm]
 recipe = hexagonit.recipe.cmmi
-url = http://downloads.sourceforge.net/project/kvm/qemu-kvm/0.15.1/qemu-kvm-0.15.1.tar.gz
-# XXX-Cedric : Upgrade to 1.0
-# url = http://downloads.sourceforge.net/project/kvm/qemu-kvm/1.0/qemu-kvm-1.0.tar.gz
-# md5sum = 00a825db46a70ba8ef9fc95da9cc7c1e
-md5sum = 8800a7d6b3aa4a168ea7f78dc66c0320
+url = http://downloads.sourceforge.net/project/kvm/qemu-kvm/1.1.1/qemu-kvm-1.1.1.tar.gz
+md5sum = f8f5629b00f48192cc0467e1d31c4dd2
 configure-options =
   --disable-sdl
   --disable-xen
@@ -104,14 +102,14 @@ eggs =
 # https://github.com/nodejitsu/node-http-proxy
 recipe = slapos.recipe.build:download-unpacked
 #XXX-Cedric : use upstream when merged
-url = https://nodeload.github.com/desaintmartin/node-http-proxy/zipball/master
+url = https://nodeload.github.com/desaintmartin/node-http-proxy/zipball/20120621
 md5sum = 20204d0b29c2cef26e1c91e99eedca6b
 
 [proxy-by-url]
 # https://github.com/dominictarr/proxy-by-url
 recipe = slapos.recipe.build:download-unpacked
 #XXX-Cedric : use upstream when merged
-url = https://nodeload.github.com/desaintmartin/proxy-by-url/zipball/master
+url = https://nodeload.github.com/desaintmartin/proxy-by-url/zipball/20120621
 md5sum = c2609948aa708581f93b981b23880314
 
 [npm-modules]
@@ -132,28 +130,28 @@ command =
 [template-kvm]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-kvm.cfg
-md5sum = b6572c018e44d4676e76805116bcade0
+md5sum = 6aaa9b6ef059a2ed2f022834151086ab
 output = ${buildout:directory}/template-kvm.cfg
 mode = 0644
 
 [template-kvmplus]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-kvmplus.cfg
-md5sum = 2e35c5b2ac9ee51d8f98fb1199f011c4
+md5sum = 301fbe4eaaab5648e1a933a4c853f5b9
 output = ${buildout:directory}/template-kvmplus.cfg
 mode = 0644
 
 [template-nbd]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-nbd.cfg
-md5sum = 7691fadfc8d4392c58ac1bf0ebd5aaf2
+md5sum = c030e7be231aba25ee0f51703e60ce67
 output = ${buildout:directory}/template-nbd.cfg
 mode = 0644
 
 [template-frontend]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-frontend.cfg
-md5sum = 123bf4e5bea9e86c03b62e9afb8ca04b
+md5sum = 73359b52013b1b65f75005e8698ed180
 output = ${buildout:directory}/template-frontend.cfg
 mode = 0644
 
@@ -168,6 +166,7 @@ mode = 0644
 # signature certificates of the following uploaders.
 #   Romain Courteaud
 #   Cedric de Saint Martin
+#   Test Agent
 signature-certificate-list =
   -----BEGIN CERTIFICATE-----
   MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
@@ -195,95 +194,120 @@ signature-certificate-list =
   Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
   If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
   -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
+  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
+  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
+  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
+  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
+  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
+  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
+  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
+  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
+  -----END CERTIFICATE-----
+
 
 [versions]
 Jinja2 = 2.6
+Pygments = 1.5
 Werkzeug = 0.8.3
-apache-libcloud = 0.8.0
+apache-libcloud = 0.11.1
 async = 0.6.1
 buildout-versions = 1.7
+docutils = 0.9.1
 gitdb = 0.5.4
-hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3.3
+hexagonit.recipe.cmmi = 1.6
+ipython = 0.13
+lxml = 2.3.5
 meld3 = 0.6.8
 plone.recipe.command = 1.1
-pycrypto = 2.5
-slapos.cookbook = 0.41
-slapos.recipe.build = 0.7
-slapos.recipe.template = 2.2
-slapos.toolbox = 0.18
+pycrypto = 2.6
+slapos.cookbook = 0.60
+slapos.recipe.build = 0.10.2
+slapos.recipe.template = 2.4.1
+slapos.toolbox = 0.28
 smmap = 0.8.2
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.core==0.23
-# slapos.toolbox==0.18
-Flask = 0.8
+# slapos.core==0.27
+# slapos.toolbox==0.28
+Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.18
+# slapos.toolbox==0.28
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.cookbook==0.41
+# slapos.cookbook==0.60
 PyXML = 0.8.4
 
 # Required by:
-# slapos.toolbox==0.18
+# netaddr==0.7.7
+Sphinx = 1.1.3
+
+# Required by:
+# slapos.toolbox==0.28
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.18
-feedparser = 5.1.1
+# slapos.toolbox==0.28
+feedparser = 5.1.2
+
+# Required by:
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
-# slapos.cookbook==0.41
+# slapos.cookbook==0.60
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.cookbook==0.41
-netaddr = 0.7.6
+# slapos.cookbook==0.60
+netaddr = 0.7.7
 
 # Required by:
-# slapos.core==0.23
+# slapos.core==0.27
 netifaces = 0.8
 
 # Required by:
 # websockify==0.1-dev
-numpy = 1.6.1
+numpy = 1.6.2
 
 # Required by:
-# slapos.toolbox==0.18
-paramiko = 1.7.7.1
+# slapos.toolbox==0.28
+paramiko = 1.7.7.2
 
 # Required by:
-# slapos.toolbox==0.18
-psutil = 0.4.1
+# slapos.toolbox==0.28
+psutil = 0.6.0
 
 # Required by:
-# slapos.cookbook==0.41
-# slapos.core==0.23
-# slapos.toolbox==0.18
+# slapos.cookbook==0.60
+# slapos.core==0.27
+# slapos.toolbox==0.28
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.41
-# slapos.toolbox==0.18
-slapos.core = 0.23
+# slapos.cookbook==0.60
+# slapos.toolbox==0.28
+slapos.core = 0.27
 
 # Required by:
-# slapos.core==0.23
+# slapos.core==0.27
 supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.41
-# slapos.toolbox==0.18
+# slapos.cookbook==0.60
+# slapos.toolbox==0.28
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.41
+# slapos.cookbook==0.60
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.23
-zope.interface = 3.8.0
\ No newline at end of file
+# slapos.core==0.27
+zope.interface = 4.0.1

software/lamp-template-static/software.cfg

@@ -46,7 +46,7 @@ Jinja2 = 2.6
 Werkzeug = 0.8.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 meld3 = 0.6.8
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.2

software/lamp-template/instance.cfg

-[buildout]
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-
-parts = instance
-
-[instance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
-source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
-
-httpd_binary = ${apache:location}/bin/httpd
-mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
-mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld

software/lamp-template/software.cfg

 [buildout]
-versions = versions
-
-parts =
-  template
-  apache-php
-  mariadb
-  eggs
-  instance-recipe-egg
 
 extends =
-  ../../stack/lamp.cfg
+  ../../stack/lamp/buildout.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked
@@ -28,20 +20,3 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [application-configuration]
 location = Student shall put here relative path to application top level directory where configuration shall be created
-
-[instance-recipe]
-egg = slapos.cookbook
-module = lamp.simple
-
-[template]
-# Default template for the instance.
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-#md5sum = Student shall put md5 of instance.cfg here
-output = ${buildout:directory}/template.cfg
-mode = 0644
-
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-eggs = 
-  ${instance-recipe:egg}

software/lxc/instance-lxc.cfg

+[buildout]
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+parts =
+    publish
+    rootfs
+    uuid
+    lxc-conf
+    shellinabox
+    certificate-authority
+    ca-shellinabox
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+tmp = $${buildout:directory}/tmp
+srv = $${buildout:directory}/srv
+bin = $${buildout:directory}/bin
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+services = $${rootdirectory:etc}/run
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+shellinabox = $${rootdirectory:srv}/shellinabox/
+ca-dir = $${rootdirectory:srv}/ca/
+
+[cadirectory]
+recipe = slapos.cookbook:mkdirectory
+requests = $${directory:ca-dir}/requests/
+private = $${directory:ca-dir}/private/
+certs = $${directory:ca-dir}/certs/
+newcerts = $${directory:ca-dir}/newcerts/
+crl = $${directory:ca-dir}/crl/
+
+[cadirectory]
+recipe = slapos.cookbook:mkdirectory
+requests = $${directory:ca-dir}/requests/
+private = $${directory:ca-dir}/private/
+certs = $${directory:ca-dir}/certs/
+newcerts = $${directory:ca-dir}/newcerts/
+crl = $${directory:ca-dir}/crl/
+
+
+[rootfs]
+recipe = slapos.cookbook:downloader
+url = $${slap-parameter:rootfs}
+md5sum = $${slap-parameter:rootfs-md5sum}
+downloaded-file = $${rootdirectory:srv}/rootfs.img
+downloaded-file-complete = $${:downloaded-file}.complete
+binary = $${basedirectory:services}/rootfsdownload
+path = ${tar:location}/bin/:${gzip:location}/bin/:${bzip2:location}/bin/:${xz-utils:location}/bin/
+archive = true
+
+[lxc-conf]
+recipe = slapos.cookbook:template
+template = ${lxc-conf-in:location}/${lxc-conf-in:filename}
+output = $${rootdirectory:etc}/lxc.conf
+bridge = !!BRIDGE_NAME!!
+interface = lxc$${slap-network-information:network-interface}
+name = $${uuid:uuid}
+rootfs = $${rootfs:downloaded-file}
+requested = $${slap-connection:requested}
+
+[passwd]
+recipe = slapos.cookbook:pwgen
+file = $${buildout:directory}/.password
+pwgen-binary = ${pwgen:location}/bin/pwgen
+
+[shellinabox]
+recipe = slapos.cookbook:shellinabox
+ipv6 = $${slap-network-information:global-ipv6}
+port = 8080
+shell = ${lxc:location}/bin/lxc-console -n $${uuid:uuid}
+wrapper = $${rootdirectory:bin}/shellinaboxd_raw
+shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd
+password = $${passwd:password}
+directory = $${buildout:directory}/
+login-shell = $${rootdirectory:bin}/login
+certificate-directory = $${directory:shellinabox}
+cert-file = $${directory:shellinabox}/public.crt
+key-file = $${directory:shellinabox}/private.key
+
+[ca-shellinabox]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+executable = $${shellinabox:wrapper}
+wrapper = $${rootdirectory:bin}/shellinaboxd
+key-file = $${shellinabox:key-file}
+cert-file = $${shellinabox:cert-file}
+
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = ${openssl:location}/bin/openssl
+ca-dir = $${directory:ca-dir}
+requests-directory = $${cadirectory:requests}
+wrapper = $${basedirectory:services}/ca
+ca-private = $${cadirectory:private}
+ca-certs = $${cadirectory:certs}
+ca-newcerts = $${cadirectory:newcerts}
+ca-crl = $${cadirectory:crl}
+
+[ca-shellinabox]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+executable = $${shellinabox:wrapper}
+wrapper = $${rootdirectory:bin}/shellinaboxd
+key-file = $${shellinabox:key-file}
+cert-file = $${shellinabox:cert-file}
+
+[uuid]
+recipe = slapos.cookbook:uuid
+cache-file = $${buildout:directory}/.slapcontainername
+
+[publish]
+recipe = slapos.cookbook:publish
+url = https://[$${shellinabox:ipv6}]:$${shellinabox:port}/
+password = $${shellinabox:password}
+
+
+[slap-parameter]
+rootfs-md5sum =

software/erp5/instance.cfg → software/lxc/instance.cfg

-[instance]
-rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
-
 [buildout]
-
 parts = 
     switch-softwaretype
 
@@ -10,30 +6,9 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-[dynamic-template-tidstorage]
-recipe = slapos.cookbook:generate.erp5.tidstorage
-snippet-zeo = ${template-snippet-zeo:output}
-snippet-zope = ${template-snippet-zope:output}
-snippet-master = ${template-snippet-master:output}
-snippet-backend = ${template-snippet-backend:output}
-
-[dynamic-template-cloudooo]
-recipe = slapos.cookbook:generate.cloudooo
-template = ${template-cloudooo:output}
-snippet-fontconfig = ${template-snippet-fontconfig:output}
-
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype
-default = ${template-erp5-development:output}
-production = ${template-erp5-production:output}
-kumofs = ${template-kumofs:output}
-memcached = ${template-memcached:output}
-cloudooo = $${dynamic-template-cloudooo:output}
-zope = ${template-zope:output}
-mariadb = ${template-mariadb:output}
-sphinx = ${template-sphinx:output}
-tidstorage = $${dynamic-template-tidstorage:output}
-varnish = ${template-varnish:output}
+default = ${template-lxc:output}
 
 [slap-connection]
 # part to migrate to new - separated words

software/lxc/lxc.conf.in

+# %(requested)s
+
+lxc.utsname = %(name)s
+
+lxc.network.type = veth
+lxc.network.link = %(bridge)s
+lxc.network.veth.pair = %(interface)s
+lxc.network.name = eth0
+lxc.network.flags = up
+
+lxc.tty = 4
+lxc.pts = 1024
+
+lxc.cgroup.devices.deny = a
+lxc.cgroup.devices.allow = c 1:3 rwm
+lxc.cgroup.devices.allow = c 1:5 rwm
+lxc.cgroup.devices.allow = c 5:1 rwm
+lxc.cgroup.devices.allow = c 5:0 rwm
+lxc.cgroup.devices.allow = c 4:0 rwm
+lxc.cgroup.devices.allow = c 4:1 rwm
+lxc.cgroup.devices.allow = c 1:9 rwm
+lxc.cgroup.devices.allow = c 1:8 rwm
+lxc.cgroup.devices.allow = c 136:* rwm
+lxc.cgroup.devices.allow = c 5:2 rwm
+lxc.cgroup.devices.allow = c 254:0 rwm
+
+lxc.rootfs = %(rootfs)s
+
+lxc.cap.drop = sys_module sys_time sys_chroot mknod

software/lxc/rootfs.README

+This file explain how to easily generate a rootfs for slapcontainer,
+explaining how to generate a debian rootfs.
+
+This can be used in order to generate any rootfs.
+
+Requirements:
+=============
+
+  Any Linux distro with the following programs installed :
+
+    * LXC userland tools (for generating the rootfs)
+    * debootstrap (in order to use lxc-debian script)
+    * dpkg (a dependency of debootstrap)
+    * Qemu tools (providing qemu-img)
+
+Step by step instructions explained:
+====================================
+
+  First we need to generate a raw image.
+
+  1. Run ::
+    $ qemu-img create -f raw image-name.raw SIZE
+
+  2. Now format it (in this example we will format in in ext4) ::
+    $ mkfs.ext4 image-name.raw
+
+  We will used lxc-debian script provided in lxc tools in order to
+  generate the rootfs.
+
+  lxc-debian is run this way ::
+    lxc-debian -p /path/
+  
+  lxc-debian will create a subdirectory in /path/ named “rootfs”,
+  and a configuration file in /path/.
+
+  So in order to generate the rootfs on the raw image, create rootfs
+  directory and mount the raw img in it.
+
+  3. ::
+    $ mkdir -p /path/rootfs/
+    $ mount image-name.raw /path/rootfs
+
+  4. Next, run the lxc-debian script ::
+    $ lxc-debian -p /path/
+
+  Dont forget to change the default password, before unmount it.
+
+  5. ::
+    $ sudo chroot /path/rootfs/ /bin/passwd
+
+  6. ::
+    $ umount /path/rootfs
+
+  Next, you can archive it using sparse tar, and compress it.
+  7. ::
+    $ tar -Sc image-name.raw | pxz -T8 > image-name.tar.gz

software/lxc/software.cfg

+[buildout]
+
+extends =
+  ../../stack/slapos.cfg
+  ../../component/lxc/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../component/curl/buildout.cfg
+  ../../component/gzip/buildout.cfg
+  ../../component/bzip2/buildout.cfg
+  ../../component/xz-utils/buildout.cfg
+  ../../component/tar/buildout.cfg
+  ../../component/shellinabox/buildout.cfg
+  ../../component/pwgen/buildout.cfg
+
+find-links +=
+  http://www.nexedi.org/static/packages/source/slapos-lxc/
+
+parts =
+  lxml-python
+  template
+  template-lxc
+  lxc-conf-in
+  slapos-cookbook
+  slapos-toolbox
+  lxc
+  shellinabox
+  pwgen
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = c722ba58b06d3105f64fdeccbbd689bb
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[template-lxc]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-lxc.cfg
+md5sum = 27b9c3a9013beda84b336ea603e306bf
+output = ${buildout:directory}/template-lxc.cfg
+mode = 0644
+
+[lxc-conf-in]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = lxc.conf.in
+md5sum = e47acb30a9783d2f264b51b3c46262ae
+download-only = true
+
+[slapos-toolbox]
+recipe = zc.recipe.egg
+scripts = slapcontainer
+eggs =
+  slapos.toolbox
+
+[versions]
+slapos.cookbook = 0.63
+slapos.toolbox = 0.29.1

software/magento/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/magento/software.cfg

@@ -62,7 +62,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/mariadb/instance-mariadb.cfg

@@ -43,13 +43,13 @@ error-log = $${basedirectory:log}/mariadb_error.log
 slow-query-log = $${basedirectory:log}/mariadb_slowquery.log
 conf-file = $${rootdirectory:etc}/mariadb.cnf
 backup-pending-directory = $${directory:mariadb-backup-pending}
-dumpname = dump.sql.gz
 
 # Binary information
+mysql-base-directory = ${mariadb:location}
 mysql-binary = ${mariadb:location}/bin/mysql
-mysql-install-binary = ${mariadb:location}/bin/mysql_install_db
+mysql-install-binary = ${mariadb:location}/scripts/mysql_install_db
 mysql-upgrade-binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld-binary = ${mariadb:location}/libexec/mysqld
+mysqld-binary = ${mariadb:location}/bin/mysqld
 mysqldump-binary = ${mariadb:location}/bin/mysqldump
 gzip-binary = $${buildout:gzip-binary}
 zcat-binary = ${gzip:location}/bin/zcat

software/mariadb/software.cfg

@@ -86,7 +86,7 @@ mode = 0644
 [instance-mariadb]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
-md5sum = 737a6d2f1ea9938b8d76e2d35e18e482
+md5sum = 135ad8e59a45e053f3aaf75deb35c5b0
 output = ${buildout:directory}/template-mariadb.cfg
 mode = 0644
 
@@ -115,7 +115,7 @@ xml-marshaller = 0.9.7
 setuptools = 0.6c12dev-r88795
 
 hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 plone.recipe.command = 1.1
 
 # Use SlapOS patched zc.buildout

software/memcached/software.cfg

 [buildout]
-
-extensions =
-  slapos.zcbworkarounds
-  slapos.rebootstrap
-
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-
 extends =
   ../../component/memcached/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/stunnel/buildout.cfg
   ../../component/rdiff-backup/buildout.cfg
   ../../component/lxml-python/buildout.cfg
-  ../../stack/shacache-client.cfg
-
-# Use only quite well working sites.
-allow-hosts =
-  *.nexedi.org
-  *.python.org
-  *.sourceforge.net
-  dist.repoze.org
-  effbot.org
-  github.com
-  peak.telecommunity.com
-  psutil.googlecode.com
-  www.dabeaz.com
-
-versions = versions
+  ../../stack/slapos.cfg
 
 parts =
 # Create instance template
-#TODO : list here all parts.
   template
-  libxslt
   eggs
   instance-recipe-egg
 
-# XXX: Workaround of SlapOS limitation
-# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
-# development / fast switching environment for whole software
-unzip = true
-
-[rebootstrap]
-# Default first version of rebootstrapped python
-version = 2
-section = python2.7
-
 [instance-recipe]
 egg = slapos.cookbook
 module = memcached
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [eggs]
 recipe = zc.recipe.egg
-python = python2.7
 eggs =
   ${lxml-python:egg}
 
@@ -82,8 +45,58 @@ xml-marshaller = 0.9.7
 setuptools = 0.6c12dev-r88795
 
 hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 plone.recipe.command = 1.1
 
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-009
+Jinja2 = 2.6
+Werkzeug = 0.8.3
+buildout-versions = 1.7
+meld3 = 0.6.8
+slapos.recipe.template = 2.3
+
+# Required by:
+# slapos.core==0.2
+Flask = 0.8
+
+# Required by:
+# slapos.cookbook==0.7
+PyXML = 0.8.4
+
+# Required by:
+# slapos.cookbook==0.7
+# slapos.core==0.2
+# xml-marshaller==0.9.7
+lxml = 2.3.4
+
+# Required by:
+# slapos.core==0.2
+netifaces = 0.8
+
+# Required by:
+# slapos.core==0.2
+supervisor = 3.0a12
+
+# Required by:
+# slapos.cookbook==0.7
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.2
+zope.interface = 3.8.0
+
+[networkcache]
+# Cedric de Saint Martin signature certificate
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----

software/mysql-5.1/software.cfg

@@ -77,7 +77,7 @@ Jinja2 = 2.6
 Werkzeug = 0.8.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 meld3 = 0.6.8
 rdiff-backup = 1.0.5
 slapos.recipe.template = 2.2

software/net2ftp/instance.cfg

@@ -12,10 +12,11 @@ configuration = ${application-configuration:location}
 lampconfigure_directory = ${buildout:bin-directory}/lampconfigure
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
 
 #delete = 
 #rename = 

software/net2ftp/software.cfg

@@ -87,7 +87,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/nosqltestbed/software.cfg

@@ -38,8 +38,8 @@ command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
 recipe = plone.recipe.command
 stop-on-error = true
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = ${git:location}/bin/git clone -b nosqltestbed --quiet http://git.erp5.org/repos/slapos.git ${:location}
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
+command = "${git:location}/bin/git" clone -b nosqltestbed --quiet http://git.erp5.org/repos/slapos.git "${:location}"
+update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && "${git:location}/bin/git" reset --hard @{upstream}
 
 [eggs]
 dummy = ${slapos.cookbook:location}

software/openX/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/openX/software.cfg

@@ -63,7 +63,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/os-commerce/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/os-commerce/software.cfg

@@ -64,7 +64,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/phpbb/instance.cfg

@@ -10,10 +10,11 @@ source = ${application:location}
 lampconfigure_directory = ${buildout:bin-directory}/lampconfigure
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
 
 delete = install
 #rename = 

software/phpbb/software.cfg

@@ -66,7 +66,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/phpmyadmin/instance.cfg

@@ -11,7 +11,8 @@ template = ${application-template:location}/${application-template:filename}
 configuration = ${application-configuration:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/phpmyadmin/software.cfg

@@ -16,7 +16,7 @@ extends =
 # Default template for the instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = efdb8509f40c86b1b73924fc1ce92f13
+md5sum = a4e057ae406becc616a257931e321a88
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -74,7 +74,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/phpnuke/instance.cfg

@@ -11,7 +11,8 @@ template = ${application-template:location}/${application-template:filename}
 configuration = ${application-configuration:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/phpnuke/software.cfg

@@ -75,7 +75,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/pimcore/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/pimcore/software.cfg

@@ -63,7 +63,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/piwigo/instance.cfg

@@ -11,7 +11,8 @@ template = ${application-template:location}/${application-template:filename}
 configuration = ${application-configuration:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/piwigo/software.cfg

@@ -75,7 +75,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/piwik/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/piwik/software.cfg

@@ -65,7 +65,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/prestashop/instance.cfg

@@ -10,10 +10,11 @@ source = ${application:location}
 lampconfigure_directory = ${buildout:bin-directory}/lampconfigure
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
 
 delete = install
 rename = admin

software/prestashop/software.cfg

@@ -66,7 +66,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/pulse/software.cfg

@@ -98,8 +98,8 @@ git_param =--quiet -b pulse
 git = ${git:location}/bin/git
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 stop-on-error = true
-command = ${:git} clone ${:git_param} http://git.erp5.org/repos/slapos.git ${:location} || exit 1;
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
+command = "${:git}" clone ${:git_param} http://git.erp5.org/repos/slapos.git "${:location}" || exit 1;
+update-command = cd "${:location}" && "${:git}" fetch --quiet && "${:git}" reset --hard @{upstream}
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
@@ -138,7 +138,7 @@ xml-marshaller = 0.9.7
 setuptools = 0.6c12dev-r88795
 
 hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 plone.recipe.command = 1.1
 
 # Use SlapOS patched zc.buildout

software/punbb/instance.cfg

@@ -11,7 +11,8 @@ template = ${application-template:location}/${application-template:filename}
 configuration = ${application-configuration:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/punbb/software.cfg

@@ -74,7 +74,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/seleniumrunner/instance-selenium.cfg

+[buildout]
+parts =
+  selenium-instance
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory} 
+offline = true
+
+[selenium-instance]
+recipe = slapos.cookbook:seleniumrunner
+runner-path = $${basedirectory:services}/selenium-runner
+browser = $${firefox-instance:runner-path}
+suite-url = $${slap-parameter:suite-url}
+report-url = $${slap-parameter:report-url}
+report-project = $${slap-parameter:report-project}
+
+[firefox-instance]
+recipe = slapos.cookbook:firefox
+runner-path = $${rootdirectory:bin}/firefox-sandboxed
+firefox-path = ${firefox:location}/firefox-slapos
+prefsjs-path = $${rootdirectory:etc}/prefs.js
+shell-path = ${dash:location}/bin/dash
+tmp-path = $${xvfb-instance:tmp-path}
+
+[xvfb-instance]
+recipe = slapos.cookbook:xvfb
+runner-path = $${basedirectory:services}/xvfb
+xvfb-path = ${xserver:location}/bin/Xvfb
+fbdir-path = $${basedirectory:framebuffer}
+tmp-path = $${basedirectory:run}
+shell-path = ${dash:location}/bin/dash
+
+xwd-path = ${xwd:location}/bin/xwd
+xwd-hook-path = $${rootdirectory:bin}/xwd
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+var = $${buildout:directory}/var
+srv = $${buildout:directory}/srv
+bin = $${buildout:directory}/bin
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+services = $${rootdirectory:etc}/run
+run = $${rootdirectory:var}/run
+framebuffer = $${rootdirectory:srv}/framebuffer

software/seleniumrunner/instance.cfg

 [buildout]
 parts =
-  seleniuminstance
+  switch-softwaretype
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
 
-[seleniuminstance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
-xvfb_binary = ${xserver:location}/bin/Xvfb
-firefox_binary = ${firefox:location}/firefox-slapos
\ No newline at end of file
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${template-selenium:output}
+
+[slap-connection]
+# part to migrate to new - separated words
+computer-id = $${slap_connection:computer_id}
+partition-id = $${slap_connection:partition_id}
+server-url = $${slap_connection:server_url}
+software-release-url = $${slap_connection:software_release_url}
+key-file = $${slap_connection:key_file}
+cert-file = $${slap_connection:cert_file}

software/seleniumrunner/software.cfg

@@ -6,8 +6,11 @@ extends =
    ../../component/lxml-python/buildout.cfg
    ../../component/python-2.7/buildout.cfg
    ../../component/firefox/buildout.cfg
+   ../../component/dash/buildout.cfg
    ../../stack/shacache-client.cfg
 
+# develop += /opt/slapdev
+
 versions = versions
 
 find-links +=
@@ -19,6 +22,7 @@ parts =
    instance-recipe-egg
    xserver
    firefox
+   xwd
 
 versions = versions
 
@@ -43,10 +47,101 @@ eggs =
 # Default template for the instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 5fc198144831525a196d7394e4b15f80
+md5sum = c4ac5de141ae6a64848309af03e51d88
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
+[template-selenium]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-selenium.cfg
+md5sum = 8be91f4515decef0f8af5910e43e0e52
+output = ${buildout:directory}/template-selenium.cfg
+mode = 0644
+
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
+zc.buildout = 1.6.0-dev-SlapOS-004
+
+Jinja2 = 2.6
+Werkzeug = 0.8.3
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.8
+slapos.cookbook = 0.46
+slapos.recipe.build = 0.7
+slapos.recipe.template = 2.2
+
+# Required by:
+# slapos.core==0.23
+Flask = 0.8
+
+# Required by:
+# slapos.cookbook==0.42
+PyXML = 0.8.4
+
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.1
+
+# Required by:
+# slapos.cookbook==0.42
+inotifyx = 0.2.0
+
+# Required by:
+# slapos.cookbook==0.42
+# slapos.core==0.23
+# xml-marshaller==0.9.7
+lxml = 2.3.4
+
+# Required by:
+# slapos.cookbook==0.42
+netaddr = 0.7.6
+
+# Required by:
+# slapos.core==0.23
+netifaces = 0.8
+
+# Required by:
+# slapos.cookbook==0.42
+# slapos.core==0.23
+# zc.buildout==1.5.3-dev-SlapOS-010
+# zc.recipe.egg==1.3.2
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.42
+slapos.core = 0.23
+
+# Required by:
+# slapos.core==0.23
+supervisor = 3.0a12
+
+# Required by:
+# slapos.cookbook==0.42
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.cookbook==0.42
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.23
+zope.interface = 3.8.0
+
+[networkcache]
+# signature certificates of the following uploaders.
+#   Romain Courteaud
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
+  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
+  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
+  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
+  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
+  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
+  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
+  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
+  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
+  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
+  QUUGLQ==
+  -----END CERTIFICATE-----

software/simpleMachineForum/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/simpleMachineForum/software.cfg

@@ -64,7 +64,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/slaprunner/README.txt

+kvm
+===
+
+Introduction
+------------
+
+This software release is used to deploy Slaprunner instances.
+Slaprunner is an all-in-one IDE used to develop and test profiles and recipes for SlapOS.
+
+Parameters
+----------
+
+authorized-key
+~~~~~~~~~~~~~~
+
+You need to specify your SSH public key in order to connect to the SSH server of this instance.
+
+Example of parameter XML::
+
+  <?xml version="1.0" encoding="utf-8"?>
+  <instance>
+  <parameter id="authorized-key">ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdNp7qZMVAzNc07opHshiIFDmJpYXQpetfcSgUj39a409d42PpsJElp7WsAE/x0nN6gUIoWIl7UiAlMzf6bKEJGJVSOZEPTmiJVlgK1Gp+kE0x9yNcncYg7p38Jny0daVA/NkkpAFyRsAm5kLGzyLtaCcktSvy0cJuy7WSSHU05pd1f8Y8thofE9g5t+/JA2VZvipxPkRfkFAG3aOAGLULlTImTSDFSDFGSDFG5F6mMnl7yvY2d6vEHVBu+K+aKmAwZVfCUwtSpa/tq3i2Lppjrw3UfrxbQSFHZCkzefr+u+l4YYe+tJrX7rYJYXD7LIfZfdSeFTlHFaN/yI1 user@host.local</parameter>
+  </instance>

software/slaprunner/instance-runner.cfg

+[buildout]
+parts =
+  cloud9
+  slaprunner
+  sshkeys-dropbear
+  dropbear-server-add-authorized-key
+  sshkeys-authority
+  publish-connection-informations
+  frontend-promise
+
+  
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+
+# Create all needed directories
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+var = $${buildout:directory}/var/
+srv = $${buildout:directory}/srv/
+bin = $${buildout:directory}/bin/
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+sshkeys = $${rootdirectory:srv}/sshkeys
+services = $${rootdirectory:etc}/run/
+ssh = $${rootdirectory:etc}/ssh/
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = $${rootdirectory:var}/log/
+services = $${rootdirectory:etc}/run/
+run = $${rootdirectory:var}/run/
+backup = $${rootdirectory:srv}/backup/
+promises = $${rootdirectory:etc}/promise/
+
+[runnerdirectory]
+recipe = slapos.cookbook:mkdirectory
+home = $${rootdirectory:srv}/runner/
+project = $${:home}/project
+software-root = $${:home}/software
+instance-root = $${:home}/instance
+
+#Create password recovery code for slaprunner
+[recovery-code]
+recipe = slapos.cookbook:generate.password
+storage-path = $${rootdirectory:etc}/.rcode
+bytes = 4
+
+# Deploy cloud9 and slaprunner
+[cloud9]
+recipe = slapos.cookbook:cloud9
+ip = $${slap-network-information:global-ipv6}
+port = 30000
+wrapper = $${basedirectory:services}/cloud9
+working-directory = $${runnerdirectory:home}
+git-binary = ${git:location}/bin/git
+node-binary = ${nodejs-0.4:location}/bin/node
+cloud9 = ${cloud9-stable:location}/bin/cloud9.js
+
+[slaprunner]
+recipe = slapos.cookbook:slaprunner
+slaprunner = ${buildout:directory}/bin/slaprunner
+slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
+slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
+slapproxy = ${buildout:directory}/bin/slapproxy
+supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl
+git-binary = ${git:location}/bin/git
+slapos.cfg = $${rootdirectory:etc}/slapos.cfg
+working-directory = $${runnerdirectory:home}
+project-directory = $${runnerdirectory:project}
+software-directory = $${runnerdirectory:software-root}
+instance-directory = $${runnerdirectory:instance-root}
+etc_dir = $${rootdirectory:etc}
+log_dir =  $${basedirectory:log}
+ssh_client = $${sshkeys-dropbear:wrapper}
+public_key = $${sshkeys-dropbear:public-key}
+private_key = $${sshkeys-dropbear:private-key}
+ipv4 = $${slap-network-information:local-ipv4}
+ipv6 = $${slap-network-information:global-ipv6}
+proxy_port = 50000
+runner_port = 50000
+partition-amount = 7
+cloud9-url = $${cloud9:access-url}
+wrapper = $${basedirectory:services}/slaprunner
+
+# Deploy dropbear (minimalist ssh server)
+[sshkeys-directory]
+recipe = slapos.cookbook:mkdirectory
+requests = $${directory:sshkeys}/requests/
+keys = $${directory:sshkeys}/keys/
+
+[sshkeys-authority]
+recipe = slapos.cookbook:sshkeys_authority
+request-directory = $${sshkeys-directory:requests}
+keys-directory = $${sshkeys-directory:keys}
+wrapper = $${basedirectory:services}/sshkeys_authority
+keygen-binary = ${dropbear:location}/bin/dropbearkey
+
+[dropbear-server]
+recipe = slapos.cookbook:dropbear
+host = $${slap-network-information:global-ipv6}
+port = 2222
+home = $${directory:ssh}
+wrapper = $${rootdirectory:bin}/raw_sshd
+shell = /bin/bash
+rsa-keyfile = $${directory:ssh}/server_key.rsa
+dropbear-binary = ${dropbear:location}/sbin/dropbear
+
+[sshkeys-dropbear]
+<= sshkeys-authority
+recipe = slapos.cookbook:sshkeys_authority.request
+name = dropbear
+type = rsa
+executable = $${dropbear-server:wrapper}
+public-key = $${dropbear-server:rsa-keyfile}.pub
+private-key = $${dropbear-server:rsa-keyfile}
+wrapper = $${basedirectory:services}/sshd
+
+[dropbear-server-add-authorized-key]
+<= dropbear-server
+recipe = slapos.cookbook:dropbear.add_authorized_key
+key = $${slap-parameter:authorized-key}
+
+
+# Request frontend
+[request-frontend]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = Frontend
+# 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
+config-url = $${slaprunner:access-url}
+return = site_url
+
+
+# Send informations to SlapOS Master
+[publish-connection-informations]
+recipe = slapos.cookbook:publish
+backend_url = $${slaprunner:access-url}
+url =  $${request-frontend:connection-site_url}
+cloud9_url = $${cloud9:access-url}
+ssh_command = ssh $${dropbear-server:host} -p $${dropbear-server:port}
+password_recovery_code = $${recovery-code:passwd}
+
+[slap-parameter]
+# Default value if no ssh key is specified
+authorized-key =
+
+
+
+# Deploy promises scripts
+#[promise]
+#recipe = slapos.cookbook:check_port_listening
+#path = $${basedirectory:promises}/apache
+#hostname = $${apache-php:ip}
+#port = $${apache-php:port}
+
+[frontend-promise]
+recipe = slapos.cookbook:check_url_available
+path = $${basedirectory:promises}/frontend
+url = $${request-frontend:connection-site_url}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+

software/slaprunner/instance.cfg

 [buildout]
 parts =
-  instance
-  sshkeys-authority
-  sshkeys-dropbear
-  dropbear-client
+  switch_softwaretype
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
 
-[instance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
-slaprunner = ${buildout:directory}/bin/slaprunner
-slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
-slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
-slapproxy = ${buildout:directory}/bin/slapproxy
-supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl
-git = ${git:location}/bin/git
-node-bin = ${nodejs-0.4:location}/bin/node
-cloud9 = ${cloud9:location}/bin/cloud9.js
-ssh_client = $${sshkeys-dropbear:wrapper}
-public_key = $${sshkeys-dropbear:public-key}
-private_key = $${sshkeys-dropbear:private-key}
-
-
-[sshkeys-directory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:sshkeys}/requests/
-keys = $${directory:sshkeys}/keys/
-
-[sshkeys-authority]
-recipe = slapos.cookbook:sshkeys_authority
-request-directory = $${sshkeys-directory:requests}
-keys-directory = $${sshkeys-directory:keys}
-wrapper = $${directory:services}/sshkeys_authority
-keygen-binary = ${dropbear:location}/bin/dropbearkey
-
-[sshkeys-dropbear]
-<= sshkeys-authority
-recipe = slapos.cookbook:sshkeys_authority.request
-name = dropbear
-type = rsa
-executable = $${dropbear-client:wrapper}
-public-key = $${dropbear-client:identity-file}.pub
-private-key = $${dropbear-client:identity-file}
-wrapper = $${rootdirectory:bin}/dbclient
-
-[dropbear-client]
-recipe = slapos.cookbook:dropbear.client
-dbclient-binary = ${dropbear:location}/bin/dbclient
-identity-file = $${directory:ssh}/id_rsa
-wrapper = $${rootdirectory:bin}/dbclient_raw
-home = $${rootdirectory:etc}/ssh/
-force-host-key = True
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc/
-var = $${buildout:directory}/var/
-srv = $${buildout:directory}/srv/
-bin = $${buildout:directory}/bin/
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-sshkeys = $${rootdirectory:srv}/sshkeys
-services = $${rootdirectory:etc}/run/
-ssh = $${rootdirectory:etc}/ssh/
\ No newline at end of file
+[switch_softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${template-runner:output}
\ No newline at end of file

software/slaprunner/software.cfg

 [buildout]
 
-extensions =
-  buildout-versions
-
 extends =
   ../../stack/slapos.cfg
   ../../stack/flask.cfg
@@ -10,35 +7,32 @@ extends =
   ../../component/dropbear/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/cloud9/buildout.cfg
+  ../../component/dash/buildout.cfg
 
 parts =
   template
+  slapos-cookbook
   eggs
-  instance-recipe-egg
-  dropbear
-
-versions = versions
-
-[instance-recipe]
-egg = slapos.cookbook
-module = slaprunner
-
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-python = python2.7
-eggs = ${instance-recipe:egg}
 
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
-md5sum = 7cfd248cdc6fa6cbb4957d25a0aed884
+md5sum = 5307e4200f044ae57b504ad68444491c
+
+[template-runner]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-runner.cfg
+output = ${buildout:directory}/template-runner.cfg
+md5sum = 82bf13fafa017245e853afad20ea3704
+mode = 0644
 
 [eggs]
-eggs +=
+recipe = z3c.recipe.scripts
+eggs =
   slapos.libnetworkcache
-  slapos.toolbox
+  slapos.toolbox[flask_auth]
   slapos.core
 
 [networkcache]
@@ -60,98 +54,109 @@ signature-certificate-list =
   -----END CERTIFICATE-----
 
 [versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-003
-
+Flask-Auth = 0.8
 Jinja2 = 2.6
+Pygments = 1.5
 Werkzeug = 0.8.3
-apache-libcloud = 0.8.0
+apache-libcloud = 0.11.1
 async = 0.6.1
 buildout-versions = 1.7
+docutils = 0.9.1
 gitdb = 0.5.4
-hexagonit.recipe.cmmi = 1.5.0
+hexagonit.recipe.cmmi = 1.6
+ipython = 0.13
 meld3 = 0.6.8
 plone.recipe.command = 1.1
-pycrypto = 2.5
-slapos.cookbook = 0.45
+pycrypto = 2.6
+slapos.cookbook = 0.61
 slapos.libnetworkcache = 0.12
-slapos.recipe.template = 2.3
-slapos.toolbox = 0.20
+slapos.recipe.template = 2.4.1
+slapos.toolbox = 0.28.2
 smmap = 0.8.2
+z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.core==0.24
-Flask = 0.8
+# slapos.core==0.28.2
+# slapos.toolbox==0.28.2
+Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.20
+# slapos.toolbox==0.28.2
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.cookbook==0.45
+# slapos.cookbook==0.61
 PyXML = 0.8.4
 
 # Required by:
-# slapos.toolbox==0.20
+# netaddr==0.7.7
+Sphinx = 1.1.3
+
+# Required by:
+# slapos.toolbox==0.28.2
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.20
-feedparser = 5.1.1
+# slapos.toolbox==0.28.2
+feedparser = 5.1.2
+
+# Required by:
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
-# slapos.cookbook==0.45
+# slapos.cookbook==0.61
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.cookbook==0.45
-# slapos.core==0.24
+# slapos.core==0.28.2
+# slapos.toolbox==0.28.2
 # xml-marshaller==0.9.7
-lxml = 2.3.4
+lxml = 2.3.5
 
 # Required by:
-# slapos.cookbook==0.45
-netaddr = 0.7.6
+# slapos.cookbook==0.61
+netaddr = 0.7.7
 
 # Required by:
-# slapos.core==0.24
+# slapos.core==0.28.2
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.20
-paramiko = 1.7.7.1
+# slapos.toolbox==0.28.2
+paramiko = 1.7.7.2
 
 # Required by:
-# slapos.toolbox==0.20
-psutil = 0.4.1
+# slapos.toolbox==0.28.2
+psutil = 0.6.1
 
 # Required by:
-# slapos.cookbook==0.45
-# slapos.core==0.24
+# slapos.cookbook==0.61
+# slapos.core==0.28.2
 # slapos.libnetworkcache==0.12
-# slapos.toolbox==0.20
+# slapos.toolbox==0.28.2
 # supervisor==3.0a12
-# zc.buildout==1.6.0-dev-SlapOS-003
+# zc.buildout==1.6.0-dev-SlapOS-006
 # zc.recipe.egg==1.3.2
-# zope.interface==3.8.0
+# zope.interface==4.0.1
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.45
-slapos.core = 0.24
+# slapos.cookbook==0.61
+slapos.core = 0.28.2
 
 # Required by:
-# slapos.core==0.24
+# slapos.core==0.28.2
 supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.45
+# slapos.cookbook==0.61
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.45
+# slapos.cookbook==0.61
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.24
-zope.interface = 3.8.0
\ No newline at end of file
+# slapos.core==0.28.2
+zope.interface = 4.0.1

software/spip/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/spip/software.cfg

@@ -63,7 +63,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/statusnet/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/statusnet/software.cfg

@@ -63,7 +63,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/sugar-crm/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/sugar-crm/software.cfg

@@ -63,7 +63,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/tesseract/software.cfg

+# A simple software release to test if tesseract building works
+[buildout]
+extends =
+  ../../stack/slapos.cfg
+  ../../component/tesseract/buildout.cfg
\ No newline at end of file

software/testnode/software.cfg

@@ -34,8 +34,8 @@ command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
 recipe = plone.recipe.command
 stop-on-error = true
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = ${git:location}/bin/git clone -b testnode --quiet http://git.erp5.org/repos/slapos.git ${:location}
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
+command = "${git:location}/bin/git" clone -b testnode --quiet http://git.erp5.org/repos/slapos.git "${:location}"
+update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && "${git:location}/bin/git" reset --hard @{upstream}
 
 [template]
 recipe = slapos.recipe.template

software/tiki/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/tiki/software.cfg

@@ -63,7 +63,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/vifib/software.cfg

@@ -50,3 +50,7 @@ list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${vifib:loca
 # list of products, possible to extend, it is passed in reversed way
 # to allow overriding during extending profile
 list = ${products-deps:location} ${erp5:location}/product ${vifib:location}/master/product
+
+[versions]
+suds = 0.4
+slapos.core =

software/wordpress/software.cfg

@@ -13,7 +13,7 @@ url = http://wordpress.org/latest.tar.gz
 [application-template]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/wp-config.php.in
-md5sum = ${application-configuration:md5sum}
+md5sum = 0d62b28125ca3c780db0b547199953f2
 download-only = True
 filename = template.in
 mode = 0644
@@ -21,8 +21,3 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [application-configuration]
 location = wp-config.php
-md5sum = 3859841a4ad6ed23744d6bc5a01321e0
-  
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-003

software/wordpress/wp-config.php.in

@@ -88,3 +88,5 @@ if ( !defined('ABSPATH') )
 
 /** Sets up WordPress vars and included files. */
 require_once(ABSPATH . 'wp-settings.php');
+
+remove_action( 'template_redirect', 'redirect_canonical' );
\ No newline at end of file

software/xoops/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/xoops/software.cfg

@@ -64,7 +64,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

software/xwiki/software.cfg

@@ -40,7 +40,7 @@ xml-marshaller = 0.9.7
 setuptools = 0.6c12dev-r88846
 
 hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 plone.recipe.command = 1.1
 
 # Use SlapOS patched zc.buildout

software/zabbix-agent/software.cfg

 [buildout]
+
 extends =
   ../../component/dcron/buildout.cfg
   ../../component/logrotate/buildout.cfg
   ../../component/zabbix/buildout.cfg
-  ../../component/lxml-python/buildout.cfg
-
-find-links = http://www.nexedi.org/static/packages/source/slapos.buildout/
-
-versions = versions
+  ../../stack/slapos.cfg
 
 parts =
-  eggs
+  slapos-cookbook
   template
 
-# Use only quite well working sites.
-allow-hosts =
-  *.nexedi.org
-  *.python.org
-  *.sourceforge.net
-
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-  ${lxml-python:egg}
-  slapos.cookbook
-
 [template]
 # Default template for the instance.
 recipe = slapos.recipe.template
@@ -33,493 +18,93 @@ md5sum = 98a680fe8fddce5dcee455e65c228fde
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-[versions]
-zc.buildout = 1.5.3-dev-SlapOS-001
-Jinja2 = 2.5.5
-Werkzeug = 0.6.2
-buildout-versions = 1.6
-hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3
-meld3 = 0.6.7
-slapos.recipe.template = 1.1
-
-# Required by:
-# slapos.core==0.2
-Flask = 0.6.1
-
-# Required by:
-# slapos.cookbook==0.4
-PyXML = 0.8.4
-
-# Required by:
-# slapos.recipe.template==1.1
-collective.recipe.template = 1.8
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# Required by:
-# slapos.cookbook==0.4
-# slapos.core==0.2
-netaddr = 0.7.5
-
-# Required by:
-# slapos.core==0.2
-netifaces = 0.5
-
-# Required by:
-# slapos.cookbook==0.4
-# slapos.core==0.2
-# zc.buildout==1.5.3-dev-SlapOS-001
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
-
-# Required by:
-# slapos.cookbook==0.4
-slapos.core = 0.2
-
-# Required by:
-# slapos.core==0.2
-supervisor = 3.0a10
-
-# Required by:
-# slapos.cookbook==0.4
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.4
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.2
-zope.interface = 3.6.3
-
-# Added by Buildout Versions at 2011-06-13 10:01:36.219846
-Jinja2 = 2.5.5
-Werkzeug = 0.6.2
-buildout-versions = 1.6
-hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3
-meld3 = 0.6.7
-slapos.recipe.template = 1.1
-
-# Required by:
-# slapos.core==0.2
-Flask = 0.6.1
-
-# Required by:
-# slapos.cookbook==0.4
-PyXML = 0.8.4
-
-# Required by:
-# slapos.recipe.template==1.1
-collective.recipe.template = 1.8
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# Required by:
-# slapos.cookbook==0.4
-# slapos.core==0.2
-netaddr = 0.7.5
-
-# Required by:
-# slapos.core==0.2
-netifaces = 0.5
-
-# Required by:
-# slapos.cookbook==0.4
-# slapos.core==0.2
-# zc.buildout==1.5.3-dev-SlapOS-001
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
+[networkcache]
+# signature certificates of the following uploaders.
+#   Cedric de Saint Martin
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----
 
-# Required by:
-# slapos.cookbook==0.4
-slapos.core = 0.2
-
-# Required by:
-# slapos.core==0.2
-supervisor = 3.0a10
-
-# Required by:
-# slapos.cookbook==0.4
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.4
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.2
-zope.interface = 3.6.3
-
-# Added by Buildout Versions at 2011-06-13 10:15:31.979623
-Jinja2 = 2.5.5
-Werkzeug = 0.6.2
-buildout-versions = 1.6
-hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3
-meld3 = 0.6.7
-slapos.recipe.template = 1.1
-
-# Required by:
-# slapos.core==0.2
-Flask = 0.6.1
-
-# Required by:
-# slapos.cookbook==0.4
-PyXML = 0.8.4
-
-# Required by:
-# slapos.recipe.template==1.1
-collective.recipe.template = 1.8
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# Required by:
-# slapos.cookbook==0.4
-# slapos.core==0.2
-netaddr = 0.7.3
-
-# Required by:
-# slapos.core==0.2
-netifaces = 0.5
-
-# Required by:
-# slapos.cookbook==0.4
-# slapos.core==0.2
-# zc.buildout==1.5.3-dev-SlapOS-001
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c11
-
-# Required by:
-# slapos.cookbook==0.4
-slapos.core = 0.2
-
-# Required by:
-# slapos.core==0.2
-supervisor = 3.0a10
-
-# Required by:
-# slapos.cookbook==0.4
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.4
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.2
-zope.interface = 3.6.3
-
-# Added by Buildout Versions at 2011-06-13 10:16:55.921352
-Jinja2 = 2.5.5
-Werkzeug = 0.6.2
-buildout-versions = 1.6
-hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3
-meld3 = 0.6.7
-slapos.recipe.template = 1.1
-
-# Required by:
-# slapos.core==0.2
-Flask = 0.6.1
-
-# Required by:
-# slapos.cookbook==0.4
-PyXML = 0.8.4
-
-# Required by:
-# slapos.recipe.template==1.1
-collective.recipe.template = 1.8
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# Required by:
-# slapos.cookbook==0.4
-# slapos.core==0.2
-netaddr = 0.7.3
-
-# Required by:
-# slapos.core==0.2
-netifaces = 0.5
-
-# Required by:
-# slapos.cookbook==0.4
-# slapos.core==0.2
-# zc.buildout==1.5.3-dev-SlapOS-001
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c11
-
-# Required by:
-# slapos.cookbook==0.4
-slapos.core = 0.2
-
-# Required by:
-# slapos.core==0.2
-supervisor = 3.0a10
-
-# Required by:
-# slapos.cookbook==0.4
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.4
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.2
-zope.interface = 3.6.3
-
-# Added by Buildout Versions at 2011-06-13 10:17:42.100375
-Jinja2 = 2.5.5
-Werkzeug = 0.6.2
-buildout-versions = 1.6
-hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3
-meld3 = 0.6.7
-slapos.recipe.template = 1.1
-
-# Required by:
-# slapos.core==0.2
-Flask = 0.6.1
-
-# Required by:
-# slapos.cookbook==0.4
-PyXML = 0.8.4
-
-# Required by:
-# slapos.recipe.template==1.1
-collective.recipe.template = 1.8
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# Required by:
-# slapos.cookbook==0.4
-# slapos.core==0.2
-netaddr = 0.7.3
-
-# Required by:
-# slapos.core==0.2
-netifaces = 0.5
-
-# Required by:
-# slapos.cookbook==0.4
-# slapos.core==0.2
-# zc.buildout==1.5.3-dev-SlapOS-001
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c11
-
-# Required by:
-# slapos.cookbook==0.4
-slapos.core = 0.2
-
-# Required by:
-# slapos.core==0.2
-supervisor = 3.0a10
-
-# Required by:
-# slapos.cookbook==0.4
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.4
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.2
-zope.interface = 3.6.3
-
-# Added by Buildout Versions at 2011-06-13 10:19:50.709164
-Jinja2 = 2.5.5
-Werkzeug = 0.6.2
-buildout-versions = 1.6
-hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3
-meld3 = 0.6.7
-slapos.recipe.template = 1.1
-
-# Required by:
-# slapos.core==0.2
-Flask = 0.6.1
-
-# Required by:
-# slapos.cookbook==0.4
-PyXML = 0.8.4
-
-# Required by:
-# slapos.recipe.template==1.1
-collective.recipe.template = 1.8
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# Required by:
-# slapos.cookbook==0.4
-# slapos.core==0.2
-netaddr = 0.7.3
-
-# Required by:
-# slapos.core==0.2
-netifaces = 0.5
-
-# Required by:
-# slapos.cookbook==0.4
-# slapos.core==0.2
-# zc.buildout==1.5.3-dev-SlapOS-001
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c11
-
-# Required by:
-# slapos.cookbook==0.4
-slapos.core = 0.2
-
-# Required by:
-# slapos.core==0.2
-supervisor = 3.0a10
-
-# Required by:
-# slapos.cookbook==0.4
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.4
-zc.recipe.egg = 1.3.2
+[versions]
+Jinja2 = 2.6
+Pygments = 1.5
+Werkzeug = 0.8.3
+buildout-versions = 1.7
+docutils = 0.9.1
+hexagonit.recipe.cmmi = 1.6
+ipython = 0.13
+meld3 = 0.6.8
+slapos.cookbook = 0.59
+slapos.recipe.template = 2.4
 
 # Required by:
-# slapos.core==0.2
-zope.interface = 3.6.3
-
-# Added by Buildout Versions at 2011-06-13 10:39:36.870559
-Jinja2 = 2.5.5
-Werkzeug = 0.6.2
-buildout-versions = 1.6
-hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3
-meld3 = 0.6.7
-slapos.recipe.template = 1.1
+# slapos.core==0.26.2
+Flask = 0.9
 
 # Required by:
-# slapos.core==0.2
-Flask = 0.6.1
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
-# slapos.cookbook==0.4
+# slapos.cookbook==0.59
 PyXML = 0.8.4
 
 # Required by:
-# slapos.recipe.template==1.1
-collective.recipe.template = 1.8
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# Required by:
-# slapos.cookbook==0.4
-# slapos.core==0.2
-netaddr = 0.7.3
-
-# Required by:
-# slapos.core==0.2
-netifaces = 0.5
-
-# Required by:
-# slapos.cookbook==0.4
-# slapos.core==0.2
-# zc.buildout==1.5.3-dev-SlapOS-001
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c11
-
-# Required by:
-# slapos.cookbook==0.4
-slapos.core = 0.2
-
-# Required by:
-# slapos.core==0.2
-supervisor = 3.0a10
-
-# Required by:
-# slapos.cookbook==0.4
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.4
-zc.recipe.egg = 1.3.2
+# netaddr==0.7.7
+Sphinx = 1.1.3
 
 # Required by:
-# slapos.core==0.2
-zope.interface = 3.6.3
-
-# Added by Buildout Versions at 2011-06-13 10:41:41.115948
-Jinja2 = 2.5.5
-Werkzeug = 0.6.2
-buildout-versions = 1.6
-hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3
-meld3 = 0.6.7
-slapos.cookbook = 0.5
-slapos.recipe.template = 1.1
+# slapos.cookbook==0.59
+inotifyx = 0.2.0
 
 # Required by:
-# slapos.core==0.2
-Flask = 0.6.1
-
-# Required by:
-# slapos.cookbook==0.5
-PyXML = 0.8.4
+# slapos.cookbook==0.59
+# slapos.core==0.26.2
+# xml-marshaller==0.9.7
+lxml = 2.3.4
 
 # Required by:
-# slapos.recipe.template==1.1
-collective.recipe.template = 1.8
+# slapos.cookbook==0.59
+netaddr = 0.7.7
 
 # Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+# slapos.core==0.26.2
+netifaces = 0.8
 
 # Required by:
-# slapos.cookbook==0.5
-# slapos.core==0.2
-netaddr = 0.7.3
-
-# Required by:
-# slapos.core==0.2
-netifaces = 0.5
-
-# Required by:
-# slapos.cookbook==0.5
-# slapos.core==0.2
-# zc.buildout==1.5.3-dev-SlapOS-001
+# slapos.cookbook==0.59
+# slapos.core==0.26.2
+# zc.buildout==1.6.0-dev-SlapOS-006
 # zc.recipe.egg==1.3.2
-setuptools = 0.6c11
+setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.5
-slapos.core = 0.2
+# slapos.cookbook==0.59
+slapos.core = 0.26.2
 
 # Required by:
-# slapos.core==0.2
-supervisor = 3.0a10
+# slapos.core==0.26.2
+supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.5
+# slapos.cookbook==0.59
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.5
+# slapos.cookbook==0.59
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.2
-zope.interface = 3.6.3
-
+# slapos.core==0.26.2
+zope.interface = 4.0.1

software/zencart/instance.cfg

@@ -10,10 +10,11 @@ source = ${application:location}
 lampconfigure_directory = ${buildout:bin-directory}/lampconfigure
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
 
 delete = zc_install
 rename = admin

software/zencart/software.cfg

@@ -76,7 +76,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
 # slapos.cookbook==0.34

stack/cloudooo.cfg

 [buildout]
 extensions =
-  slapos.tool.rebootstrap
   slapos.zcbworkarounds
+  buildout-versions
   mr.developer
 
-find-links = http://www.nexedi.org/static/packages/source/slapos.buildout/
+find-links =
+    http://www.nexedi.org/static/packages/source/slapos.buildout/
+    http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
     http://dist.repoze.org
     http://www.nexedi.org/static/packages/source/
+    http://www.owlfish.com/software/wsgiutils/download.html
+
+# Separate from site eggs
+allowed-eggs-from-site-packages =
+include-site-packages = false
+exec-sitecustomize = false
+
+# Use only quite well working sites.
+allow-hosts =
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  alastairs-place.net
+  dist.repoze.org
+  effbot.org
+  github.com
+  peak.telecommunity.com
+  psutil.googlecode.com
+  www.dabeaz.com
+  www.owlfish.com
+  launchpad.net
+  bitbucket.org
 
 extends =
   ../component/libreoffice-bin/buildout.cfg 
@@ -16,17 +40,24 @@ extends =
   ../component/python-2.7/buildout.cfg
   ../component/xorg/buildout.cfg
   ../component/fonts/buildout.cfg
-  ../component/xpdf/buildout.cfg
+  ../component/git/buildout.cfg
+  ../component/poppler/buildout.cfg
   ../component/imagemagick/buildout.cfg
   ../component/pdftk/buildout.cfg
   ../component/ffmpeg/buildout.cfg
   ../component/file/buildout.cfg
+  ../component/stunnel/buildout.cfg
+  ../component/rdiff-backup/buildout.cfg
+  ../component/dcron/buildout.cfg
+  ../component/coreutils/buildout.cfg
   ../component/cloudooo/buildout.cfg
  
 versions = versions
 
 parts =
   libreoffice-bin
+  stunnel
+  dcron
   
 # basic Xorg
   libXdmcp
@@ -43,30 +74,25 @@ parts =
   libpng12
   imagemagick
   file
-  xpdf 
+  poppler
   pdftk
   ffmpeg
 
-  instance-recipe-egg
   bootstrap2.6
+  rdiff-backup
   cloudooo
 
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-python = python2.6
-eggs =
-  ${lxml-python:egg}
-# instantiation egg
-  ${instance-recipe:egg}
+# Local development
+develop +=
+  ${:parts-directory}/cloudooo
 
 [bootstrap2.6]
 python = python2.6
 
-[rebootstrap]
-# Default first version of rebootstrapped python
-version = 2
-section = python2.7
-
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-001
+zc.buildout = 1.6.0-dev-SlapOS-006
+
+# Use patched hexagonit.recipe.download from
+# https://github.com/SlapOS/hexagonit.recipe.download
+hexagonit.recipe.download = 1.5.1-dev-slapos-001

stack/erp5.cfg → stack/erp5/buildout.cfg

 [buildout]
+# Local development
+develop =
+  ${:parts-directory}/slapos.cookbook-repository
+  ${:parts-directory}/cloudooo-repository
+
 extensions =
-  slapos.rebootstrap
   slapos.zcbworkarounds
-  buildout-versions
+  mr.developer
 
 find-links =
     http://www.nexedi.org/static/packages/source/slapos.buildout/
+    http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
     http://dist.repoze.org
     http://www.nexedi.org/static/packages/source/
     http://www.owlfish.com/software/wsgiutils/download.html
 
-# Separate from site eggs
-allowed-eggs-from-site-packages =
-include-site-packages = false
-exec-sitecustomize = false
-
-# Use only quite well working sites.
-allow-hosts =
-  *.nexedi.org
-  *.python.org
-  *.sourceforge.net
-  alastairs-place.net
-  dist.repoze.org
-  effbot.org
-  github.com
-  peak.telecommunity.com
-  psutil.googlecode.com
-  www.dabeaz.com
-  www.owlfish.com
-  launchpad.net
-
 extends =
 # Exact version of Zope
-  http://svn.zope.org/repos/main/Zope/tags/2.12.22/versions.cfg
-  ../component/logrotate/buildout.cfg
-  ../component/dcron/buildout.cfg
-  ../component/file/buildout.cfg
-  ../component/fonts/buildout.cfg
-  ../component/ghostscript/buildout.cfg
-  ../component/git/buildout.cfg
-  ../component/glib/buildout.cfg
-  ../component/graphviz/buildout.cfg
-  ../component/gzip/buildout.cfg
-  ../component/haproxy/buildout.cfg
-  ../component/hookbox/buildout.cfg
-  ../component/imagemagick/buildout.cfg
-  ../component/kumo/buildout.cfg
-  ../component/libpng/buildout.cfg
-  ../component/libreoffice-bin/buildout.cfg
-  ../component/lxml-python/buildout.cfg
-  ../component/percona-toolkit/buildout.cfg
-  ../component/mariadb/buildout.cfg
-  ../component/memcached/buildout.cfg
-  ../component/mysql-python/buildout.cfg
-  ../component/pdftk/buildout.cfg
-  ../component/pycrypto-python/buildout.cfg
-  ../component/pysvn-python/buildout.cfg
-  ../component/python-2.6/buildout.cfg
-  ../component/python-2.7/buildout.cfg
-  ../component/python-ldap-python/buildout.cfg
-  ../component/rdiff-backup/buildout.cfg
-  ../component/sphinx/buildout.cfg
-  ../component/stunnel/buildout.cfg
-  ../component/subversion/buildout.cfg
-  ../component/tesseract/buildout.cfg
-  ../component/varnish/buildout.cfg
-  ../component/w3-validator/buildout.cfg
-  ../component/w3m/buildout.cfg
-  ../component/xorg/buildout.cfg
-  ../component/poppler/buildout.cfg
-  ../component/xtrabackup/buildout.cfg
-  ../component/zabbix/buildout.cfg
-  ../component/sed/buildout.cfg
-  ../component/coreutils/buildout.cfg
-  ../component/grep/buildout.cfg
-  ../component/dash/buildout.cfg
-  ../component/wget/buildout.cfg
-  ../component/aspell/buildout.cfg
-
-versions = versions
+  http://svn.zope.org/repos/main/Zope/tags/2.12.23/versions.cfg
+  ../../stack/slapos.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/file/buildout.cfg
+  ../../component/fonts/buildout.cfg
+  ../../component/ghostscript/buildout.cfg
+  ../../component/git/buildout.cfg
+  ../../component/graphviz/buildout.cfg
+  ../../component/gzip/buildout.cfg
+  ../../component/haproxy/buildout.cfg
+  ../../component/hookbox/buildout.cfg
+  ../../component/librsvg/buildout.cfg
+  ../../component/imagemagick/buildout.cfg
+  ../../component/kumo/buildout.cfg
+  ../../component/libdmtx/buildout.cfg
+  ../../component/libpng/buildout.cfg
+  ../../component/libreoffice-bin/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../component/percona-toolkit/buildout.cfg
+  ../../component/mariadb/buildout.cfg
+  ../../component/memcached/buildout.cfg
+  ../../component/mysql-python/buildout.cfg
+  ../../component/pdftk/buildout.cfg
+  ../../component/pil-python/buildout.cfg
+  ../../component/pycrypto-python/buildout.cfg
+  ../../component/pysvn-python/buildout.cfg
+  ../../component/python-2.6/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/python-ldap-python/buildout.cfg
+  ../../component/rdiff-backup/buildout.cfg
+  ../../component/sphinx/buildout.cfg
+  ../../component/stunnel/buildout.cfg
+  ../../component/subversion/buildout.cfg
+  ../../component/tesseract/buildout.cfg
+  ../../component/varnish/buildout.cfg
+  ../../component/w3-validator/buildout.cfg
+  ../../component/w3m/buildout.cfg
+  ../../component/xorg/buildout.cfg
+  ../../component/poppler/buildout.cfg
+  ../../component/xtrabackup/buildout.cfg
+  ../../component/zabbix/buildout.cfg
+  ../../component/sed/buildout.cfg
+  ../../component/coreutils/buildout.cfg
+  ../../component/grep/buildout.cfg
+  ../../component/dash/buildout.cfg
+  ../../component/wget/buildout.cfg
+  ../../component/aspell/buildout.cfg
+  ../../component/cloudooo/buildout.cfg
 
 parts =
-  itools-build
   rdiff-backup
   aspell
+  aspell-en-dictionary
   apache
   apache-antiloris
   file
   graphviz
   memcached
   haproxy
-  varnish-2.1
+  varnish-3.0
   stunnel
   w3m
   poppler
-  libpng12
   libpng
   ghostscript
   mariadb
   mroonga-mariadb
   sphinx
   imagemagick
+  libdmtx
+  dmtx-utils
   kumo
   libreoffice-bin
   w3-validator
-  tesseract-eng-traineddata-unzip
   tesseract
   hookbox
   bootstrap2.6
@@ -133,9 +120,6 @@ parts =
   liberation-fonts
   ipaex-fonts
 
-# Zope products
-  products-deps
-
 # Cloudooo specific part
   cloudooo
 
@@ -149,6 +133,203 @@ parts =
 # some additional utils
   slapos-toolbox
 
+# Local development
+  slapos.cookbook-repository
+  check-recipe
+  slapos.cookbook-python2.6
+  slapos.recipe.template-python2.6
+# Create instance template
+  template
+
+# Local development
+[slapos.cookbook-repository]
+recipe = plone.recipe.command
+stop-on-error = true
+branch = erp5
+revision =
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet http://git.erp5.org/repos/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
+update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi
+
+[check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+
+[slapos.cookbook-python2.6]
+recipe = zc.recipe.egg
+eggs = slapos.cookbook
+scripts =
+python = python2.6
+ugly-depend-on = ${slapos.cookbook-repository:command} ${slapos.cookbook-repository:update-command}
+
+[slapos.recipe.template-python2.6]
+recipe = zc.recipe.egg
+eggs = slapos.recipe.template
+scripts =
+python = python2.6
+
+[template-jinja2-base]
+recipe = slapos.recipe.template:jinja2
+template = ${:_profile_base_location_}/${:filename}.in
+rendered = ${buildout:directory}/${:filename}
+# XXX: extra-context is needed because we cannot append to a key of an extended
+# section.
+extra-context =
+context =
+    key bin_directory buildout:bin-directory
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key eggs_directory buildout:eggs-directory
+    ${:extra-context}
+
+[template-mariadb]
+< = template-jinja2-base
+filename = instance-mariadb.cfg
+md5sum = 0e8e9bfc8c8a5f1bd71f5c4f346ef68b
+extra-context =
+    key coreutils_location coreutils:location
+    key dcron_location dcron:location
+    key gettext_location gettext:location
+    key grep_location grep:location
+    key gzip_location gzip:location
+    key logrotate_location logrotate:location
+    key mariadb_location mariadb:location
+    key perl_location perl:location
+    key perl_siteprefix perl:siteprefix
+    key sed_location sed:location
+    key xtrabackup_location xtrabackup:location
+
+[template-sphinx]
+< = template-jinja2-base
+filename = instance-sphinx.cfg
+md5sum = e3975afd5220f251d6b6e7024a2ca08b
+extra-context =
+    key sphinx_location sphinx:location
+
+[template-zope]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-zope.cfg.in
+md5sum = de2918c8ca604f452a69108f6e31e78d
+mode = 640
+
+[template-kumofs]
+< = template-jinja2-base
+filename = instance-kumofs.cfg
+md5sum = 7e13d689de7163dcab64e8df4711cdd7
+extra-context =
+    key dash_location dash:location
+    key dcron_location dcron:location
+    key gzip_location gzip:location
+    key kumo_location kumo:location
+    key logrotate_location logrotate:location
+
+[template-tidstorage]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
+md5sum = 520e39f2612a045b42c0ad914bfdc5a9
+mode = 640
+
+[template-cloudooo]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
+md5sum = 53492e520be57f4c6a9eacd107c8d446
+mode = 640
+
+[template-zope-conf]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/zope.conf.in
+md5sum = 599e004c18fd3461aa846ae75bd112f2
+mode = 640
+
+[template]
+< = template-jinja2-base
+# XXX: "template.cfg" is hardcoded in instanciation recipe
+filename = template.cfg
+template = ${:_profile_base_location_}/instance.cfg.in
+md5sum = 9704211fdbed6b23854dcc2222d387c4
+extra-context =
+    key apache_location apache:location
+    key aspell_location aspell:location
+    key buildout_bin_directory buildout:bin-directory
+    key coreutils_location coreutils:location
+    key curl_location curl:location
+    key dash_location dash:location
+    key dcron_location dcron:location
+    key dmtx_utils_location dmtx-utils:location
+    key erp5_location erp5:location
+    key file_location file:location
+    key fontconfig_location fontconfig:location
+    key fonts_location fonts:location
+    key freetype_location freetype:location
+    key git_location git:location
+    key graphviz_location graphviz:location
+    key grep_location grep:location
+    key gzip_location gzip:location
+    key haproxy_location haproxy:location
+    key imagemagick_location imagemagick:location
+    key libICE_location libICE:location
+    key libSM_location libSM:location
+    key libX11_location libX11:location
+    key libXau_location libXau:location
+    key libXdmcp_location libXdmcp:location
+    key libXext_location libXext:location
+    key libXrender_location libXrender:location
+    key libpng12_location libpng12:location
+    key libreoffice_bin_location libreoffice-bin:location
+    key librsvg_location librsvg:location
+    key libxcb_location libxcb:location
+    key local_bt5_repository local-bt5-repository:list
+    key logrotate_location logrotate:location
+    key mariadb_location mariadb:location
+    key openssl_location openssl:location
+    key pdftk_location pdftk:location
+    key poppler_location poppler:location
+    key sed_location sed:location
+    key template_cloudooo template-cloudooo:target
+    key template_erp5_development template-erp5-development:target
+    key template_erp5_production template-erp5-production:rendered
+    key template_kumofs template-kumofs:rendered
+    key template_mariadb template-mariadb:rendered
+    key template_memcached template-memcached:rendered
+    key template_sphinx template-sphinx:rendered
+    key template_tidstorage template-tidstorage:target
+    key template_varnish template-varnish:target
+    key template_zope template-zope:target
+    key template_zope_conf template-zope-conf:target
+    key tesseract_location tesseract:location
+    key varnish_location varnish-3.0:location
+    key w3m_location w3m:location
+    key wget_location wget:location
+    key zlib_location zlib:location
+
+[template-memcached]
+< = template-jinja2-base
+filename = instance-memcached.cfg
+md5sum = 44c507e9eec1003beb99f9063b5e09be
+extra-context =
+    key dash_location dash:location
+    key memcached_location memcached:location
+
+[template-erp5-development]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-erp5-development.cfg.in
+md5sum = 2a4312202a3160f874c4fa3ee9155a1d
+mode = 640
+
+[template-erp5-production]
+< = template-jinja2-base
+filename = instance-erp5-production.cfg
+md5sum = 3051f3fea39d7409c417dcac26027b56
+extra-context =
+    key local_bt5_repository local-bt5-repository:list
+
+[template-varnish]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-varnish.cfg.in
+md5sum = 17aee2df57b121343b1fd65f4b51ce80
+mode = 640
+
 [bt5-repository]
 # Format:
 #   <url or path> [...]
@@ -173,54 +354,6 @@ update-command = ${:command}
 [bootstrap2.6]
 python = python2.6
 
-[rebootstrap]
-version = 3
-section = python2.7
-eggs = slapos.libnetworkcache
-
-[itools]
-pkgname = itools-0.50.8
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-lib = ${:location}/lib
-source = ${:location}/src
-
-# ugly itools building sections until itools and setuptools learn to get
-# along:
-
-[itools-download]
-recipe = hexagonit.recipe.download
-strip-top-level-dir = true
-url = http://download.hforge.org/itools/0.50/${itools:pkgname}.tar.gz
-md5sum = 12704cc354e2201e0921a832bf6b1556
-destination = ${itools:source}
-
-[itools-build]
-recipe = plone.recipe.command
-# reference itools-download:destination instead of itools:source to trigger its
-# execution
-# here, we unset PYTHONPATH to invoke different python than buildout one.
-command =
-    cd ${itools-download:destination} &&
-    PYTHONPATH= ${python2.6:executable} setup.py build_ext -L ${glib:location}/lib -I ${glib:location}/include/glib-2.0:${glib:location}/lib/glib-2.0/include -R ${glib:location}/lib &&
-    PYTHONPATH= ${python2.6:executable} setup.py install_lib -d ${itools:lib}
-
-update-command = ${:command}
-location = ${itools:location}
-stop-on-error = true
-
-[products-deps]
-# Recipe minitage.recipe.fetch is disabled, as it uses PATH variable, but it
-# is not possible to change its environment to use localy delivered subversion
-# nor git. plone.recipe.command can do same job, but it is controllable which
-# binary will be used
-recipe = plone.recipe.command
-svn_param =--trust-server-cert --non-interactive --quiet
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-command =
-  ${subversion:location}/bin/svn checkout -r 98997 ${:svn_param} https://svn.plone.org/svn/collective/ExtFile/trunk ${:location}/ExtFile &&
-  ${git:location}/bin/git clone --quiet git://git.hforge.org/Localizer.git ${:location}/Localizer && cd ${:location}/Localizer && ${git:location}/bin/git reset --quiet --hard dacb6ba0ae559cd9bdb8822812d24a12a21e9e37
-
 [erp5_repository_list]
 repository_id_list = erp5
 
@@ -235,19 +368,13 @@ stop-on-error = true
 repository = http://git.erp5.org/repos/erp5.git
 branch = master
 revision =
-command = ${git:location}/bin/git clone --quiet --branch ${:branch} ${:repository} ${:location} && if [ -n "${:revision}" ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
-update-command = cd ${:location} && GIT_COMMITTER_EMAIL=nobody@example.com GIT_AUTHOR_NAME=Nobody GIT_AUTHOR_EMAIL=nobody@example.com ${git:location}/bin/git pull && if [ -n "${:revision}" ]; then echo "Resetting." ; cd ${:location} && ${git:location}/bin/git reset --hard ${:revision} ; fi
-
-[products]
-# XXX: ERP5 related products are not defined as python distributions, so it is
-#      required to configure them in declarative manner
-list =
+command = "${git:location}/bin/git" clone --quiet --branch "${:branch}" "${:repository}" "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
+update-command = cd "${:location}" && "${git:location}/bin/git" fetch && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --hard @{upstream} ; fi
 
 [fix-products-paths]
 recipe = plone.recipe.command
 stop-on-error = true
 command =
-  for DIR in "${products-deps:location}"; do cd "$DIR"; rm -f Products ; ln -s . Products; touch __init__.py; done
   for DIR in "${erp5:location}"; do cd "$DIR"; rm -f Products ; ln -s product Products; touch product/__init__.py; done
 update-command = ${:command}
 
@@ -267,7 +394,6 @@ initialization =
   import Products
   Products.__path__[:0] = filter(None,
     os.getenv('INSERT_PRODUCTS_PATH', '').split(os.pathsep))
-  Products.__path__.extend(reversed('''${products:list}'''.split()))
   os.environ['SOFTWARE_HOME'] = os.path.abspath(imp.find_module('Zope2')[1])
   os.environ['ZOPE_SCRIPTS'] = ''
   parts_directory = '''${buildout:parts-directory}'''
@@ -277,15 +403,13 @@ initialization =
     [bt5_path, os.path.join(bt5_path, '*')]
     for bt5_path in (os.path.join(parts_directory, x, 'bt5')
                      for x in repository_id_list)), []))
+  extra_path_list = '''${:extra-paths}'''.split()
   sys.path[:0] = sum((
-    glob.glob(os.path.join(parts_directory, x, 'tests'))
-    for x in repository_id_list), [])
-  sys.path[:0] = sum((
-    glob.glob(os.path.join(parts_directory, x, 'product', '*', 'tests'))
-    for x in repository_id_list), [])
+    glob.glob(os.path.join(x, 'tests'))
+    for x in extra_path_list), [])
   sys.path[:0] = sum((
-    glob.glob(os.path.join(x, '*', 'tests'))
-    for x in reversed('''${products:list}'''.split())), [])
+    glob.glob(os.path.join(x, 'Products', '*', 'tests'))
+    for x in extra_path_list), [])
 
 [test_suite_runner]
 # XXX: Workaround for fact ERP5Type is not an distribution and does not
@@ -302,7 +426,6 @@ initialization =
   import sys
   import Products
   [Products.__path__.insert(0, p) for p in reversed(os.environ.get('INSERT_PRODUCTS_PATH', '').split(':')) if p]
-  Products.__path__.extend(reversed('''${products:list}'''.split()))
   import Zope2
   os.environ['SOFTWARE_HOME'] = os.path.abspath(os.path.dirname(os.path.dirname(Zope2.__file__)))
   os.environ['ZOPE_SCRIPTS'] = ''
@@ -315,6 +438,7 @@ python = python2.6
 eggs =
   ${mysql-python:egg}
   ${lxml-python:egg}
+  ${pil-python:egg}
   ${python-ldap-python:egg}
   ${pysvn-python:egg}
   ${pycrypto-python:egg}
@@ -335,6 +459,7 @@ eggs =
   python-magic
   python-memcached
   pytz
+  requests
   threadframe
   timerserver
   urlnorm
@@ -345,6 +470,8 @@ eggs =
   argparse
   validictory
   erp5.util
+  huBarcode
+  qrcode
 
 # Zope 2.12 with patched acquisition
   ZODB3
@@ -377,6 +504,9 @@ eggs =
 # Dependency for our fork of PortalTransforms
   StructuredText
 
+# Needed for parsing .po files from our Localizer subset
+  polib
+
 # parameterizing the version of the generated python interpreter name by the
 # python section version causes dependency between this egg section and the
 # installation of python, which we don't want on an instance
@@ -390,16 +520,21 @@ scripts =
   web_checker_utility = erp5.util.webchecker:web_checker_utility
 
 extra-paths =
-  ${itools:location}/lib
-  ${products-deps:location}
   ${erp5:location}
 
+[cloudooo-repository]
+branch = master
+revision = 4cdfffb3f81a0fdbb7b372d92de664e716f12d4b
+
 [mysql-python]
 python = python2.6
 
 [lxml-python]
 python = python2.6
 
+[pil-python]
+python = python2.6
+
 [python-ldap-python]
 python = python2.6
 
@@ -412,35 +547,20 @@ python = ${eggs:python}
 eggs =
   ${lxml-python:egg}
   slapos.toolbox
+  slapos.toolbox[zodbpack]
 
 scripts =
-  killpidfromfile = slapos.systool:killpidfromfile
-  onetimedownload = slapos.toolbox:onetimedownload
-
-[cloudooo]
-recipe = zc.recipe.egg
-python = python2.6
-eggs =
-  ${lxml-python:egg}
-  cloudooo.handler.ffmpeg
-  cloudooo.handler.imagemagick
-  cloudooo.handler.ooo
-  cloudooo.handler.pdf
-  cloudooo
-  PasteScript
-scripts =
-  paster=cloudooo_paster
+  killpidfromfile
+  onetimedownload
+  zodbpack
 
 [versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-004
-
 # pin Acquisition and Products.DCWorkflow to Nexedi flavour of eggs
 Acquisition = 2.13.7nxd001
 Products.DCWorkflow = 2.2.3nxd002
 
 # Known version with works
-numpy = 1.3.0
+numpy = 1.6.2
 # Patched version which support python 2.6
 PyXML = 0.8.4nxd001
 # modified version that works fine for buildout installation
@@ -448,12 +568,6 @@ SOAPpy = 0.12.0nxd001
 # we are still using this old stable version.
 rdiff-backup = 1.0.5
 
-# Zope Known Good Set is incompatible with buildout 1.5.0 in case of
-# distribute and zc.buildout, and as ERP5 Appliance trunk wants to use
-# the newest versions of buildout infrastructure clear the pin
-distribute =
-setuptools =
-
 # official pysvn egg does not supports --include-dirs and
 # --library-dirs, so we use our modified version
 pysvn = 1.7.4nxd006
@@ -464,3 +578,86 @@ Products.CMFCore = 2.2.5
 Products.CMFDefault = 2.2.2
 Products.CMFTopic = 2.2.1
 Products.CMFUid = 2.2.1
+
+# Unpined locally developed egg
+slapos.cookbook =
+
+# Pinned versions
+Flask = 0.8
+GitPython = 0.3.2.RC1
+MySQL-python = 1.2.3
+PIL = 1.1.7
+Paste = 1.7.5.1
+PasteDeploy = 1.5.0
+PasteScript = 1.7.5
+Products.CMFActionIcons = 2.1.3
+Products.CMFCalendar = 2.2.2
+Products.CMFCore = 2.2.5
+Products.CMFDefault = 2.2.2
+Products.CMFTopic = 2.2.1
+Products.CMFUid = 2.2.1
+Products.DCWorkflowGraph = 0.4.1
+Products.ExternalEditor = 1.1.0
+Products.GenericSetup = 1.7.1
+Products.MimetypesRegistry = 2.0.3
+Products.PluggableAuthService = 1.7.7
+Products.PluginRegistry = 1.3b1
+Products.TIDStorage = 5.4.7.dev-r45842
+Products.Zelenium = 1.0.3
+StructuredText = 2.11.1
+WSGIUtils = 0.7
+Werkzeug = 0.8.3
+apache-libcloud = 0.9.1
+argparse = 1.1
+async = 0.6.1
+atomize = 0.1.1
+buildout-versions = 1.7
+cElementTree = 1.0.5-20051216
+chardet = 1.0.1
+coverage = 3.5.1
+csp-eventlet = 0.7.0
+elementtree = 1.2.7-20070827-preview
+erp5.recipe.cmmiforcei686 = 0.1.3
+erp5.util = 0.4.6
+erp5diff = 0.8.1.5
+eventlet = 0.9.16
+feedparser = 5.1.1
+five.localsitemanager = 2.0.5
+fpconst = 0.7.2
+gitdb = 0.5.4
+greenlet = 0.3.4
+hexagonit.recipe.cmmi = 1.5.0
+http-parser = 0.7.5
+huBarcode = 0.63
+inotifyx = 0.2.0
+ipdb = 0.6.1
+ipython = 0.12
+meld3 = 0.6.8
+netaddr = 0.7.6
+netifaces = 0.8
+ordereddict = 1.1
+paramiko = 1.7.7.1
+plone.recipe.command = 1.1
+ply = 3.4
+polib = 1.0.0
+psutil = 0.4.1
+python-ldap = 2.4.9
+python-magic = 0.4.2
+python-memcached = 1.47
+restkit = 4.1.2
+rtjp-eventlet = 0.3.2
+setuptools = 0.6c12dev-r88846
+slapos.core = 0.24
+slapos.recipe.build = 0.7
+slapos.recipe.template = 2.4
+slapos.toolbox = 0.23
+smmap = 0.8.2
+socketpool = 0.3.0
+supervisor = 3.0a12
+threadframe = 0.2
+timerserver = 2.0.2
+urlnorm = 1.1.2
+uuid = 1.30
+validictory = 0.8.3
+xml-marshaller = 0.9.7
+xupdate-processor = 0.4

stack/erp5/instance-cloudoo.cfg.in

+{% if software_type == slap_software_type -%}
+{% set json = json_module.loads(parameter_dict.get('cloudooo-json', '{}')) -%}
+{% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
+[buildout]
+parts =
+  publish-cloudooo-connection-information
+  cloudooo-instance
+  promise
+  promise-openoffice
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[publish-cloudooo-connection-information]
+recipe = slapos.cookbook:publishurl
+url = cloudooo://${cloudooo-instance:ip}:${cloudooo-instance:port}/
+
+[cloudooo-instance]
+recipe = slapos.cookbook:generic.cloudooo
+
+# Network options
+ip = ${slap-network-information:local-ipv4}
+port = 23000
+openoffice-port = 23060
+
+# Paths
+configuration-file = ${directory:etc}/cloudooo.cfg
+wrapper = ${directory:service}/cloudooo
+
+# Paths: Data
+data-directory = ${directory:cloudooo-data}
+
+environment =
+  LD_LIBRARY_PATH = {{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['zlib'] }}/lib
+  FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
+
+# Binary information
+# cloudooo specific configuration
+ooo-binary-path = {{ parameter_dict['libreoffice-bin'] }}/program
+ooo-paster = {{ bin_directory }}/cloudooo_paster
+ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program
+
+[fontconfig-instance]
+recipe = slapos.cookbook:fontconfig
+conf-path = ${directory:etc}/font.conf
+font-system-folder = {{ parameter_dict['fonts'] }}
+font-folder = ${directory:font}
+url-list = {{ json.get('font_url_list', []) | join(' ') }}
+service-folder = ${directory:service}
+onetimedownload_path = {{ bin_directory }}/onetimedownload
+
+[promise]
+recipe = slapos.cookbook:check_port_listening
+path = ${directory:promise}/cloudooo
+hostname = ${cloudooo-instance:ip}
+port = ${cloudooo-instance:port}
+
+[promise-openoffice]
+recipe = slapos.cookbook:check_port_listening
+path = ${directory:promise}/openoffice
+hostname = ${cloudooo-instance:ip}
+port = ${cloudooo-instance:openoffice-port}
+
+# rest of parts are candidates for some generic stuff
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+srv = ${buildout:directory}/srv
+service = ${:etc}/run
+promise = ${:etc}/promise
+cloudooo-data = ${:srv}/cloudooo
+font = ${:srv}/font
+{% endif %}

stack/erp5/instance-erp5-development.cfg.in

+#############################
+#
+# Request erp5 development environnment
+#
+#############################
+[buildout]
+
+extends = {{ template_zope }}
+parts +=
+  request-mariadb
+  request-cloudooo
+  request-memcached
+  request-kumofs
+  basedirectory
+  test-runner
+  erp5-bootstrap
+  erp5-promise
+  promise-erp5-site
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[slap-parameter]
+# default site id
+site-id = erp5
+cloudooo-json =
+promise-path = ${rootdirectory:etc}/erp5promise.cfg
+bt5 = erp5_full_text_myisam_catalog
+  erp5_configurator_standard
+  erp5_configurator_maxma_demo
+  erp5_configurator_ung
+  erp5_configurator_run_my_doc
+bt5-repository-url = {{ local_bt5_repository }}
+smtp-url = smtp://localhost:25/
+
+[test-runner]
+recipe = slapos.cookbook:erp5.test
+certificate-authority-path = ${test-certificate-authority:ca-dir}
+mysql-url = ${request-mariadb:connection-url}
+kumofs-url = ${request-kumofs:connection-url}
+memcached-url = ${request-memcached:connection-url}
+cloudooo-url = ${request-cloudooo:connection-url}
+test-instance-path = ${directory:unit-test-path}
+
+prepend-path = ${buildout:bin-directory}
+run-unit-test = ${buildout:bin-directory}/runUnitTest
+run-test-suite = ${buildout:bin-directory}/runTestSuite
+
+openssl-binary = ${test-certificate-authority:openssl-binary}
+run-unit-test-binary = {{ bin_directory }}/runUnitTest
+run-test-suite-binary = {{ bin_directory }}/runTestSuite
+
+[test-certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = {{ openssl_location }}/bin/openssl
+ca-dir = ${directory:test-ca-dir}
+requests-directory = ${test-cadirectory:requests}
+wrapper = ${basedirectory:services}/test-ca
+ca-private = ${test-cadirectory:private}
+ca-certs = ${test-cadirectory:certs}
+ca-newcerts = ${test-cadirectory:newcerts}
+ca-crl = ${test-cadirectory:crl}
+
+[test-cadirectory]
+recipe = slapos.cookbook:mkdirectory
+requests = ${directory:test-ca-dir}/requests
+private = ${directory:test-ca-dir}/private
+certs = ${directory:test-ca-dir}/certs
+newcerts = ${directory:test-ca-dir}/newcerts
+crl = ${directory:test-ca-dir}/crl
+
+[erp5-bootstrap]
+recipe = slapos.cookbook:erp5.bootstrap
+runner-path = ${basedirectory:services}/erp5-bootstrap
+mysql-url =  ${request-mariadb:connection-url}
+zope-url = http://${zope-instance:user}:${zope-instance:password}@${zope-instance:ip}:${zope-instance:port}/${slap-parameter:site-id}
+
+[erp5-promise]
+recipe = slapos.cookbook:erp5.promise
+promise-path = ${slap-parameter:promise-path}
+kumofs-url = ${request-kumofs:connection-url}
+memcached-url = ${request-memcached:connection-url}
+cloudooo-url = ${request-cloudooo:connection-url}
+smtp-url = ${slap-parameter:smtp-url}
+bt5 = ${slap-parameter:bt5}
+bt5-repository-url = ${slap-parameter:bt5-repository-url}
+
+[request-common]
+recipe = slapos.cookbook:request
+software-url = ${slap-connection:software-release-url}
+sla = computer_guid
+sla-computer_guid = ${slap-connection:computer-id}
+return = url
+server-url = ${slap-connection:server-url}
+key-file = ${slap-connection:key-file}
+cert-file = ${slap-connection:cert-file}
+computer-id = ${slap-connection:computer-id}
+partition-id = ${slap-connection:partition-id}
+
+[request-mariadb]
+<=request-common
+name = MariaDB DataBase
+software-type = mariadb
+
+[request-cloudooo]
+<=request-common
+name = Cloudooo
+config = cloudooo-json
+config-cloudooo-json = ${slap-parameter:cloudooo-json}
+software-type = cloudooo
+
+[request-memcached]
+<=request-common
+name = Memcached
+software-type = memcached
+
+[request-kumofs]
+<=request-common
+name = KumoFS
+software-type = kumofs
+
+[zope-instance]
+promise-path = ${slap-parameter:promise-path}
+site-id = ${slap-parameter:site-id}
+
+[directory]
+test-ca-dir = ${rootdirectory:srv}/test-ca
+test-instance-path = ${rootdirectory:srv}/test-instance
+unit-test-path = ${:test-instance-path}/unit_test
+
+[promise-erp5-site]
+recipe = slapos.cookbook:check_url_available
+path = ${basedirectory:promises}/erp5site
+url = http://${zope-instance:ip}:${zope-instance:port}/${slap-parameter:site-id}
+dash_path = {{ dash_location }}/bin/dash
+curl_path = {{ curl_location }}/bin/curl

software/erp5/instance-erp5-production.cfg → stack/erp5/instance-erp5-production.cfg.in

@@ -6,113 +6,113 @@
 [buildout]
 
 parts =
-  request-mariadb
-  request-sphinx
-  request-cloudooo
-  request-memcached
-  request-kumofs
   request-tidstorage
   basedirectory
 
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [request-common]
 recipe = slapos.cookbook:request
-software-url = $${slap-connection:software-release-url}
+software-url = ${slap-connection:software-release-url}
 sla = computer_guid
 return = url
-server-url = $${slap-connection:server-url}
-key-file = $${slap-connection:key-file}
-cert-file = $${slap-connection:cert-file}
-computer-id = $${slap-connection:computer-id}
-partition-id = $${slap-connection:partition-id}
+server-url = ${slap-connection:server-url}
+key-file = ${slap-connection:key-file}
+cert-file = ${slap-connection:cert-file}
+computer-id = ${slap-connection:computer-id}
+partition-id = ${slap-connection:partition-id}
 
 [request-sphinx]
 <=request-common
 name = Sphinx Search Engine
 software-type = sphinx
-sla-computer_guid = $${slap-parameter:sphinx-computer-guid}
+sla-computer_guid = ${slap-parameter:sphinx-computer-guid}
 return = url-sphinx url-sphinx-sql
 
 [request-mariadb]
 <=request-common
 name = MariaDB DataBase
 software-type = mariadb
-sla-computer_guid = $${slap-parameter:mariadb-computer-guid}
+sla-computer_guid = ${slap-parameter:mariadb-computer-guid}
 
 [request-cloudooo]
 <=request-common
 name = Cloudooo
 config = cloudooo-json
-config-cloudooo-json = $${slap-parameter:cloudooo-json}
+config-cloudooo-json = ${slap-parameter:cloudooo-json}
 software-type = cloudooo
-sla-computer_guid = $${slap-parameter:cloudooo-computer-guid}
+sla-computer_guid = ${slap-parameter:cloudooo-computer-guid}
 
 [request-memcached]
 <=request-common
 name = Memcached
 software-type = memcached
-sla-computer_guid = $${slap-parameter:memcached-computer-guid}
+sla-computer_guid = ${slap-parameter:memcached-computer-guid}
 
 [request-kumofs]
 <=request-common
 name = KumoFS
 software-type = kumofs
-sla-computer_guid = $${slap-parameter:kumofs-computer-guid}
+sla-computer_guid = ${slap-parameter:kumofs-computer-guid}
 
 [request-tidstorage]
 <=request-common
 name = TidStorage
 return = url-login
-config = json mysql-url memcached-url cloudooo-url kumofs-url sphinx-url-sphinx sphinx-url-sphinx-sql smtp-url bt5 bt5-repository-url
-config-json = $${slap-parameter:json}
-config-mysql-url = $${request-mariadb:connection-url}
-config-memcached-url = $${request-memcached:connection-url}
-config-cloudooo-url = $${request-cloudooo:connection-url}
-config-kumofs-url = $${request-kumofs:connection-url}
-config-sphinx-url-sphinx = $${request-sphinx:connection-url-sphinx}
-config-sphinx-url-sphinx-sql = $${request-sphinx:connection-url-sphinx-sql}
-config-bt5 = $${slap-parameter:bt5}
-config-bt5-repository-url = $${slap-parameter:bt5-repository-url}
-config-smtp-url = $${slap-parameter:smtp-url}
+config =
+  json
+  mysql-url
+  memcached-url
+  cloudooo-url
+  kumofs-url
+  sphinx-url-sphinx
+  sphinx-url-sphinx-sql
+  smtp-url
+  bt5
+  bt5-repository-url
+config-json = ${slap-parameter:json}
+config-mysql-url = ${request-mariadb:connection-url}
+config-memcached-url = ${request-memcached:connection-url}
+config-cloudooo-url = ${request-cloudooo:connection-url}
+config-kumofs-url = ${request-kumofs:connection-url}
+config-sphinx-url-sphinx = ${request-sphinx:connection-url-sphinx}
+config-sphinx-url-sphinx-sql = ${request-sphinx:connection-url-sphinx-sql}
+config-bt5 = ${slap-parameter:bt5}
+config-bt5-repository-url = ${slap-parameter:bt5-repository-url}
+config-smtp-url = ${slap-parameter:smtp-url}
 software-type = tidstorage
-sla-computer_guid = $${slap-parameter:tidstorage-computer-guid}
+sla-computer_guid = ${slap-parameter:tidstorage-computer-guid}
 
 [request-varnish]
 <=request-common
 name = Varnish
 config = tidstorage-url
-config-tidstorage-url = $${request-tidstorage:connection-url-login}
-config-web-checker-mail-address = $${slap-parameter:web-checker-mail-address}
-config-web-checker-smtp-host = $${slap-parameter:web-checker-smtp-host}
+config-tidstorage-url = ${request-tidstorage:connection-url-login}
+config-web-checker-mail-address = ${slap-parameter:web-checker-mail-address}
+config-web-checker-smtp-host = ${slap-parameter:web-checker-smtp-host}
 software-type = varnish
-sla-computer_guid = $${slap-parameter:varnish-computer-guid}
+sla-computer_guid = ${slap-parameter:varnish-computer-guid}
 
 [slap-parameter]
 # Default value if no computer_guid is specified for each type
-sphinx-computer-guid = $${slap-connection:computer-id}
-mariadb-computer-guid = $${slap-connection:computer-id}
-cloudooo-computer-guid = $${slap-connection:computer-id}
-memcached-computer-guid = $${slap-connection:computer-id}
-kumofs-computer-guid = $${slap-connection:computer-id}
-tidstorage-computer-guid = $${slap-connection:computer-id}
-varnish-computer-guid = $${slap-connection:computer-id}
+sphinx-computer-guid = ${slap-connection:computer-id}
+mariadb-computer-guid = ${slap-connection:computer-id}
+cloudooo-computer-guid = ${slap-connection:computer-id}
+memcached-computer-guid = ${slap-connection:computer-id}
+kumofs-computer-guid = ${slap-connection:computer-id}
+tidstorage-computer-guid = ${slap-connection:computer-id}
+varnish-computer-guid = ${slap-connection:computer-id}
 cloudooo-json =
 bt5 = erp5_full_text_myisam_catalog
   erp5_configurator_standard
   erp5_configurator_maxma_demo
   erp5_configurator_ung
   erp5_configurator_run_my_doc
-bt5-repository-url = ${local-bt5-repository:list}
+bt5-repository-url = {{ local_bt5_repository }}
 smtp-url = smtp://localhost:25/
 
-# rest of parts are candidates for some generic stuff
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
+etc = ${buildout:directory}/etc/run

stack/erp5/instance-kumofs.cfg.in

+[buildout]
+parts =
+  publish-kumofs-connection-information
+  kumofs-instance
+  logrotate
+  logrotate-entry-kumofs
+  cron
+  cron-entry-logrotate
+  promise-kumofs-server
+  promise-kumofs-server-listen
+  promise-kumofs-gateway
+  promise-kumofs-manager
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[publish-kumofs-connection-information]
+recipe = slapos.cookbook:publishurl
+url = memcached://${kumofs-instance:ip}:${kumofs-instance:gateway-port}/
+
+[kumofs-instance]
+recipe = slapos.cookbook:generic.kumofs
+
+# Network options
+ip = ${slap-network-information:local-ipv4}
+manager-port = 13101
+server-port = 13201
+server-listen-port = 13202
+gateway-port = 13301
+
+# Paths: Running wrappers
+gateway-wrapper = ${basedirectory:services}/kumofs_gateway
+manager-wrapper = ${basedirectory:services}/kumofs_manager
+server-wrapper = ${basedirectory:services}/kumofs_server
+
+# Paths: Data
+data-directory = ${directory:kumofs-data}
+
+# Paths: Logs
+kumo-gateway-log = ${basedirectory:log}/kumo-gateway.log
+kumo-manager-log = ${basedirectory:log}/kumo-manager.log
+kumo-server-log = ${basedirectory:log}/kumo-server.log
+
+# Binary information
+kumo-gateway-binary = {{ kumo_location }}/bin/kumo-gateway
+kumo-manager-binary = {{ kumo_location }}/bin/kumo-manager
+kumo-server-binary = {{ kumo_location }}/bin/kumo-server
+shell-path = {{ dash_location }}/bin/dash
+
+[logrotate-entry-kumofs]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = kumofs
+log = ${kumofs-instance:kumo-gateway-log} ${kumofs-instance:kumo-manager-log}
+  ${kumofs-instance:kumo-server-log}
+
+# rest of parts are candidates for some generic stuff
+
+[logrotate]
+recipe = slapos.cookbook:logrotate
+# Binaries
+logrotate-binary = {{ logrotate_location }}/usr/sbin/logrotate
+gzip-binary = {{ gzip_location }}/bin/gzip
+gunzip-binary = {{ gzip_location }}/bin/gunzip
+# Directories
+wrapper = ${rootdirectory:bin}/logrotate
+conf = ${rootdirectory:etc}/logrotate.conf
+logrotate-entries = ${directory:logrotate-entries}
+backup = ${directory:logrotate-backup}
+state-file = ${rootdirectory:srv}/logrotate.status
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = ${rootdirectory:var}/log
+services = ${rootdirectory:etc}/run
+promise = ${rootdirectory:etc}/promise
+run = ${rootdirectory:var}/run
+backup = ${rootdirectory:srv}/backup
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+cron-entries = ${rootdirectory:etc}/cron.d
+crontabs = ${rootdirectory:etc}/crontabs
+cronstamps = ${rootdirectory:etc}/cronstamps
+logrotate-backup = ${basedirectory:backup}/logrotate
+logrotate-entries = ${rootdirectory:etc}/logrotate.d
+kumofs-data = ${rootdirectory:srv}/kumofs
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+var = ${buildout:directory}/var
+srv = ${buildout:directory}/srv
+bin = ${buildout:directory}/bin
+
+[cron]
+recipe = slapos.cookbook:cron
+dcrond-binary = {{ dcron_location }}/sbin/crond
+cron-entries = ${directory:cron-entries}
+crontabs = ${directory:crontabs}
+cronstamps = ${directory:cronstamps}
+catcher = ${cron-simplelogger:wrapper}
+binary = ${basedirectory:services}/crond
+
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = ${rootdirectory:bin}/cron_simplelogger
+log = ${basedirectory:log}/cron.log
+
+[cron-entry-logrotate]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+command = ${logrotate:wrapper}
+
+# Deploy zope promises scripts
+[promise-template]
+recipe = slapos.cookbook:check_port_listening
+path = ${basedirectory:promise}/kumofs
+hostname = ${kumofs-instance:ip}
+port = ${kumofs-instance:server-listen-port}
+
+[promise-kumofs-server]
+<= promise-template
+port = ${kumofs-instance:server-port}
+
+[promise-kumofs-server-listen]
+<= promise-template
+port = ${kumofs-instance:server-listen-port}
+
+[promise-kumofs-gateway]
+<= promise-template
+port = ${kumofs-instance:gateway-port}
+
+[promise-kumofs-manager]
+<= promise-template
+port = ${kumofs-instance:manager-port}

stack/erp5/instance-mariadb.cfg.in

+[buildout]
+parts =
+  publish-mariadb-url
+  mariadb-instance
+  logrotate
+  logrotate-entry-mariadb
+  cron
+  cron-entry-logrotate
+  cron-entry-mariadb-backup
+  binary-link
+  promise
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[publish-mariadb-url]
+recipe = slapos.cookbook:publishurl
+url = mysql://${mariadb-instance:user}:${mariadb-instance:password}@${mariadb-instance:ip}:${mariadb-instance:port}/${mariadb-instance:database}
+
+[cron-entry-mariadb-backup]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = mariadb-backup
+frequency = 0 0 * * *
+command = ${mariadb-instance:backup-script}
+
+[mariadb-instance]
+recipe = slapos.cookbook:generic.mysql
+
+# Options
+user = user
+parallel-test-database-amount = 100
+port = 45678
+ip = ${slap-network-information:local-ipv4}
+database = erp5
+test-user = erp5_test
+test-database = erp5_test
+mysql-test-database-base = testdb
+mysql-test-user-base = testuser
+
+# Paths
+wrapper = ${basedirectory:services}/mariadb
+update-wrapper = ${basedirectory:services}/mariadb_update
+backup-script = ${rootdirectory:bin}/innobackupex-controller
+full-backup-directory = ${directory:mariadb-backup-full}
+incremental-backup-directory = ${directory:mariadb-backup-incremental}
+data-directory = ${directory:mariadb-data}
+pid-file = ${basedirectory:run}/mariadb.pid
+socket = ${basedirectory:run}/mariadb.sock
+error-log = ${basedirectory:log}/mariadb_error.log
+slow-query-log = ${basedirectory:log}/mariadb_slowquery.log
+conf-file = ${rootdirectory:etc}/mariadb.cnf
+bin-directory = ${rootdirectory:bin}
+innobackupex-incremental = ${rootdirectory:bin}/innobackupex-incremental
+innobackupex-full = ${rootdirectory:bin}/innobackupex-full
+
+# Binary information
+innobackupex-binary = {{ xtrabackup_location }}/bin/innobackupex
+mysql-base-directory = {{ mariadb_location }}
+mysql-binary = {{ mariadb_location }}/bin/mysql
+mysql-install-binary = {{ mariadb_location }}/scripts/mysql_install_db
+mysql-upgrade-binary = {{ mariadb_location }}/bin/mysql_upgrade
+mysqld-binary = {{ mariadb_location }}/bin/mysqld
+pt-archiver-binary = {{ perl_siteprefix }}/bin/pt-archiver
+pt-config-diff-binary = {{ perl_siteprefix }}/bin/pt-config-diff
+pt-deadlock-logger-binary = {{ perl_siteprefix }}/bin/pt-deadlock-logger
+pt-duplicate-key-checker-binary = {{ perl_siteprefix }}/bin/pt-duplicate-key-checker
+pt-fifo-split-binary = {{ perl_siteprefix }}/bin/pt-fifo-split
+pt-find-binary = {{ perl_siteprefix }}/bin/pt-find
+pt-fk-error-logger-binary = {{ perl_siteprefix }}/bin/pt-fk-error-logger
+pt-heartbeat-binary = {{ perl_siteprefix }}/bin/pt-heartbeat
+pt-index-usage-binary = {{ perl_siteprefix }}/bin/pt-index-usage
+pt-kill-binary = {{ perl_siteprefix }}/bin/pt-kill
+pt-log-player-binary = {{ perl_siteprefix }}/bin/pt-log-player
+pt-online-schema-change-binary = {{ perl_siteprefix }}/bin/pt-online-schema-change
+pt-query-advisor-binary = {{ perl_siteprefix }}/bin/pt-query-advisor
+pt-query-digest-binary = {{ perl_siteprefix }}/bin/pt-query-digest
+pt-show-grants-binary = {{ perl_siteprefix }}/bin/pt-show-grants
+pt-slave-delay-binary = {{ perl_siteprefix }}/bin/pt-slave-delay
+pt-slave-find-binary = {{ perl_siteprefix }}/bin/pt-slave-find
+pt-slave-restart-binary = {{ perl_siteprefix }}/bin/pt-slave-restart
+pt-table-checksum-binary = {{ perl_siteprefix }}/bin/pt-table-checksum
+pt-table-sync-binary = {{ perl_siteprefix }}/bin/pt-table-sync
+pt-tcp-model-binary = {{ perl_siteprefix }}/bin/pt-tcp-model
+pt-trend-binary = {{ perl_siteprefix }}/bin/pt-trend
+pt-upgrade-binary = {{ perl_siteprefix }}/bin/pt-upgrade
+pt-variable-advisor-binary = {{ perl_siteprefix }}/bin/pt-variable-advisor
+pt-visual-explain-binary = {{ perl_siteprefix }}/bin/pt-visual-explain
+xtrabackup-binary = {{ xtrabackup_location }}/bin/xtrabackup_51
+perl-binary = {{ perl_location }}/bin/perl
+
+[logrotate]
+recipe = slapos.cookbook:logrotate
+# Binaries
+logrotate-binary = {{ logrotate_location }}/usr/sbin/logrotate
+gzip-binary = {{ gzip_location }}/bin/gzip
+gunzip-binary = {{ gzip_location }}/bin/gunzip
+# Directories
+wrapper = ${rootdirectory:bin}/logrotate
+conf = ${rootdirectory:etc}/logrotate.conf
+logrotate-entries = ${directory:logrotate-entries}
+backup = ${directory:logrotate-backup}
+state-file = ${rootdirectory:srv}/logrotate.status
+
+[logrotate-entry-mariadb]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = mariadb
+log = ${mariadb-instance:error-log} ${mariadb-instance:slow-query-log}
+post = ${mariadb-instance:mysql-binary} --no-defaults -B --socket=${mariadb-instance:socket} -e "FLUSH LOGS"
+
+[cron]
+recipe = slapos.cookbook:cron
+dcrond-binary = {{ dcron_location }}/sbin/crond
+cron-entries = ${directory:cron-entries}
+crontabs = ${directory:crontabs}
+cronstamps = ${directory:cronstamps}
+catcher = ${cron-simplelogger:wrapper}
+binary = ${basedirectory:services}/crond
+
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = ${rootdirectory:bin}/cron_simplelogger
+log = ${basedirectory:log}/cron.log
+
+[cron-entry-logrotate]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+command = ${logrotate:wrapper}
+
+[binary-link]
+recipe = slapos.cookbook:symbolic.link
+target-directory = ${rootdirectory:bin}
+link-binary =
+  {{ coreutils_location }}/bin/basename
+  {{ coreutils_location }}/bin/cat
+  {{ coreutils_location }}/bin/cp
+  {{ coreutils_location }}/bin/ls
+  {{ coreutils_location }}/bin/tr
+  {{ coreutils_location }}/bin/uname
+  {{ gettext_location }}/lib/gettext/hostname
+  {{ grep_location }}/bin/grep
+  {{ sed_location }}/bin/sed
+  {{ mariadb_location }}/bin/mysql
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+var = ${buildout:directory}/var
+srv = ${buildout:directory}/srv
+bin = ${buildout:directory}/bin
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = ${rootdirectory:var}/log
+services = ${rootdirectory:etc}/run
+promise = ${rootdirectory:etc}/promise
+run = ${rootdirectory:var}/run
+backup = ${rootdirectory:srv}/backup
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+cron-entries = ${rootdirectory:etc}/cron.d
+crontabs = ${rootdirectory:etc}/crontabs
+cronstamps = ${rootdirectory:etc}/cronstamps
+ca-dir = ${rootdirectory:srv}/ssl
+mariadb-backup-full = ${basedirectory:backup}/mariadb-full
+mariadb-backup-incremental = ${basedirectory:backup}/mariadb-incremental
+mariadb-data = ${rootdirectory:srv}/mariadb
+logrotate-backup = ${basedirectory:backup}/logrotate
+logrotate-entries = ${rootdirectory:etc}/logrotate.d
+
+[promise]
+recipe = slapos.cookbook:check_port_listening
+path = ${basedirectory:promise}/mariadb
+hostname = ${mariadb-instance:ip}
+port = ${mariadb-instance:port}

software/erp5/instance-memcached.cfg → stack/erp5/instance-memcached.cfg.in

@@ -9,28 +9,34 @@
 parts =
   memcached-instance
   publish-memcached-connection-information
+  promise
 
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
-[rootdirectory]
+[directory]
 recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-bin = $${buildout:directory}/bin
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run
+etc = ${buildout:directory}/etc
+bin = ${buildout:directory}/bin
+service = ${:etc}/run
+promise = ${:etc}/promise
 
 [memcached-instance]
 recipe = slapos.cookbook:generic.memcached
-wrapper_path = $${basedirectory:services}/memcached
-binary_path = ${memcached:location}/bin/memcached
-shell-path = ${dash:location}/bin/dash
-ip = $${slap-network-information:local-ipv4}
+wrapper_path = ${directory:service}/memcached
+binary_path = {{ memcached_location }}/bin/memcached
+shell-path = {{ dash_location }}/bin/dash
+ip = ${slap-network-information:local-ipv4}
 port = 11000
 
 [publish-memcached-connection-information]
 recipe = slapos.cookbook:publishurl
-url = memcached://$${memcached-instance:ip}:$${memcached-instance:port}/
+url = memcached://${memcached-instance:ip}:${memcached-instance:port}/
+
+# Deploy zope promises scripts
+[promise]
+recipe = slapos.cookbook:check_port_listening
+path = ${directory:promise}/memcache
+hostname = ${memcached-instance:ip}
+port = ${memcached-instance:port}

stack/erp5/instance-sphinx.cfg.in

+[buildout]
+parts =
+  publish-sphinx-url
+  sphinxd-instance
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[publish-sphinx-url]
+recipe = slapos.cookbook:publish
+url-sphinx = sphinx://${sphinxd-instance:ip}:${sphinxd-instance:sphinx-port}
+url-sphinx-sql = mysql://${sphinxd-instance:ip}:${sphinxd-instance:sql-port}
+
+[sphinxd-instance]
+recipe = slapos.cookbook:sphinx
+data-directory = ${directory:sphinx-data}
+configuration-file = ${rootdirectory:etc}/sphinx.conf
+searchd-log = ${basedirectory:log}/sphinx-searchd.log
+query-log = ${basedirectory:log}/sphinx-query.log
+pid = ${basedirectory:run}/sphinx-searchd.pid
+ip = ${slap-network-information:local-ipv4}
+sphinx-port = 9312
+sql-port = 9306
+wrapper = ${basedirectory:services}/sphinxd
+sphinx-searchd-binary = {{ sphinx_location }}/bin/searchd
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+var = ${buildout:directory}/var
+srv = ${buildout:directory}/srv
+bin = ${buildout:directory}/bin
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = ${rootdirectory:var}/log
+services = ${rootdirectory:etc}/run
+run = ${rootdirectory:var}/run
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+sphinx-data = ${rootdirectory:srv}/sphinx

stack/erp5/instance-tidstorage.cfg.in

+{% if software_type == slap_software_type -%}
+{#
+Note: all port counters are pre-incremented. No idea why base port is skipped.
+-#}
+{% set current_zeo_port = zeo_port_base | int -%}
+{% set zope_port_base = zope_port_base | int -%}
+{% set zope_dummy_list = [] -%}
+{% set current_apache_port = apache_port_base | int -%}
+{% set current_haproxy_port = haproxy_port_base | int -%}
+{% set json = json_module.loads(slapparameter_dict['json']) -%}
+{% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
+{#
+XXX: This template only supports exactly one IPv4 and one IPv6 per
+partition. No more (undefined result), no less (IndexError).
+-#}
+{% set ipv4 = (ipv4_set | list)[0] -%}
+{% set ipv6 = (ipv6_set | list)[0] -%}
+{#
+BBB: erp5-ca['state'] has been configured as string by mistake. Keep this for
+backward compatibility with existing automatically setup CAs.
+-#}
+{% set erp5_ca = json.get('erp5-ca', {
+  'country-code': 'ZZ',
+  'email': 'nobody@example.com',
+  'state': "('State',)",
+  'city': 'City',
+  'company': 'Company',
+}) -%}
+{% set site_id = json['site-id'] -%}
+{% set part_list = [] -%}
+{% set known_tid_storage_identifier_dict = {} -%}
+{% set zodb_connection_list = [] -%}
+{% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%}
+{% macro zope(
+  name,
+  thread_amount=1,
+  timerserver_interval=0,
+  longrequest_logger_file='',
+  longrequest_logger_timeout='',
+  longrequest_logger_interval=''
+) -%}
+{% set conf_name = name ~ '-conf' -%}
+{% set conf_parameter_name = conf_name ~ '-param' -%}
+[{{ conf_parameter_name }}]
+< = zope-conf-parameter-base
+pid-file = ${directory:run}/{{ name }}.pid
+lock-file = ${directory:run}/{{ name }}.lock
+{% do zope_dummy_list.append(None) -%}
+{% set offset = zope_dummy_list | length -%}
+port = {{ zope_port_base + offset }}
+thread-amount = {{ thread_amount }}
+{% if timerserver_interval -%}
+timerserver-interval = {{ timerserver_interval }}
+{% endif -%}
+event-log = ${directory:log}/{{ name }}-event.log
+z2-log = ${directory:log}/{{ name }}-Z2.log
+
+[{{ conf_name }}]
+< = zope-conf-base
+rendered = ${directory:etc}/{{ name }}.conf
+extra-context =
+  section parameter_dict {{ conf_parameter_name }}
+
+[{{ section(name) }}]
+< = zope-base
+longrequest-logger-file = {{ longrequest_logger_file }}
+longrequest-logger-timeout = {{ longrequest_logger_timeout }}
+longrequest-logger-interval = {{ longrequest_logger_interval }}
+wrapper = ${directory:services}/{{ name }}
+configuration-file = {{ '${' ~ conf_name ~ ':rendered}' }}
+port = {{ '${' ~ conf_parameter_name ~ ':port}' }}
+
+[{{ section('logrotate-entry-' ~ name) }}]
+< = logrotate-base
+recipe = slapos.cookbook:logrotate.d
+name = {{ name }}
+log = {{ '${' ~ conf_parameter_name ~ ':event-log}' }} {{ '${' ~ conf_parameter_name ~ ':z2-log}' }}
+post = {{ bin_directory }}/killpidfromfile {{ '${' ~ conf_parameter_name ~ ':pid-file}' }} SIGUSR2
+{% endmacro -%}
+#############################
+# Directory creation
+#############################
+[directory]
+recipe = slapos.cookbook:mkdirectory
+apache-conf = ${:etc}/apache
+backup = ${:srv}/backup
+bin = ${buildout:directory}/bin
+ca-dir = ${:srv}/ssl
+cron-entries = ${:etc}/cron.d
+cronstamps = ${:etc}/cronstamps
+crontabs = ${:etc}/crontabs
+erp5-ca-dir = ${:srv}/erp5-ssl
+etc = ${buildout:directory}/etc
+instance = ${:srv}/erp5shared
+instance-constraint = ${:instance}/Constraint
+instance-document = ${:instance}/Document
+instance-etc = ${:instance}/etc
+instance-etc-package-include = ${:instance}/etc/package-include
+instance-extensions = ${:instance}/Extensions
+instance-import = ${:instance}/import
+instance-lib = ${:instance}/lib
+instance-products = ${:instance}/Products
+instance-propertysheet = ${:instance}/PropertySheet
+instance-tests = ${:instance}/tests
+log = ${:var}/log
+logrotate-backup = ${:backup}/logrotate
+logrotate-entries = ${:etc}/logrotate.d
+run = ${:var}/run
+services = ${:etc}/run
+srv = ${buildout:directory}/srv
+tidstorage = ${:srv}/tidstorage
+tmp = ${buildout:directory}/tmp
+var = ${buildout:directory}/var
+zodb = ${:srv}/zodb
+zodb-backup = ${:backup}/zodb
+
+#############################
+# Binary symlinking
+#############################
+[binary-link]
+recipe = slapos.cookbook:symbolic.link
+target-directory = ${directory:bin}
+link-binary =
+  {{ parameter_dict['coreutils'] }}/bin/basename
+  {{ parameter_dict['coreutils'] }}/bin/cat
+  {{ parameter_dict['coreutils'] }}/bin/cp
+  {{ parameter_dict['coreutils'] }}/bin/ls
+  {{ parameter_dict['coreutils'] }}/bin/tr
+  {{ parameter_dict['coreutils'] }}/bin/uname
+  {{ parameter_dict['git'] }}/bin/git
+  {{ parameter_dict['graphviz'] }}/bin/dot
+  {{ parameter_dict['grep'] }}/bin/grep
+  {{ parameter_dict['imagemagick'] }}/bin/convert
+  {{ parameter_dict['imagemagick'] }}/bin/identify
+  {{ parameter_dict['mariadb'] }}/bin/mysql
+  {{ parameter_dict['mariadb'] }}/bin/mysqldump
+  {{ parameter_dict['pdftk'] }}/bin/pdftk
+  {{ parameter_dict['sed'] }}/bin/sed
+  {{ parameter_dict['tesseract'] }}/bin/tesseract
+  {{ parameter_dict['w3m'] }}/bin/w3m
+  {{ parameter_dict['poppler'] }}/bin/pdfinfo
+  {{ parameter_dict['poppler'] }}/bin/pdfseparate
+  {{ parameter_dict['poppler'] }}/bin/pdftotext
+  {{ parameter_dict['poppler'] }}/bin/pdftohtml
+  {{ parameter_dict['poppler'] }}/bin/pdfunite
+  {{ parameter_dict['dmtx-utils'] }}/bin/dmtxwrite
+
+#############################
+# CA
+#############################
+[cadirectory]
+recipe = slapos.cookbook:mkdirectory
+requests = ${directory:ca-dir}/requests
+private = ${directory:ca-dir}/private
+certs = ${directory:ca-dir}/certs
+newcerts = ${directory:ca-dir}/newcerts
+crl = ${directory:ca-dir}/crl
+
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = {{ parameter_dict['openssl'] }}/bin/openssl
+ca-dir = ${directory:ca-dir}
+requests-directory = ${cadirectory:requests}
+wrapper = ${directory:services}/ca
+ca-private = ${cadirectory:private}
+ca-certs = ${cadirectory:certs}
+ca-newcerts = ${cadirectory:newcerts}
+ca-crl = ${cadirectory:crl}
+
+#############################
+# ERP5 CA
+#############################
+[erp5-cadirectory]
+recipe = slapos.cookbook:mkdirectory
+requests = ${directory:erp5-ca-dir}/requests
+private = ${directory:erp5-ca-dir}/private
+certs = ${directory:erp5-ca-dir}/certs
+newcerts = ${directory:erp5-ca-dir}/newcerts
+crl = ${directory:erp5-ca-dir}/crl
+
+[erp5-certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = {{ parameter_dict['openssl'] }}/bin/openssl
+ca-dir = ${directory:erp5-ca-dir}
+requests-directory = ${erp5-cadirectory:requests}
+wrapper = ${directory:services}/erp5-ca
+ca-private = ${erp5-cadirectory:private}
+ca-certs = ${erp5-cadirectory:certs}
+ca-newcerts = ${erp5-cadirectory:newcerts}
+ca-crl = ${erp5-cadirectory:crl}
+country-code = {{ erp5_ca['country-code'] }}
+email = {{ erp5_ca['email'] }}
+state = {{ erp5_ca['state'] }}
+city = {{ erp5_ca['city'] }}
+company = {{ erp5_ca['company'] }}
+
+#############################
+# CRON
+#############################
+[cron-base]
+cron-entries = ${directory:cron-entries}
+
+[cron]
+< = cron-base
+recipe = slapos.cookbook:cron
+dcrond-binary = {{ parameter_dict['dcron'] }}/sbin/crond
+crontabs = ${directory:crontabs}
+cronstamps = ${directory:cronstamps}
+catcher = ${cron-simplelogger:wrapper}
+binary = ${directory:services}/crond
+
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = ${directory:bin}/cron_simplelogger
+log = ${directory:log}/cron.log
+
+#############################
+# Logrotate
+#############################
+[logrotate-base]
+logrotate-entries = ${directory:logrotate-entries}
+backup = ${directory:logrotate-backup}
+
+[logrotate]
+< = logrotate-base
+recipe = slapos.cookbook:logrotate
+# Binaries
+logrotate-binary = {{ parameter_dict['logrotate'] }}/usr/sbin/logrotate
+gzip-binary = {{ parameter_dict['gzip'] }}/bin/gzip
+gunzip-binary = {{ parameter_dict['gzip'] }}/bin/gunzip
+# Directories
+wrapper = ${directory:bin}/logrotate
+conf = ${directory:etc}/logrotate.conf
+state-file = ${directory:srv}/logrotate.status
+
+[cron-entry-logrotate]
+< = cron-base
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+command = ${logrotate:wrapper}
+
+#############################
+# ERP5 bootstrap
+#############################
+[erp5-bootstrap]
+recipe = slapos.cookbook:erp5.bootstrap
+runner-path = ${directory:services}/erp5-bootstrap
+mysql-url = {{ slapparameter_dict['mysql-url'] }}
+zope-url = http://${zope-admin:user}:${zope-admin:password}@${zope-admin:ip}:${zope-admin:port}/{{ site_id }}
+
+#############################
+# ERP5 promise
+#############################
+[erp5-promise]
+recipe = slapos.cookbook:erp5.promise
+promise-path = ${directory:etc}/erp5promise.cfg
+kumofs-url = {{ slapparameter_dict['kumofs-url'] }}
+memcached-url = {{ slapparameter_dict['memcached-url'] }}
+cloudooo-url = {{ slapparameter_dict['cloudooo-url'] }}
+smtp-url = ${slap-parameter:smtp-url}
+bt5 = ${slap-parameter:bt5}
+bt5-repository-url = ${slap-parameter:bt5-repository-url}
+
+#############################
+# ZEO
+#############################
+[zeo-instance-entry-common]
+recipe = slapos.cookbook:zeo
+ip = {{ ipv4 }}
+binary-path = {{ bin_directory }}/runzeo
+
+{% for zeo_id, zeo_configuration_list in json['zeo'].iteritems() -%}
+{%   set current_zeo_port = current_zeo_port + 1 -%}
+{%   set storage_list = [] -%}
+{%   for zeo_slave in zeo_configuration_list -%}
+{%     do zodb_connection_list.append((
+         zeo_slave['storage-name'],
+         zeo_slave['mount-point'] % {'site-id': site_id},
+         zeo_slave['zope-cache-size'],
+         'zeoclient',
+         {
+           'cache-size': zeo_slave['zeo-cache-size'],
+           'server': ipv4 ~ ':' ~ current_zeo_port,
+           'storage': zeo_slave['storage-name'],
+           'name': zeo_slave['storage-name'],
+         },
+       )) -%}
+{%     set zodb_path = '${directory:zodb}/' ~ zeo_slave['storage-name'] ~ '.fs' -%}
+{%     do storage_list.append('storage-name=%(storage-name)s zodb-path=%(zodb-path)s' % {'zodb-path': zodb_path, 'storage-name': zeo_slave['storage-name']}) -%}
+{%     do known_tid_storage_identifier_dict.__setitem__("((('${zeo-instance-%(zeo_id)s:ip}', ${zeo-instance-%(zeo_id)s:port}),), '%(storage_name)s')" % {
+         'zeo_id': zeo_id,
+         'storage_name': zeo_slave['storage-name']
+       }, (zodb_path, '${directory:zodb-backup}/%s/' % zeo_slave['storage-name'], zeo_slave['serialize-path'] % {'site-id': site_id})) -%}
+{%   endfor -%}
+[{{ section('zeo-instance-%s' % zeo_id) }}]
+< = zeo-instance-entry-common
+log-path = ${directory:log}/zeo-{{ zeo_id }}.log
+pid-path = ${directory:run}/zeo-{{ zeo_id }}.pid
+conf-path = ${directory:etc}/zeo-{{ zeo_id }}.conf
+port = {{ current_zeo_port }}
+storage =
+  {{ storage_list | join('\n  ') }}
+wrapper-path = ${directory:services}/zeo-{{ zeo_id }}
+
+[{{ section('logrotate-entry-zeo-%s' % zeo_id) }}]
+< = logrotate-base
+recipe = slapos.cookbook:logrotate.d
+name = zeo-{{ zeo_id }}
+log = ${zeo-instance-{{ zeo_id }}:log-path}
+post = {{ bin_directory }}/killpidfromfile ${zeo-instance-{{ zeo_id }}:pid-path} SIGUSR2
+
+{% endfor -%}
+#############################
+# Zope
+#############################
+[zope-base]
+recipe = slapos.cookbook:generic.zope.zeo.client
+user = zope
+ip = {{ ipv4 }}
+timezone = {{ json['timezone'] }}
+tidstorage-ip = ${tidstorage:ip}
+tidstorage-port = ${tidstorage:port}
+instance-etc = ${directory:instance-etc}
+bt5-repository = ${directory:var}/bt5_repository
+tmp-path = ${directory:tmp}
+bin-path = ${directory:bin}
+site-zcml = ${:instance-etc}/site.zcml
+inituser = ${directory:instance}/inituser
+runzope-binary = {{ bin_directory }}/runzope
+bt5-repository-list =
+
+[deadlock-debugger-password]
+recipe = slapos.cookbook:pwgen.stable
+
+[zope-conf-parameter-base]
+ip = {{ ipv4 }}
+site-id = {{ site_id }}
+zodb-list = {{ dumps(zodb_connection_list) }}
+
+[zope-conf-base]
+recipe = slapos.recipe.template:jinja2
+template = {{ parameter_dict['zope-conf-template'] }}
+extra-context =
+context =
+  key instance directory:instance
+  key instance_products directory:instance-products
+  raw deadlock_path /manage_debug_threads
+  key deadlock_debugger_password deadlock-debugger-password:password
+  key tidstorage_ip tidstorage:ip
+  key tidstorage_port tidstorage:port
+  key promise_path erp5-promise:promise-path
+  ${:extra-context}
+
+# Distribution node
+{{ zope('zope-distribution', timerserver_interval=1) }}
+# Admin node
+{{ zope('zope-admin') }}
+# Activity nodes
+{% for q in range(1, json['activity']['zopecount'] + 1) -%}
+{{   zope('zope-activity-%s' % q, timerserver_interval=1) }}
+{%- endfor %}
+# Other zopes, apaches and haproxies
+{% set publish_url_list =  [] -%}
+{% for backend_name, backend_configuration in json['backend'].iteritems() -%}
+{%   set haproxy_backend_list = [] -%}
+{%   set longrequest_logger = backend_configuration.get('longrequest-logger') -%}
+{%   for q in range(1, backend_configuration['zopecount'] + 1) -%}
+{%     set part_name = 'zope-%s-%s' % (backend_name, q) -%}
+{%     if longrequest_logger != None -%}
+{%       set longrequest_logger_file = '${directory:log}/%s-longrequest.log' % (part_name, ) -%}
+{%       set longrequest_logger_timeout = longrequest_logger.get('timeout', '4') -%}
+{%       set longrequest_logger_interval = longrequest_logger.get('interval', '2') -%}
+{%     else -%}
+{%       set longrequest_logger_file = '' -%}
+{%       set longrequest_logger_timeout = '' -%}
+{%       set longrequest_logger_interval = '' -%}
+{%     endif -%}
+{{     zope(
+         part_name,
+         thread_amount=backend_configuration['thread-amount'],
+         longrequest_logger_file=longrequest_logger_file,
+         longrequest_logger_timeout=longrequest_logger_timeout,
+         longrequest_logger_interval=longrequest_logger_interval,
+       ) }}
+{%     do haproxy_backend_list.append('${%(part_name)s:ip}:${%(part_name)s:port}' % {'part_name': part_name}) -%}
+{%  endfor -%}
+{%   set scheme = backend_configuration.get('scheme', ['https']) -%}
+{%   set current_apache_port = current_apache_port + 2 -%}
+{%   set current_haproxy_port = current_haproxy_port + 1 -%}
+{%   if 'http' in scheme -%}
+{%     set section_name = 'apache-public-' ~ backend_name -%}
+{%     do publish_url_list.append(
+         'url-public-%(backend_name)s = http://[${%(section_name)s:ip}]:${%(section_name)s:port}' % {
+         'backend_name': backend_name,
+         'section_name': section_name,
+       }) -%}
+[{{ section(section_name) }}]
+recipe = slapos.cookbook:apache.zope.backend
+backend = http://${haproxy-{{ backend_name }}:ip}:${haproxy-{{ backend_name }}:port}
+ip = {{ ipv6 }}
+port = {{ current_apache_port }}
+scheme = http
+wrapper = ${directory:services}/apache-public-{{ backend_name }}
+configuration-file = ${directory:apache-conf}/apache-public-{{ backend_name }}.conf
+access-control-string = {{ backend_configuration['access-control-string'] }}
+pid-file = ${directory:run}/apache-public-{{ backend_name }}.pid
+lock-file = ${directory:run}/apache-public-{{ backend_name }}.lock
+error-log = ${directory:log}/apache-public-{{ backend_name }}-error.log
+access-log = ${directory:log}/apache-public-{{ backend_name }}-access.log
+apache-binary = {{ parameter_dict['apache'] }}/bin/httpd
+
+[{{ section('logrotate-entry-apache-public-' ~ backend_name) }}]
+< = logrotate-base
+recipe = slapos.cookbook:logrotate.d
+name = apache-public-{{ backend_name }}
+log = ${apache-public-{{ backend_name }}:error-log} ${apache-public-{{ backend_name }}:access-log}
+post = {{ bin_directory }}/killpidfromfile ${apache-public-{{ backend_name }}:pid-file} SIGUSR1
+{%   endif -%}
+{%   if 'https' in scheme -%}
+{%     set section_name = 'apache-' ~ backend_name -%}
+{%     do publish_url_list.append(
+         'url-%(backend_name)s = https://[${%(section_name)s:ip}]:${%(section_name)s:port}' % {
+         'backend_name': backend_name,
+         'section_name': section_name,
+       }) -%}
+[{{ section(section_name) }}]
+recipe = slapos.cookbook:apache.zope.backend
+backend = http://${haproxy-{{ backend_name }}:ip}:${haproxy-{{ backend_name }}:port}
+ip = {{ ipv6 }}
+port = {{ current_apache_port - 1 }}
+wrapper = ${directory:bin}/apache-{{ backend_name }}
+scheme = https
+key-file = ${directory:apache-conf}/apache-{{ backend_name }}.key
+cert-file = ${directory:apache-conf}/apache-{{ backend_name }}.crt
+configuration-file = ${directory:apache-conf}/apache-{{ backend_name }}.conf
+access-control-string = {{ backend_configuration['access-control-string'] }}
+pid-file = ${directory:run}/apache-{{ backend_name }}.pid
+lock-file = ${directory:run}/apache-{{ backend_name }}.lock
+ssl-session-cache = $${directory:log}/apache-ssl-session-cache
+error-log = ${directory:log}/apache-{{ backend_name }}-error.log
+access-log = ${directory:log}/apache-{{ backend_name }}-access.log
+apache-binary = {{ parameter_dict['apache'] }}/bin/httpd
+ssl-authentication = {{ backend_configuration.get('ssl-authentication', False) }}
+backend-path = {{ backend_configuration.get('backend-path', '/') % {'site-id': site_id} }}
+# Note: Without erp5-certificate-authority main certificate have to be hardcoded
+ssl-authentication-certificate = ${erp5-certificate-authority:ca-dir}/cacert.pem
+ssl-authentication-crl = ${erp5-certificate-authority:ca-crl}
+
+[{{ section('ca-apache-' ~ backend_name) }}]
+< = certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+key-file = ${apache-{{ backend_name }}:key-file}
+cert-file = ${apache-{{ backend_name }}:cert-file}
+executable = ${apache-{{ backend_name }}:wrapper}
+wrapper = ${directory:services}/apache-{{ backend_name }}
+
+[{{ section('logrotate-entry-apache-' ~ backend_name) }}]
+< = logrotate-base
+recipe = slapos.cookbook:logrotate.d
+name = apache-{{ backend_name }}
+log = ${apache-{{ backend_name }}:error-log} ${apache-{{ backend_name }}:access-log}
+post = {{ bin_directory }}/killpidfromfile ${apache-{{ backend_name }}:pid-file} SIGUSR1
+
+[{{ section('haproxy-' ~ backend_name) }}]
+recipe = slapos.cookbook:haproxy
+name = {{ backend_name }}
+conf-path = ${directory:etc}/haproxy-{{ backend_name }}.cfg
+ip = {{ ipv4 }}
+port = {{ current_haproxy_port }}
+maxconn = {{ backend_configuration['maxconn'] }}
+server-check-path = /{{ site_id }}/getId
+wrapper-path = ${directory:services}/haproxy-{{ backend_name }}
+binary-path = {{ parameter_dict['haproxy'] }}/sbin/haproxy
+backend-list = {{ haproxy_backend_list | join(' ')}}
+{%-  endif %}
+{% endfor -%}
+[{{ section('publish-apache-backend-list') }}]
+recipe = slapos.cookbook:publish
+{{ publish_url_list | join('\n') }}
+
+#############################
+# tidstorage
+#############################
+[tidstorage]
+recipe = slapos.cookbook:tidstorage
+known-tid-storage-identifier-dict = {{ known_tid_storage_identifier_dict }}
+base-url = http://${zope-admin:ip}:${zope-admin:port}/%s/serialize
+configuration-path = ${directory:etc}/tidstorage.py
+ip = {{ ipv4 }}
+port = 6001
+timestamp-file-path = ${directory:tidstorage}/repozo_tidstorage_timestamp.log
+logfile-name = ${directory:log}/tidstorage.log
+pidfile-name = ${directory:run}/tidstorage.pid
+status-file = ${directory:tidstorage}/tidstorage.tid
+tidstorage-repozo-binary = {{ bin_directory }}/tidstorage_repozo
+tidstoraged-binary = {{ bin_directory }}/tidstoraged
+repozo-binary = {{ bin_directory }}/repozo
+tidstorage-wrapper = ${directory:services}/tidstoraged
+repozo-wrapper = ${buildout:bin-directory}/tidstorage-repozo
+
+[cron-entry-tidstorage-backup]
+< = cron-base
+recipe = slapos.cookbook:cron.d
+name = tidstorage
+frequency = 0 0 * * *
+command = ${tidstorage:repozo-wrapper}
+
+[logrotate-entry-tidstorage]
+< = logrotate-base
+recipe = slapos.cookbook:logrotate.d
+name = tidstorage
+log = ${tidstorage:logfile-name}
+post = {{ bin_directory }}/killpidfromfile ${tidstorage:pidfile-name} SIGHUP
+
+#############################
+# buildout main section
+#############################
+[buildout]
+parts =
+  logrotate
+  cron
+  cron-entry-logrotate
+  certificate-authority
+  erp5-certificate-authority
+  tidstorage
+  cron-entry-tidstorage-backup
+  logrotate-entry-tidstorage
+  binary-link
+  erp5-promise
+  erp5-bootstrap
+  {{ part_list | join('\n  ') }}
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+{%- endif %}

stack/erp5/instance-varnish.cfg.in

+{% if software_type == slap_software_type -%}
+{% set web_checker_parameter = slapparameter_dict['web-checker-mail-address'] -%}
+[buildout]
+parts =
+  publish-varnish-connection-information
+  varnish-instance
+  cron
+  cron-entry-logrotate
+  {# When web_checker related parameter is given, web_checker will be enabled.#}
+{% if web_checker_parameter is defined %}
+  web-checker
+  cron-entry-web-checker
+{% endif %}
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[publish-varnish-connection-information]
+recipe = slapos.cookbook:publishurl
+url = http://${varnish-instance:ip}:${varnish-instance:server-port}/
+
+[varnish-instance]
+recipe = slapos.cookbook:generic.varnish
+
+# Network options
+ip = ${slap-network-information:local-ipv4}
+server-port = 6001
+manager-port = 6002
+
+# Paths: Running wrappers
+varnishd-wrapper = ${basedirectory:services}/varnishd
+varnishlog-wrapper = ${rootdirectory:bin}/varnishlog
+
+# Binary information
+varnishd-binary = {{ parameter_dict['varnish'] }}/sbin/varnishd
+varnishlog-binary = {{ parameter_dict['varnish'] }}/bin/varnishlog
+shell-path = {{ parameter_dict['dash'] }}/bin/dash
+# Configuration by VCL
+vcl-file = ${rootdirectory:etc}/default.vcl
+pid-file = ${basedirectory:run}/varnishd.pid
+varnish-data = ${directory:varnish-data}
+# this will pass at -n option
+varnish-instance-name = ${directory:varnish-instance}
+web-checker = {{ parameter_dict['buildout-bin-directory'] }}/web_checker_utility
+
+[cron-entry-web-checker]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = web-checker
+frequency = 0 0 * * *
+command = ${varnish-instance:web-checker} ${web-checker:web-checker-config}
+
+[web-checker]
+recipe = slapos.cookbook:webchecker
+web-checker-config = ${rootdirectory:etc}/web_checker.cfg
+web-checker-working-directory = ${directory:web-checker}
+frontend-url = ${varnish-instance:ip}:${varnish-instance:server-port}
+wget-binary-path = {{ parameter_dict['wget'] }}/bin/wget
+varnishlog-binary-path = ${varnish-instance:varnishlog-wrapper}
+web-checker-log = ${basedirectory:log}/web-checker.log
+
+[cron]
+recipe = slapos.cookbook:cron
+dcrond-binary = {{ parameter_dict['dcron'] }}/sbin/crond
+cron-entries = ${directory:cron-entries}
+crontabs = ${directory:crontabs}
+cronstamps = ${directory:cronstamps}
+binary = ${basedirectory:services}/crond
+catcher = ${cron-simplelogger:wrapper}
+
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = ${rootdirectory:bin}/cron_simplelogger
+log = ${basedirectory:log}/cron.log
+
+[cron-entry-logrotate]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+command = ${logrotate:wrapper}
+
+[logrotate]
+recipe = slapos.cookbook:logrotate
+# Binaries
+logrotate-binary = {{ parameter_dict['logrotate'] }}/usr/sbin/logrotate
+gzip-binary = {{ parameter_dict['gzip'] }}/bin/gzip
+gunzip-binary = {{ parameter_dict['gzip'] }}/bin/gunzip
+# Directories
+wrapper = ${rootdirectory:bin}/logrotate
+conf = ${rootdirectory:etc}/logrotate.conf
+logrotate-entries = ${directory:logrotate-entries}
+backup = ${directory:logrotate-backup}
+state-file = ${rootdirectory:srv}/logrotate.status
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+services = ${rootdirectory:etc}/run
+run = ${rootdirectory:var}/run
+backup = ${rootdirectory:srv}/backup
+log = ${rootdirectory:var}/log
+backup = ${rootdirectory:srv}/backup
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+varnish-data = ${rootdirectory:srv}/varnish
+varnish-instance = ${directory:varnish-data}/instance
+cron-entries = ${rootdirectory:etc}/cron.d
+crontabs = ${rootdirectory:etc}/crontabs
+cronstamps = ${rootdirectory:etc}/cronstamps
+logrotate-backup = ${basedirectory:backup}/logrotate
+logrotate-entries = ${rootdirectory:etc}/logrotate.d
+web-checker = ${rootdirectory:srv}/web-checker
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+var = ${buildout:directory}/var
+srv = ${buildout:directory}/srv
+bin = ${buildout:directory}/bin
+{% endif %}

stack/erp5/instance-zope.cfg.in

+[buildout]
+parts =
+  certificate-authority
+  publish-apache-zope-backend-connection-string
+  zope-instance
+  apache-zope-backend-instance
+  ca-apache-zope-backend
+  logrotate
+  erp5-certificate-authority
+  logrotate-entry-zope
+  cron
+  cron-entry-logrotate
+  binary-link
+  bt5-erp5-link
+  promise-zope
+  promise-apache-zope-backend
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+{% if 'frontend-software-url' in slapparameter_dict -%}
+[request-slave-frontend]
+recipe = slapos.cookbook:request
+software-url = {{ slapparameter_dict['frontend-software-url'] }}
+software-type = {{ slapparameter_dict.get('frontend-software-type', 'RootSoftwareInstance') }}
+sla = instance_guid
+sla-instance_guid = {{ slapparameter_dict['frontend-instance-guid'] }}
+server-url = ${slap-connection:server-url}
+key-file = ${slap-connection:key-file}
+cert-file = ${slap-connection:cert-file}
+computer-id = ${slap-connection:computer-id}
+partition-id = ${slap-connection:partition-id}
+name = SlaveFrontend
+slave = true
+{% set config_dict = {
+  'url': '${apache-zope-backend-instance:scheme}://[${apache-zope-backend-instance:ip}]:${apache-zope-backend-instance:port}',
+  'type': 'zope',
+} -%}
+{% if 'frontend-domain' in slapparameter_dict -%}
+{%   do config_dict.__setitem__('custom_domain', slapparameter_dict['frontend-domain']) -%}
+{% endif -%}
+config = {{ config_dict.keys() | join(' ') }}
+{% for name, value in config_dict.items() -%}
+config-{{ name }} = {{ value }}
+{% endfor -%}
+return = site_url
+
+[publish-apache-zope-backend-connection-string]
+recipe = slapos.cookbook:publish
+url = ${request-slave-frontend:connection-site_url}
+login = ${zope-instance:user}
+password = ${zope-instance:password}
+url-deadlock = ${:url}/${zope-instance:deadlock-path}?${zope-instance:deadlock-password}
+{% else %}
+[publish-apache-zope-backend-connection-string]
+recipe = slapos.cookbook:publish
+url = https://${zope-instance:user}:${zope-instance:password}@[${apache-zope-backend-instance:ip}]:${apache-zope-backend-instance:port}
+url-deadlock = ${:url}/${zope-instance:deadlock-path}?${zope-instance:deadlock-password}
+{% endif %}
+
+[apache-zope-backend-instance]
+recipe = slapos.cookbook:apache.zope.backend
+backend = http://${zope-instance:ip}:${zope-instance:port}/
+ip = ${slap-network-information:global-ipv6}
+port = 16001
+wrapper = ${rootdirectory:bin}/apache
+key-file = ${directory:apache-conf}/apache.key
+cert-file = ${directory:apache-conf}/apache.crt
+configuration-file = ${directory:apache-conf}/apache.conf
+{# By default, if no white list is specified, backend allows access to everyone -#}
+access-control-string = {{ slapparameter_dict.get('access-control-string', 'all') }}
+pid-file = ${basedirectory:run}/apache.pid
+lock-file = ${basedirectory:run}/apache.lock
+ssl-session-cache = ${basedirectory:log}/apache-ssl-session-cache
+error-log = ${basedirectory:log}/apache-error.log
+access-log = ${basedirectory:log}/apache-access.log
+apache-binary = {{ apache_location }}/bin/httpd
+scheme = https
+
+[ca-apache-zope-backend]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+key-file = ${apache-zope-backend-instance:key-file}
+cert-file = ${apache-zope-backend-instance:cert-file}
+executable = ${apache-zope-backend-instance:wrapper}
+wrapper = ${basedirectory:services}/apache
+
+[zope-instance]
+recipe = slapos.cookbook:generic.zope
+
+# Options
+user = zope
+port = 12001
+ip = ${slap-network-information:local-ipv4}
+zodb-cache-size = 5000
+thread-amount = 4
+zodb-path = ${directory:zodb}/main.fs
+deadlock-path = /manage_debug_threads
+
+# Paths
+wrapper = ${basedirectory:services}/zope-development
+instance-path = ${directory:instance}
+instance-etc = ${directory:instance-etc}
+instance-products = ${directory:instance-products}
+bt5-repository = ${rootdirectory:var}/bt5_repository
+tmp-path = ${rootdirectory:tmp}
+bin-path = ${rootdirectory:bin}
+site-zcml = ${:instance-etc}/site.zcml
+logrotate-post = ${rootdirectory:bin}/zope-post-logrotate
+pid-file = ${basedirectory:run}/zope.pid
+lock-file = ${basedirectory:run}/zope.lock
+event-log = ${basedirectory:log}/zope-event.log
+z2-log = ${basedirectory:log}/zope-Z2.log
+configuration-file = ${rootdirectory:etc}/zope.conf
+inituser = ${:instance-path}/inituser
+# Binary information
+runzope-binary = {{ bin_directory }}/runzope
+
+# Defaults
+bt5-repository-list =
+
+[logrotate]
+recipe = slapos.cookbook:logrotate
+# Binaries
+logrotate-binary = {{ logrotate_location }}/usr/sbin/logrotate
+gzip-binary = {{ gzip_location }}/bin/gzip
+gunzip-binary = {{ gzip_location }}/bin/gunzip
+# Directories
+wrapper = ${rootdirectory:bin}/logrotate
+conf = ${rootdirectory:etc}/logrotate.conf
+logrotate-entries = ${directory:logrotate-entries}
+backup = ${directory:logrotate-backup}
+state-file = ${rootdirectory:srv}/logrotate.status
+
+[logrotate-entry-zope]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = zope
+log = ${zope-instance:event-log} ${zope-instance:z2-log}
+frequency = daily
+rotate-num = 30
+post = {{ bin_directory }}/killpidfromfile ${zope-instance:pid-file} SIGUSR2
+sharedscripts = true
+notifempty = true
+create = true
+
+[logrotate-entry-apache-zope-backend]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = zope
+log = ${apache-zope-backend-instance:error-log} ${apache-zope-backend-instance:access-log}
+frequency = daily
+rotate-num = 30
+post = {{ bin_directory }}/killpidfromfile ${apache-zope-backend-instance:pid-file} SIGUSR1
+sharedscripts = true
+notifempty = true
+create = true
+
+[cron]
+recipe = slapos.cookbook:cron
+dcrond-binary = {{ dcron_location }}/sbin/crond
+cron-entries = ${directory:cron-entries}
+crontabs = ${directory:crontabs}
+cronstamps = ${directory:cronstamps}
+catcher = ${cron-simplelogger:wrapper}
+binary = ${basedirectory:services}/crond
+
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = ${rootdirectory:bin}/cron_simplelogger
+log = ${basedirectory:log}/cron.log
+
+[cron-entry-logrotate]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+command = ${logrotate:wrapper}
+
+[binary-link]
+recipe = slapos.cookbook:symbolic.link
+target-directory = ${rootdirectory:bin}
+link-binary =
+  {{ coreutils_location }}/bin/basename
+  {{ coreutils_location }}/bin/cat
+  {{ coreutils_location }}/bin/cp
+  {{ coreutils_location }}/bin/ls
+  {{ coreutils_location }}/bin/tr
+  {{ coreutils_location }}/bin/uname
+  {{ git_location }}/bin/git
+  {{ graphviz_location }}/bin/dot
+  {{ grep_location }}/bin/grep
+  {{ imagemagick_location }}/bin/convert
+  {{ imagemagick_location }}/bin/identify
+  {{ librsvg_location }}/bin/rsvg-convert
+  {{ mariadb_location }}/bin/mysql
+  {{ mariadb_location }}/bin/mysqldump
+  {{ pdftk_location }}/bin/pdftk
+  {{ sed_location }}/bin/sed
+  {{ tesseract_location }}/bin/tesseract
+  {{ w3m_location }}/bin/w3m
+  {{ poppler_location }}/bin/pdfinfo
+  {{ poppler_location }}/bin/pdfseparate
+  {{ poppler_location }}/bin/pdftotext
+  {{ poppler_location }}/bin/pdftohtml
+  {{ poppler_location }}/bin/pdfunite
+  {{ dmtx_utils_location }}/bin/dmtxwrite
+  {{ aspell_location }}/bin/aspell
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = {{ openssl_location }}/bin/openssl
+ca-dir = ${directory:ca-dir}
+requests-directory = ${cadirectory:requests}
+wrapper = ${basedirectory:services}/ca
+ca-private = ${cadirectory:private}
+ca-certs = ${cadirectory:certs}
+ca-newcerts = ${cadirectory:newcerts}
+ca-crl = ${cadirectory:crl}
+
+[bt5-erp5-link]
+recipe = slapos.cookbook:symbolic.link
+target-directory = ${basedirectory:bt5-erp5}
+link-binary =
+  {{ erp5_location }}/product/ERP5/bootstrap
+  {{ erp5_location }}/bt5
+
+[cadirectory]
+recipe = slapos.cookbook:mkdirectory
+requests = ${directory:ca-dir}/requests
+private = ${directory:ca-dir}/private
+certs = ${directory:ca-dir}/certs
+newcerts = ${directory:ca-dir}/newcerts
+crl = ${directory:ca-dir}/crl
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+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
+log = ${rootdirectory:var}/log
+services = ${rootdirectory:etc}/run
+promises = ${rootdirectory:etc}/promise/
+run = ${rootdirectory:var}/run
+backup = ${rootdirectory:srv}/backup
+bt5-erp5 = ${rootdirectory:var}/bt5_erp5
+
+[erp5-certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = {{ openssl_location }}/bin/openssl
+ca-dir = ${directory:erp5-ca-dir}
+requests-directory = ${erp5-cadirectory:requests}
+wrapper = ${basedirectory:services}/erp5-ca
+ca-private = ${erp5-cadirectory:private}
+ca-certs = ${erp5-cadirectory:certs}
+ca-newcerts = ${erp5-cadirectory:newcerts}
+ca-crl = ${erp5-cadirectory:crl}
+
+[erp5-cadirectory]
+recipe = slapos.cookbook:mkdirectory
+requests = ${directory:erp5-ca-dir}/requests
+private = ${directory:erp5-ca-dir}/private
+certs = ${directory:erp5-ca-dir}/certs
+newcerts = ${directory:erp5-ca-dir}/newcerts
+crl = ${directory:erp5-ca-dir}/crl
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+zodb = ${rootdirectory:srv}/zodb
+instance = ${rootdirectory:srv}/erp5shared
+instance-etc = ${:instance}/etc
+apache-conf = ${rootdirectory:etc}/apache
+instance-etc-package-include = ${:instance}/etc/package-include
+# because of bug in slapos.recipe.template keys are lowercased
+instance-document = ${:instance}/Document
+instance-propertysheet = ${:instance}/PropertySheet
+instance-products = ${:instance}/Products
+instance-extensions = ${:instance}/Extensions
+instance-constraint = ${:instance}/Constraint
+instance-import = ${:instance}/import
+instance-lib = ${:instance}/lib
+instance-tests = ${:instance}/tests
+erp5-ca-dir = ${rootdirectory:srv}/erp5-ca
+ca-dir = ${rootdirectory:srv}/ssl
+cron-entries = ${rootdirectory:etc}/cron.d
+crontabs = ${rootdirectory:etc}/crontabs
+cronstamps = ${rootdirectory:etc}/cronstamps
+logrotate-backup = ${basedirectory:backup}/logrotate
+logrotate-entries = ${rootdirectory:etc}/logrotate.d
+
+# Deploy zope promises scripts
+[promise-zope]
+recipe = slapos.cookbook:check_port_listening
+path = ${basedirectory:promises}/zope
+hostname = ${zope-instance:ip}
+port = ${zope-instance:port}
+
+[promise-apache-zope-backend]
+recipe = slapos.cookbook:check_port_listening
+path = ${basedirectory:promises}/apache-backend
+hostname = ${apache-zope-backend-instance:ip}
+port = ${apache-zope-backend-instance:port}
+

stack/erp5/instance.cfg.in

+[buildout]
+parts =
+  switch-softwaretype
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[slap-parameters]
+recipe = slapos.cookbook:slapconfiguration
+computer = ${slap-connection:computer-id}
+partition = ${slap-connection:partition-id}
+url = ${slap-connection:server-url}
+key = ${slap-connection:key-file}
+cert = ${slap-connection:cert-file}
+
+[jinja2-template-base]
+recipe = slapos.recipe.template:jinja2
+rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
+extra-context =
+context =
+    key eggs_directory buildout:eggs-directory
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key slap_software_type slap-parameters:slap-software-type
+    key slapparameter_dict slap-parameters:configuration
+    ${:extra-context}
+
+[dynamic-template-tidstorage-parameters]
+apache = {{ apache_location }}
+haproxy = {{ haproxy_location }}
+dcron = {{ dcron_location }}
+logrotate = {{ logrotate_location }}
+gzip = {{ gzip_location }}
+openssl = {{ openssl_location }}
+coreutils = {{ coreutils_location }}
+git = {{ git_location }}
+graphviz = {{ graphviz_location }}
+grep = {{ grep_location }}
+imagemagick = {{ imagemagick_location }}
+librsvg = {{ librsvg_location }}
+mariadb = {{ mariadb_location }}
+pdftk = {{ pdftk_location }}
+sed = {{ sed_location }}
+tesseract = {{ tesseract_location }}
+w3m = {{ w3m_location }}
+aspell = {{ aspell_location }}
+poppler = {{ poppler_location }}
+dmtx-utils = {{ dmtx_utils_location }}
+buildout-bin-directory = {{ buildout_bin_directory }}
+zope-conf-template = {{ template_zope_conf }}
+
+[dynamic-template-tidstorage]
+< = jinja2-template-base
+template = {{ template_tidstorage }}
+filename = instance-tidstorage.cfg
+extensions = jinja2.ext.do
+extra-context =
+    section parameter_dict dynamic-template-tidstorage-parameters
+    import json_module json
+    raw zope_port_base 12000
+    raw zeo_port_base 15000
+    raw haproxy_port_base 11000
+    raw apache_port_base 10000
+    key ipv4_set slap-parameters:ipv4
+    key ipv6_set slap-parameters:ipv6
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type tidstorage
+
+[dynamic-template-cloudooo-parameters]
+file = {{ file_location }}
+fontconfig = {{ fontconfig_location }}
+freetype = {{ freetype_location }}
+libICE = {{ libICE_location }}
+libpng12 = {{ libpng12_location }}
+libSM = {{ libSM_location }}
+libX11 = {{ libX11_location }}
+libXau = {{ libXau_location }}
+libXdmcp = {{ libXdmcp_location }}
+libXext = {{ libXext_location }}
+libxcb = {{ libxcb_location }}
+libXrender = {{ libXrender_location }}
+zlib = {{ zlib_location }}
+libreoffice-bin = {{ libreoffice_bin_location }}
+fonts = {{ fonts_location }}
+buildout-bin-directory = {{ buildout_bin_directory }}
+
+[dynamic-template-cloudooo]
+< = jinja2-template-base
+template = {{ template_cloudooo }}
+filename = instance-cloudoo.cfg
+extra-context =
+    section parameter_dict dynamic-template-cloudooo-parameters
+    import json_module json
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type cloudooo
+
+[dynamic-template-varnish-parameters]
+dash = {{ dash_location }}
+dcron = {{ dcron_location }}
+gzip =  {{ gzip_location }}
+logrotate = {{ logrotate_location }}
+varnish = {{ varnish_location }}
+wget = {{ wget_location }}
+buildout-bin-directory = {{ buildout_bin_directory }}
+
+[dynamic-template-varnish]
+< = jinja2-template-base
+template = {{ template_varnish }}
+filename = instance-varnish.cfg
+extra-context =
+    section parameter_dict dynamic-template-varnish-parameters
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type varnish
+
+[dynamic-template-zope-parameters]
+apache = {{ apache_location }}
+aspell = {{ aspell_location }}
+bin-directory = {{ bin_directory }}
+coreutils = {{ coreutils_location }}
+dcron = {{ dcron_location }}
+dmtx-utils = {{ dmtx_utils_location }}
+erp5 = {{ erp5_location }}
+git = {{ git_location }}
+graphviz = {{ graphviz_location }}
+grep = {{ grep_location }}
+gzip = {{ gzip_location }}
+imagemagick = {{ imagemagick_location }}
+librsvg = {{ librsvg_location }}
+logrotate = {{ logrotate_location }}
+mariadb = {{ mariadb_location }}
+openssl = {{ openssl_location }}
+pdftk = {{ pdftk_location }}
+poppler = {{ poppler_location }}
+sed = {{ sed_location }}
+tesseract = {{ tesseract_location }}
+w3m = {{ w3m_location }}
+
+[dynamic-template-zope]
+< = jinja2-template-base
+template = {{ template_zope }}
+filename = instance-zope.cfg
+extensions = jinja2.ext.do
+# XXX: duplicates above section, so less is modified in template in this
+# commit. Should be replaced by a single "section" line.
+extra-context =
+    key apache_location dynamic-template-zope-parameters:apache
+    key aspell_location dynamic-template-zope-parameters:aspell
+    key bin_directory dynamic-template-zope-parameters:bin-directory
+    key coreutils_location dynamic-template-zope-parameters:coreutils
+    key dcron_location dynamic-template-zope-parameters:dcron
+    key dmtx_utils_location dynamic-template-zope-parameters:dmtx-utils
+    key erp5_location dynamic-template-zope-parameters:erp5
+    key git_location dynamic-template-zope-parameters:git
+    key graphviz_location dynamic-template-zope-parameters:graphviz
+    key grep_location dynamic-template-zope-parameters:grep
+    key gzip_location dynamic-template-zope-parameters:gzip
+    key imagemagick_location dynamic-template-zope-parameters:imagemagick
+    key librsvg_location dynamic-template-zope-parameters:librsvg
+    key logrotate_location dynamic-template-zope-parameters:logrotate
+    key mariadb_location dynamic-template-zope-parameters:mariadb
+    key openssl_location dynamic-template-zope-parameters:openssl
+    key pdftk_location dynamic-template-zope-parameters:pdftk
+    key poppler_location dynamic-template-zope-parameters:poppler
+    key sed_location dynamic-template-zope-parameters:sed
+    key tesseract_location dynamic-template-zope-parameters:tesseract
+    key w3m_location dynamic-template-zope-parameters:w3m
+
+[template-erp5-development-parameters]
+bin-directory = {{ bin_directory }}
+openssl = {{ openssl_location }}
+local_bt5_repository = {{ local_bt5_repository  }}
+dash = {{ dash_location }}
+curl = {{ curl_location }}
+
+[template-erp5-development]
+< = jinja2-template-base
+template = {{ template_erp5_development }}
+filename = instance-erp5-development.cfg
+# XXX: duplicates above section, so less is modified in template in this
+# commit. Should be replaced by a "section" line (preserving template_zope
+# definition).
+extra-context =
+    key bin_directory template-erp5-development-parameters:bin-directory
+    key openssl_location template-erp5-development-parameters:openssl
+    key curl_location template-erp5-development-parameters:curl
+    key dash_location template-erp5-development-parameters:dash
+    key template_zope dynamic-template-zope:rendered
+    key local_bt5_repository template-erp5-development-parameters:local_bt5_repository
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${template-erp5-development:rendered}
+production = {{ template_erp5_production }}
+kumofs = {{ template_kumofs }}
+memcached = {{ template_memcached }}
+cloudooo = ${dynamic-template-cloudooo:rendered}
+zope = ${dynamic-template-zope:rendered}
+mariadb = {{ template_mariadb }}
+sphinx = {{ template_sphinx }}
+tidstorage = ${dynamic-template-tidstorage:rendered}
+varnish = ${dynamic-template-varnish:rendered}
+
+[slap-connection]
+# part to migrate to new - separated words
+computer-id = ${slap_connection:computer_id}
+partition-id = ${slap_connection:partition_id}
+server-url = ${slap_connection:server_url}
+software-release-url = ${slap_connection:software_release_url}
+key-file = ${slap_connection:key_file}
+cert-file = ${slap_connection:cert_file}

stack/erp5/zope.conf.in

+# Note: Environment is setup in running wrapper script, as zope.conf is read
+# too late for some components.
+%define INSTANCE {{ instance }}
+instancehome $INSTANCE
+zserver-threads {{ parameter_dict['thread-amount'] }}
+
+lock-filename {{ parameter_dict['lock-file'] }}
+pid-filename {{ parameter_dict['pid-file'] }}
+
+default-zpublisher-encoding utf-8
+rest-input-encoding utf-8
+rest-output-encoding utf-8
+
+# XXX: isn't this entry implicit ?
+products {{ instance_products }}
+
+<http-server>
+  address {{ parameter_dict['ip'] }}:{{ parameter_dict['port'] }}
+</http-server>
+
+{# TODO: enable
+{% if webdav_port -%}
+<webdav-source-server>
+  address {{ parameter_dict['ip'] }}:{{ parameter_dict['webdav_port'] }}
+  force-connection-close off
+</webdav-source-server>
+
+{% endif -%}
+-#}
+<zoperunner>
+    program $INSTANCE/bin/runzope
+</zoperunner>
+
+<product-config DeadlockDebugger>
+  dump_url /manage_debug_threads
+  secret {{ deadlock_debugger_password }}
+</product-config>
+
+{% if tidstorage_ip -%}
+<product-config TIDStorage>
+  backend-ip {{ tidstorage_ip }}
+  backend-port {{ tidstorage_port }}
+</product-config>
+
+{% endif -%}
+{% if 'timerserver-interval' in parameter_dict -%}
+%import timerserver
+<timer-server>
+  interval {{ parameter_dict['timerserver-interval'] }}
+</timer-server>
+
+{% endif -%}
+{% if promise_path -%}
+<product-config /{{ parameter_dict['site-id'] }}>
+  promise_path {{ promise_path }}
+</product-config>
+
+{% endif -%}
+<eventlog>
+  level info
+  <logfile>
+    dateformat
+    path {{ parameter_dict['event-log'] }}
+  </logfile>
+</eventlog>
+
+<logger access>
+  level WARN
+  <logfile>
+    dateformat
+    path {{ parameter_dict['z2-log'] }}
+  </logfile>
+</logger>
+
+<zodb_db temporary>
+  <temporarystorage>
+    name temporary storage for sessioning
+  </temporarystorage>
+  mount-point /temp_folder
+  container-class Products.TemporaryFolder.TemporaryContainer
+</zodb_db>
+
+{% for db_name, mount_point, cache_size, storage_type, storage_dict in parameter_dict['zodb-list'] -%}
+<zodb_db {{ db_name }}>
+{%-   if cache_size %}
+  cache-size {{ cache_size }}
+{%-   endif %}
+  mount-point {{ mount_point }}
+  <{{ storage_type }}>
+{%-   for key, value in storage_dict.iteritems() %}
+    {{ key }} {{ value }}
+{%-   endfor %}
+  </{{ storage_type }}>
+</zodb_db>
+
+{% endfor -%}

stack/flask.cfg

 # Stack for Flask microframework: http://flask.pocoo.org/
 [buildout]
 extends =
-  ../component/python-2.7/buildout.cfg
-  ../component/lxml-python/buildout.cfg
-
-# Use only quite well working sites.
-allow-hosts =
-  *.nexedi.org
-  *.python.org
-  *.sourceforge.net
-  dist.repoze.org
-  effbot.org
-  github.com
-  peak.telecommunity.com
-  psutil.googlecode.com
-  www.dabeaz.com
+  slapos.cfg
 
 parts =
-  eggs
-
-# Unzip, as Flask can have a lot of troubles with zipped eggs
-unzip = true
+  slapos-cookbook
+  flask-egg
 
-[eggs]
-python = python2.7
+[flask-egg]
 recipe = zc.recipe.egg
 eggs =
-  ${lxml-python:egg}
   Flask
-  slapos.cookbook
-
-[lxml-python]
-python = python2.7

stack/lamp.cfg

+# Warning: this file is deprecated and is here only for compatiblity.
+# If you extend this file, you should probably extend stack/lamp/buildout.cfg
+# Instead.
+
+# Only reason to use this file is when your PHP application uses "delete",
+# "rename" or any feature of lampconfigure (not yet ported to new stack).
+
 [buildout]
 parts =
   template
@@ -20,9 +27,6 @@ extends =
   ../component/pycrypto-python/buildout.cfg
   ../component/mysql-python/buildout.cfg
   ../stack/slapos.cfg
-  ../component/python-2.7/buildout.cfg
-# python-2.7 component is here only for compatibility with old software.cfg.
-# It is not needed and should not be used in LAMP-based software.cfg
 
 [eggs]
 recipe = zc.recipe.egg
@@ -34,7 +38,8 @@ eggs =
 keep-compile-dir = false
 
 [networkcache]
-# Romain Courteaud + Sebastien Robin + Alain Takoudjou signature certificate
+# Romain Courteaud + Sebastien Robin + Alain Takoudjou
+# + Cedric de Saint Martin signature certificate
 signature-certificate-list =
   -----BEGIN CERTIFICATE-----
   MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
@@ -75,6 +80,19 @@ signature-certificate-list =
   dOSJ86sf/PQHW3/1fhTTE+Vck1MiiAq0aIx6WnKnz4+ZcQctB7b0DCsTcQnmbpi2
   n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR
   -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----
 
 [versions]
 # Generated automatically by buildout-versions

stack/lamp/buildout.cfg

@@ -19,6 +19,7 @@ extends =
   ../../component/mariadb/buildout.cfg
   ../../component/apache/buildout.cfg
   ../../component/apache-php/buildout.cfg
+  ../../component/dash/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/glib/buildout.cfg
@@ -34,11 +35,8 @@ extends =
   ../../component/mysql-python/buildout.cfg
   ../../component/dropbear/buildout.cfg
   ../slapos.cfg
-  ../../component/python-2.7/buildout.cfg
-# python-2.7 component is here only for compatibility with old software.cfg.
-# It is not needed and should not be used in LAMP-based software.cfg
-
-versions = versions
+  ../../component/dash/buildout.cfg
+  ../../component/curl/buildout.cfg
 
 [mariadb]
 # Compile dir is for plugins, there's no plugin in LAMP
@@ -68,7 +66,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-php.cfg
 output = ${buildout:directory}/template-apache-php.cfg
-md5sum = 8ebed1e26127c066e5b69372e69e6c38
+md5sum = 8bb0b03689d2be9566ed1ef3e96b4403
 mode = 0644
 
 [template-apache-backup]
@@ -89,7 +87,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
 output = ${buildout:directory}/template-mariadb.cfg
-md5sum = 70ab558c2e925c3627c39fbc20a7501c
+md5sum = ba5ebecbfe9fbb96d48f2baa43c37065  
 mode = 0644
 
 [template-mariadb-pbsready]
@@ -120,8 +118,254 @@ output = ${buildout:directory}/template-pull-backup.cfg
 md5sum = 9aab30ba5aa23a37d4b507e7c414be00
 mode = 0644
 
+# Dummy parts in case no application configuration file is needed
+[application-template]
+filename =
+location =
+
+[application-configuration]
+location =
+
 [eggs]
 recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
   slapos.toolbox
+
+[networkcache]
+# Romain Courteaud + Sebastien Robin + Alain Takoudjou
+# + Cedric de Saint Martin signature certificate
+# List of signatures of uploaders we trust:
+#   Romain Courteaud
+#   Sebastien Robin
+#   Kazuhiko Shiozaki
+#   Cedric de Saint Martin
+#   Yingjie Xu
+#   Gabriel Monnerat
+#   Łukasz Nowak
+#   Test Agent Signature
+#   Alain Takoudjou
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
+  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
+  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
+  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
+  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
+  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
+  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
+  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
+  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
+  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
+  QUUGLQ==
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
+  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
+  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
+  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
+  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
+  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
+  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
+  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
+  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
+  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
+  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
+  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
+  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
+  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
+  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
+  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
+  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
+  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
+  vaZhjNYKWQf79l6zXfOvphzJ
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
+  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
+  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
+  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
+  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
+  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
+  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
+  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
+  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
+  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
+  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
+  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
+  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
+  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
+  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
+  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
+  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
+  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
+  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
+  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
+  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
+  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
+  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
+  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
+  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
+  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
+  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
+  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
+  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
+  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
+  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
+  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
+  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9DCCAV2gAwIBAgIJAL392bEdqpFQMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjM0MB4XDTExMTEwOTE1MzA0M1oXDTEyMTEwODE1MzA0M1owEzER
+  MA8GA1UEAwwIQ09NUC0yMzQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMRR
+  T0cacZKztie/DaRRjq3mgcqfPKoGXu6zXmeRQI+6Y4bnzjf8h/jAuPzR552P0xK5
+  psxhavXA8hOGRLFDtvDMQLepVHWfwqtFtcp5vNf2+KWqOYy0OxHfVIlnatvCqTZN
+  NG1vRsSOAQ+v7QNFHh6NBbiSrjBBfg4vkfzqnsUvAgMBAAGjUDBOMB0GA1UdDgQW
+  BBTGGw+ASoDi9kqPElDkC0Q5RtAfRjAfBgNVHSMEGDAWgBTGGw+ASoDi9kqPElDk
+  C0Q5RtAfRjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAIOuR1OqXLke
+  LLzH0kRnlIOe60dYJvRya53wDx5x2g4/qkXZPLx2RcbaUrX/SCbL70vfr+apUPss
+  dOSJ86sf/PQHW3/1fhTTE+Vck1MiiAq0aIx6WnKnz4+ZcQctB7b0DCsTcQnmbpi2
+  n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR
+  -----END CERTIFICATE-----
+
+[versions]
+Jinja2 = 2.6
+Pygments = 1.5
+Werkzeug = 0.8.3
+apache-libcloud = 0.11.1
+async = 0.6.1
+buildout-versions = 1.7
+docutils = 0.9.1
+gitdb = 0.5.4
+hexagonit.recipe.cmmi = 1.6
+ipython = 0.13
+meld3 = 0.6.8
+pycrypto = 2.6
+rdiff-backup = 1.0.5
+slapos.cookbook = 0.60
+slapos.recipe.build = 0.10.2
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.4.1
+slapos.toolbox = 0.28
+smmap = 0.8.2
+
+# Required by:
+# slapos.core==0.27
+# slapos.toolbox==0.28
+Flask = 0.9
+
+# Required by:
+# slapos.toolbox==0.28
+GitPython = 0.3.2.RC1
+
+# Required by:
+# slapos.cookbook==0.60
+PyXML = 0.8.4
+
+# Required by:
+# netaddr==0.7.7
+Sphinx = 1.1.3
+
+# Required by:
+# slapos.toolbox==0.28
+atomize = 0.1.1
+
+# Required by:
+# slapos.toolbox==0.28
+feedparser = 5.1.2
+
+# Required by:
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.5.1
+
+# Required by:
+# slapos.cookbook==0.60
+inotifyx = 0.2.0
+
+# Required by:
+# slapos.cookbook==0.60
+# slapos.core==0.27
+# xml-marshaller==0.9.7
+lxml = 2.3.5
+
+# Required by:
+# slapos.cookbook==0.60
+netaddr = 0.7.7
+
+# Required by:
+# slapos.core==0.27
+netifaces = 0.8
+
+# Required by:
+# slapos.toolbox==0.28
+paramiko = 1.7.7.2
+
+# Required by:
+# slapos.toolbox==0.28
+psutil = 0.6.0
+
+# Required by:
+# slapos.cookbook==0.60
+# slapos.core==0.27
+# slapos.toolbox==0.28
+# zc.buildout==1.6.0-dev-SlapOS-006
+# zc.recipe.egg==1.3.2
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.60
+# slapos.toolbox==0.28
+slapos.core = 0.27
+
+# Required by:
+# slapos.core==0.27
+supervisor = 3.0a12
+
+# Required by:
+# slapos.cookbook==0.60
+# slapos.toolbox==0.28
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.cookbook==0.60
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.27
+zope.interface = 4.0.1

stack/lamp/instance-apache-php.cfg

 [buildout]
 
 parts =
-  url
-  request-mariadb
-  apache-php
-  stunnel
   certificate-authority
   ca-stunnel
   logrotate
@@ -13,61 +9,45 @@ parts =
   cron
   cron-entry-logrotate
   promise
+  slapmonitor
+  slapreport
+  frontend-promise
+  publish-connection-informations
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-[url]
-recipe = slapos.cookbook:publishurl
-url = http://[$${apache-php:ip}]:$${apache-php:port}/
 
-[promise]
-recipe = slapos.cookbook:check_port_listening
-path = $${basedirectory:promises}/apache
-hostname = $${apache-php:ip}
-port = $${apache-php:port}
-
-[mariadb-urlparse]
-recipe = slapos.cookbook:urlparse
-url = $${request-mariadb:connection-url}
-
-[apache-php]
-recipe = slapos.cookbook:apachephp
-source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
-
-htdocs = $${directory:htdocs}
-pid-file = $${basedirectory:run}/apache.pid
-lock-file = $${basedirectory:run}/apache.lock
-ip = $${slap-network-information:global-ipv6}
-port = 8080
-error-log = $${directory:httpd-log}/error.log
-access-log = $${directory:httpd-log}/access.log
-php-ini-dir = $${directory:php-ini-dir}
-tmp-dir = $${directory:tmp-php}
-httpd-conf = $${rootdirectory:etc}/apache.conf
-wrapper = $${basedirectory:services}/apache
-
-httpd-binary = ${apache:location}/bin/httpd
+# Creation of all needed directories
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+var = $${buildout:directory}/var/
+srv = $${buildout:directory}/srv/
+bin = $${buildout:directory}/bin/
+tmp = $${buildout:directory}/tmp/
 
-mysql-username = $${mariadb-urlparse:username}
-mysql-password = $${mariadb-urlparse:password}
-mysql-database = $${mariadb-urlparse:path}
-mysql-host = $${stunnel:local-host}
-mysql-port = $${stunnel:local-port}
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = $${rootdirectory:var}/log/
+services = $${rootdirectory:etc}/run/
+run = $${rootdirectory:var}/run/
+backup = $${rootdirectory:srv}/backup/
+promises = $${rootdirectory:etc}/promise/
 
-[certificate-authority]
-recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
-ca-dir = $${directory:ca-dir}
-requests-directory = $${cadirectory:requests}
-wrapper = $${basedirectory:services}/ca
-ca-private = $${cadirectory:private}
-ca-certs = $${cadirectory:certs}
-ca-newcerts = $${cadirectory:newcerts}
-ca-crl = $${cadirectory:crl}
+[directory]
+recipe = slapos.cookbook:mkdirectory
+ca-dir = $${rootdirectory:srv}/ssl/
+httpd-log = $${basedirectory:log}/apache/
+php-ini-dir = $${rootdirectory:etc}/php/
+tmp-php = $${rootdirectory:tmp}/php/
+logrotate-entries = $${rootdirectory:etc}/logrotate.d/
+logrotate-backup = $${basedirectory:backup}/logrotate/
+stunnel-conf = $${rootdirectory:etc}/stunnel/
+cronstamps = $${rootdirectory:etc}/cronstamps/
+cron-entries = $${rootdirectory:etc}/cron.d/
+crontabs = $${rootdirectory:etc}/crontabs/
 
 [cadirectory]
 recipe = slapos.cookbook:mkdirectory
@@ -77,14 +57,8 @@ certs = $${directory:ca-dir}/certs/
 newcerts = $${directory:ca-dir}/newcerts/
 crl = $${directory:ca-dir}/crl/
 
-[ca-stunnel]
-<= certificate-authority
-recipe = slapos.cookbook:certificate_authority.request
-executable = $${stunnel:wrapper}
-wrapper = $${basedirectory:services}/stunnel
-key-file = $${stunnel:key-file}
-cert-file = $${stunnel:cert-file}
 
+# Deploy stunnel
 [stunnel]
 recipe = slapos.cookbook:stunnel
 client = true
@@ -92,7 +66,7 @@ stunnel-binary = ${stunnel:location}/bin/stunnel
 remote-host = $${mariadb-urlparse:host}
 remote-port = $${mariadb-urlparse:port}
 local-host = $${slap-network-information:local-ipv4}
-local-port = 3306
+local-port = 33060
 log-file = $${basedirectory:log}/stunnel.log
 config-file = $${directory:stunnel-conf}/stunnel.conf
 key-file = $${directory:stunnel-conf}/stunnel.key
@@ -101,6 +75,29 @@ pid-file = $${basedirectory:run}/stunnel.pid
 wrapper = $${rootdirectory:bin}/raw_stunnel
 post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate
 
+
+# Certificate stuffs
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = ${openssl:location}/bin/openssl
+ca-dir = $${directory:ca-dir}
+requests-directory = $${cadirectory:requests}
+wrapper = $${basedirectory:services}/ca
+ca-private = $${cadirectory:private}
+ca-certs = $${cadirectory:certs}
+ca-newcerts = $${cadirectory:newcerts}
+ca-crl = $${cadirectory:crl}
+
+[ca-stunnel]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+executable = $${stunnel:wrapper}
+wrapper = $${basedirectory:services}/stunnel
+key-file = $${stunnel:key-file}
+cert-file = $${stunnel:cert-file}
+
+
+# Request MariaDB instance and parse its URL
 [request-mariadb]
 <= slap-connection
 recipe = slapos.cookbook:request
@@ -109,6 +106,41 @@ software-url = $${slap-connection:software-release-url}
 software-type = mariadb
 return = url
 
+[mariadb-urlparse]
+recipe = slapos.cookbook:urlparse
+url = $${request-mariadb:connection-url}
+
+
+# Deploy Apache + PHP application
+[apache-php]
+recipe = slapos.cookbook:apachephp
+source = ${application:location}
+template = ${application-template:location}/${application-template:filename}
+configuration = ${application-configuration:location}
+
+htdocs = $${rootdirectory:srv}/www/
+pid-file = $${basedirectory:run}/apache.pid
+lock-file = $${basedirectory:run}/apache.lock
+ip = $${slap-network-information:global-ipv6}
+port = 8080
+url = http://[$${:ip}]:$${:port}/
+error-log = $${directory:httpd-log}/error.log
+access-log = $${directory:httpd-log}/access.log
+php-ini-dir = $${directory:php-ini-dir}
+tmp-dir = $${directory:tmp-php}
+httpd-conf = $${rootdirectory:etc}/apache.conf
+wrapper = $${basedirectory:services}/apache
+
+httpd-binary = ${apache:location}/bin/httpd
+
+mysql-username = $${mariadb-urlparse:username}
+mysql-password = $${mariadb-urlparse:password}
+mysql-database = $${mariadb-urlparse:path}
+mysql-host = $${stunnel:local-host}
+mysql-port = $${stunnel:local-port}
+
+
+# Deploy logrotate, cron, configure it
 [logrotate]
 recipe = slapos.cookbook:logrotate
 # Binaries
@@ -144,6 +176,11 @@ notifempty = true
 create = true
 post = $${stunnel:post-rotate-script}
 
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = $${rootdirectory:bin}/cron_simplelogger
+log = $${basedirectory:log}/crond.log
+
 [cron]
 recipe = slapos.cookbook:cron
 dcrond-binary = ${dcron:location}/sbin/crond
@@ -153,11 +190,6 @@ cronstamps = $${directory:cronstamps}
 catcher = $${cron-simplelogger:wrapper}
 binary = $${basedirectory:services}/crond
 
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/crond.log
-
 [cron-entry-logrotate]
 <= cron
 recipe = slapos.cookbook:cron.d
@@ -165,32 +197,71 @@ name = logrotate
 frequency = 0 0 * * *
 command = $${logrotate:wrapper}
 
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-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
-log = $${rootdirectory:var}/log/
-services = $${rootdirectory:etc}/run/
-run = $${rootdirectory:var}/run/
-backup = $${rootdirectory:srv}/backup/
-promises = $${rootdirectory:etc}/promise/
+# Request frontend
+[request-frontend]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = Frontend
+# 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 custom_domain
+config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
+return = site_url
+config-custom_domain = $${slap-parameter:domain}
 
-[directory]
-recipe = slapos.cookbook:mkdirectory
-ca-dir = $${rootdirectory:srv}/ssl/
-htdocs = $${rootdirectory:srv}/www/
-httpd-log = $${basedirectory:log}/apache/
-php-ini-dir = $${rootdirectory:etc}/php/
-tmp-php = $${rootdirectory:tmp}/php/
-logrotate-entries = $${rootdirectory:etc}/logrotate.d/
-logrotate-backup = $${basedirectory:backup}/logrotate/
-stunnel-conf = $${rootdirectory:etc}/stunnel/
-cronstamps = $${rootdirectory:etc}/cronstamps/
-cron-entries = $${rootdirectory:etc}/cron.d/
-crontabs = $${rootdirectory:etc}/crontabs/
+
+# Deploy slapmonitor
+[slapmonitor]
+recipe = slapos.cookbook:slapmonitor
+pid-file = $${basedirectory:run}/apache.pid
+database-path = $${basedirectory:log}/slapmonitor.db
+shell-path = ${dash:location}/bin/dash
+slapmonitor-path = ${buildout:bin-directory}/slapmonitor
+path = $${basedirectory:services}/slapmonitor
+
+[slapreport]
+recipe = slapos.cookbook:slapreport
+pid-file = $${basedirectory:run}/apache.pid
+database-path = $${basedirectory:log}/slapmonitor.db
+consumption-log-path = $${basedirectory:log}/instance_consumption.log
+logbox-ip = 87.98.152.12
+logbox-port = 5122
+logbox-user = admin
+logbox-passwd = passer
+shell-path = ${dash:location}/bin/dash
+slapreport-path = ${buildout:bin-directory}/slapreport
+path = $${basedirectory:services}/slapreport
+
+
+# Publish all instance parameters (url of instance)
+[publish-connection-informations]
+recipe = slapos.cookbook:publish
+backend_url = $${apache-php:url}
+url = $${request-frontend:connection-site_url}
+
+
+# Deploy promises scripts
+[promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${basedirectory:promises}/apache
+hostname = $${apache-php:ip}
+port = $${apache-php:port}
+
+[frontend-promise]
+recipe = slapos.cookbook:check_url_available
+path = $${basedirectory:promises}/frontend
+url = $${request-frontend:connection-site_url}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+
+
+[slap-parameter]
+# Default value if no domain is specified
+domain =
+# Default value if no ssh parameter is specified
+logbox-ip =
+logbox-port =
+logbox-user =
+logbox-passwd =

stack/lamp/instance-mariadb.cfg

@@ -11,6 +11,8 @@ parts =
   logrotate-entry-cron
   cron
   cron-entry-logrotate
+  slapmonitor
+  slapreport
 
 gzip-binary = ${gzip:location}/bin/gzip
 
@@ -44,11 +46,32 @@ conf-file = $${rootdirectory:etc}/mariadb.cnf
 promise = $${basedirectory:promises}/mysql
 
 # Binary information
+mysql-base-directory = ${mariadb:location}
 mysql-binary = ${mariadb:location}/bin/mysql
-mysql-install-binary = ${mariadb:location}/bin/mysql_install_db
+mysql-install-binary = ${mariadb:location}/scripts/mysql_install_db
 mysql-upgrade-binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld-binary = ${mariadb:location}/libexec/mysqld
+mysqld-binary = ${mariadb:location}/bin/mysqld
 
+[slapmonitor]
+recipe = slapos.cookbook:slapmonitor
+pid-file = $${basedirectory:run}/mariadb.pid
+database-path = $${basedirectory:log}/slapmonitor.db
+shell-path = ${dash:location}/bin/dash
+slapmonitor-path = ${buildout:bin-directory}/slapmonitor
+path = $${basedirectory:services}/slapmonitor
+
+[slapreport]
+recipe = slapos.cookbook:slapreport
+pid-file = $${basedirectory:run}/mariadb.pid
+consumption-log-path = $${basedirectory:log}/instance_consumption.log
+database-path = $${basedirectory:log}/slapmonitor.db
+logbox-ip = 87.98.152.12
+logbox-port = 5122
+logbox-user = admin
+logbox-passwd = passer
+shell-path = ${dash:location}/bin/dash
+slapreport-path = ${buildout:bin-directory}/slapreport
+path = $${basedirectory:services}/slapreport
 
 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
@@ -185,3 +208,10 @@ mariadb-data = $${rootdirectory:srv}/mariadb/
 logrotate-backup = $${basedirectory:backup}/logrotate/
 stunnel-conf = $${rootdirectory:etc}/stunnel/
 logrotate-entries = $${rootdirectory:etc}/logrotate.d/
+
+[slap-parameter]
+#Default  value if no ssh parameters specified
+logbox-ip =
+logbox-port =
+logbox-user =
+logbox-passwd =

stack/nbd.cfg

-[buildout]
-extends =
-  ../component/python-2.6/buildout.cfg
-  ../component/lxml-python/buildout.cfg
-  ../component/zlib/buildout.cfg
-  ../component/git/buildout.cfg
-
-# Python2.6 needed by Flask and pyopenssl
-extensions =
-  slapos.rebootstrap
-
-parts +=
-  nbdserver
-  pyOpenSSL-python
-  eggs
-
-find-links +=
-  http://www.nexedi.org/static/packages/source/slapos.buildout/
-
-versions = versions
-
-# Use only quite well working sites.
-allow-hosts =
-  *.nexedi.org
-  *.python.org
-  *.sourceforge.net
-  dist.repoze.org
-  effbot.org
-  github.com
-  peak.telecommunity.com
-  psutil.googlecode.com
-  www.dabeaz.com
-
-[rebootstrap]
-section = python2.6
-version = 3
-eggs = slapos.libnetworkcache
-
-[nbdserver]
-# XXX-Cedric : use official tarball from kvm website
-#              (new kvm code does not seem to need special patch)
-recipe = hexagonit.recipe.cmmi
-path = ${nbdserversource:location}/
-configure-options =
-  --disable-system
-  --disable-kvm
-  --extra-cflags="-I${zlib:location}/include"
-  --extra-ldflags="-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib"
-  --disable-werror
-
-[nbdserversource]
-recipe=plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-command =
-  (${git:location}/bin/git clone --quiet http://git.erp5.org/repos/slapos.kvm.git ${:location} ) || (rm -fr ${:location} ; exit 1)
-update-command =
- cd ${:location} && ${git:location}/bin/git pull --quiet origin master
-
-[instance-recipe]
-egg = slapos.cookbook
-module = nbdserver
-
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-  ${lxml-python:egg}
-  slapos.toolbox
-  slapos.cookbook
-  pyOpenSSL
-
-[pyOpenSSL-python]
-recipe = zc.recipe.egg:custom
-egg = pyOpenSSL
-include-dirs =
-  ${openssl:location}/include/
-  ${python2.6:location}/include/
-library-dirs =
-  ${openssl:location}/lib/
-  ${python2.6:location}/lib/
-rpath =
-  ${openssl:location}/lib/
-  ${python2.6:location}/lib/
-
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-005
-
-Jinja2 = 2.5.5
-Werkzeug = 0.6.2
-apache-libcloud = 0.5.2
-hexagonit.recipe.cmmi = 1.5.0
-meld3 = 0.6.7
-plone.recipe.command = 1.1
-pyOpenSSL = 0.12
-pycrypto = 2.3
-slapos.cookbook = 0.14
-slapos.recipe.template = 1.1
-slapos.toolbox = 0.6
-
-# Required by:
-# slapos.core==0.9
-# slapos.toolbox==0.6
-Flask = 0.7.2
-
-# Required by:
-# slapos.cookbook==0.14
-PyXML = 0.8.4
-
-# Required by:
-# slapos.core==0.9
-argparse = 1.1
-
-# Required by:
-# slapos.recipe.template==1.1
-collective.recipe.template = 1.8
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# Required by:
-# slapos.cookbook==0.14
-# slapos.core==0.9
-# slapos.toolbox==0.6
-# xml-marshaller==0.9.7
-lxml = 2.3
-
-# Required by:
-# slapos.cookbook==0.14
-netaddr = 0.7.5
-
-# Required by:
-# slapos.core==0.9
-netifaces = 0.4
-
-# Required by:
-# slapos.toolbox==0.6
-paramiko = 1.7.7.1
-
-# Required by:
-# slapos.toolbox==0.6
-psutil = 0.3.0
-
-# Required by:
-# slapos.cookbook==0.14
-# slapos.core==0.9
-# slapos.toolbox==0.6
-# zc.buildout==1.5.3-dev-SlapOS-005
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
-
-# Required by:
-# slapos.cookbook==0.14
-# slapos.toolbox==0.6
-slapos.core = 0.9
-
-# Required by:
-# slapos.core==0.9
-supervisor = 3.0a10
-
-# Required by:
-# slapos.cookbook==0.14
-# slapos.toolbox==0.6
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.14
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.9
-zope.interface = 3.6.4

stack/nodejs.cfg

 [buildout]
 extends =
   ../component/nodejs/buildout.cfg
-  ../component/lxml-python/buildout.cfg
   ../stack/slapos.cfg
 
-versions = versions
-
 parts =
-  eggs
   nodejs
-  npm
-
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-  slapos.cookbook
-  ${lxml-python:egg}

stack/shacache-client.cfg

+# This file is deprecated. Please use stack/slapos.cfg instead.
 [buildout]
 networkcache-section = networkcache
 

stack/slapos.cfg

@@ -2,13 +2,16 @@
 # Software Releases or Stacks can safely extend this stack.
 
 [buildout]
+# Developers need to add explicitely this part in their software profile
+parts = slapos-cookbook
+
 # Generate list of automatically chosen eggs version
 extensions +=
   buildout-versions
 
-# Use shacache
+# Use shacache and lxml
 extends =
-  shacache-client.cfg
+  ../component/lxml-python/buildout.cfg
 
 # Separate from site eggs
 allowed-eggs-from-site-packages =
@@ -25,26 +28,40 @@ allow-hosts +=
   *.nexedi.org
   *.python.org
   *.sourceforge.net
-#  alastairs-place.net
+  alastairs-place.net
+  bitbucket.org
   dist.repoze.org
   effbot.org
   github.com
+  launchpad.net
   peak.telecommunity.com
   psutil.googlecode.com
+  sourceforge.net
   www.dabeaz.com
   www.owlfish.com
-  launchpad.net
 
 # XXX: Workaround of SlapOS limitation
 # Unzippig of eggs is required, as SlapOS do not yet provide nicely working
 # development / fast switching environment for whole software
 unzip = true
 
+# Define where is defined what version of eggs we should use
 versions = versions
 
+# Define networkcache with shacache.org
+networkcache-section = networkcache
+
+# Install slapos.cookbook containing all officials recipes
+[slapos-cookbook]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  slapos.cookbook
+
 [versions]
-# Use patched hexagonit.recipe.download from
-# https://github.com/SlapOS/hexagonit.recipe.download
-hexagonit.recipe.download = 1.5.1-dev-slapos-001
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-004
+zc.buildout = 1.6.0-dev-SlapOS-006
+
+[networkcache]
+download-cache-url = http://www.shacache.org/shacache
+download-dir-url = http://www.shacache.org/shadir