Merge branch 'erp5-component' into erp5-component-z2.13

Conflicts:
	stack/erp5/buildout.cfg

CHANGES.txt

 Changes
 =======
 
-0.59 (Unreleased)
+0.66 (2012-09-10)
 -----------------
 
+  * Add check_page_content promise generator. [Cedric Le Ninivin]
+
+0.65 (2012-09-07)
+-----------------
+
+  * Add egg_test, recipe allowing to do "python setup.py test" on a list of
+    eggs. [Rafael Monnerat, Cedric de Saint Martin]
+
+0.64.2 (2012-08.28)
+-------------------
+
+  * Specify description on gitinit recipe. [Antoine Catton]
+
+0.64.1 (2012-08-28)
+-------------------
+
+  * Fix: minor fix on downloader recipe in order to allow cross-device renaming.
+    [Antoine Catton]
+
+0.64 (2012-08-27)
+----------------
+
+  * Fix: remove "template" recipe which was collinding with slapos.recipe.template.
+    [Antoine Catton]
+
+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)
 -----------------

component/6tunnel/buildout.cfg

+# 6tunnel - Tunnelling for application that don't speak IPv6
+# http://toxygen.net/6tunnel/
+
+[buildout]
+parts = 6tunnel
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+
+[6tunnel]
+recipe = hexagonit.recipe.cmmi
+url = http://toxygen.net/6tunnel/6tunnel-0.11rc2.tar.gz
+md5sum = 74e02d4f0704b3083a01feda66033449
+configure-command =
+  aclocal
+  autoheader
+  automake --foreign
+  autoconf
+  ./configure
+configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+environment =
+  PATH=${autoconf:location}/bin:${automake:location}/bin:%(PATH)s

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/busybox/buildout.cfg

 [buildout]
-extends =
-  ../patch/buildout.cfg
 
-# https://bugs.busybox.net/show_bug.cgi?id=4838
-[busybox-1.19.3.packed_hack.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = faa5ce46be086763202d7ca24601fbde
-filename = busybox-1.19.3.packed_hack.patch
-download-only = true
+parts = busybox
 
 [busybox]
 recipe = slapos.recipe.build
-url = http://busybox.net/downloads/busybox-1.19.4.tar.bz2
-md5sum = 9c0cae5a0379228e7b55e5b29528df8e
-patch-binary = ${patch:location}/bin/patch
-patch-options = -p1
-patches =
-  ${busybox-1.19.3.packed_hack.patch:location}/${busybox-1.19.3.packed_hack.patch:filename}
+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)
-    self.applyPatchList(self.options.get('patches'), self.options.get('patch-options'), self.options.get('patch-binary'), workdir)
-    call(['patch', 'defconfig'], cwd=workdir, env=env)
     self.logger.info("Creating default configuration")
     call(['make', 'defconfig'], cwd=workdir, env=env)
     self.logger.info("Building")

component/busybox/busybox-1.19.3.packed_hack.patch

-diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
-index 2a426db..35f44ac 100644
---- a/miscutils/ubi_tools.c
-+++ b/miscutils/ubi_tools.c
-@@ -60,6 +60,16 @@
- //kbuild:lib-$(CONFIG_UBIUPDATEVOL) += ubi_tools.o
- 
- #include "libbb.h"
-+#if 1
-+// __packed hack for broken kernel headers ubi-user.h
-+// See: https://lkml.org/lkml/2011/6/22/25
-+//   Once ubi-user.h is correctly installed without "__packed", or kernel
-+//   guys correct this another way (with a compiler header??), this can
-+//   go away.
-+# ifndef __packed
-+#  define __packed __attribute__((packed))
-+# endif // ndef __packed
-+#endif // 1
- #include <mtd/ubi-user.h>
- 
- #define OPTION_M  (1 << 0)

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

@@ -16,26 +16,41 @@ parts =
 
 [node-sm]
 recipe = slapos.recipe.build:npm
-packages = sm
+packages = sm@0.2.7
 node = nodejs
 environment =
   PATH=${nodejs:location}/bin:%(PATH)s
 
-[cloud9-git]
+[cloud9-stable]
 # 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 = ab689c5d3cc29d02d788506c0f1b2ab0742a0f05
+commit = 97db1467c517d265438684bd2a70b0b76ee282f6
 repository = https://github.com/ajaxorg/cloud9.git
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 git-binary = ${git:location}/bin/git
-npm-binary = ${nodejs:location}/bin/node ${nodejs:location}/bin/npm
-environment = export GIT_SSL_NO_VERIFY=true; export PATH=${nodejs:location}/bin:${node-sm:location}/node_modules/sm/bin/:$PATH; export LDFLAGS=-L${libxml2:location}/lib; export HOME=${:location};
-command = ${:environment} (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit} && ${node-sm:location}/node_modules/.bin/sm install) || (rm -fr ${:location}; exit 1)
+npm-binary = ${nodejs-0.4:location}/bin/node ${npm:location}/bin/npm
+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 =
+executable = ${:location}/bin/cloud9.js
+
+[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 = c66284221143c175fc889418d499da6f37492a7c
+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 =
+executable = ${:location}/server.js
 
 [cloud9-npm]
 # Online IDE written in javascript/node.js

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.8.tar.gz
-md5sum = ba74b22c788a0c8547976b880cd02b17
+url = http://www.cmake.org/files/v2.8/cmake-2.8.9.tar.gz
+md5sum = 801f4c87f8b604f727df5bf1f05a59e7

component/fontconfig/buildout.cfg

@@ -13,17 +13,16 @@ parts =
 
 [fontconfig]
 recipe = hexagonit.recipe.cmmi
-url = http://fontconfig.org/release/fontconfig-2.9.0.tar.gz
-md5sum = 26c83855ed256b5c032baae032fadc4f
+url = http://fontconfig.org/release/fontconfig-2.10.2.tar.bz2
+md5sum = 2f239690057d1438aa282e051f721d08
 # XXX-Cedric : should we use --with-add-fonts={somefont:location}/share,{someotherfont:location}/share?
 configure-options =
   --disable-static
   --disable-docs
   --enable-libxml2
   --with-default-fonts=${fonts:location}
-  --with-freetype-config=${freetype:location}/bin/freetype-config
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig
   CPPFLAGS=-I${zlib:location}/include -I${bzip2:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib

component/fonts/buildout.cfg

@@ -3,6 +3,7 @@ parts =
   liberation-fonts
   ipaex-fonts
   ipa-fonts
+  ocrb-fonts
 
 [fonts]
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -13,8 +14,8 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [liberation-fonts]
 recipe = hexagonit.recipe.download
 strip-top-level-dir = true
-url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-1.07.0.tar.gz
-md5sum = 8150db1c6e27cacdfd524b563b85b69e
+url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-2.00.1.tar.gz
+md5sum = 5c781723a0d9ed6188960defba8e91cf
 destination = ${fonts:location}/${:_buildout_section_name_}
 
 # IPAex and IPA Font - Japanese fonts provided by IPA
@@ -22,8 +23,8 @@ destination = ${fonts:location}/${:_buildout_section_name_}
 [ipaex-fonts]
 recipe = hexagonit.recipe.download
 strip-top-level-dir = true
-url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAexfont00103.zip
-md5sum = ac67b2fc3aab7f683d89f0070df284e7
+url = http://ossipedia.ipa.go.jp/ipafont/ipaexfont/IPAexfont00201.php
+md5sum = 7bf84182a04a9632268dbcb03f100d05
 destination = ${fonts:location}/${:_buildout_section_name_}
 
 [ipa-fonts]
@@ -32,3 +33,10 @@ strip-top-level-dir = true
 url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAfont00303.zip
 md5sum = 39a828acf27790adbe4944dfb4d94bb1
 destination = ${fonts:location}/${:_buildout_section_name_}
+
+[ocrb-fonts]
+recipe = hexagonit.recipe.download
+strip-top-level-dir = true
+url = http://sourceforge.jp/frs/redir.php?m=jaist&f=%2Ftsukurimashou%2F56948%2Focr-0.2.zip
+md5sum = 9f2acd83291a31dbe053912f4115db75
+destination = ${fonts:location}/${:_buildout_section_name_}

component/freetype/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 
 [freetype]
 recipe = hexagonit.recipe.cmmi
-url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.9.tar.bz2
-md5sum = 77a893dae81fd5b896632715ca041179
+url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.10.tar.bz2
+md5sum = 13286702e9390a91661f980608adaff1
 configure-options =
   --disable-static
 environment =

component/git/buildout.cfg

@@ -21,9 +21,13 @@ configure-options =
   --with-expat=${libexpat:location}
   --without-python
   --without-tcltk
-
 environment =
   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/groonga/buildout.cfg

@@ -5,10 +5,13 @@
 parts =
   groonga
 
+extends =
+  ../zlib/buildout.cfg
+
 [groonga]
 recipe = hexagonit.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-2.0.6.tar.gz
-md5sum = 64467d1ab8d5e0df8348a636972a95a7
+url = http://packages.groonga.org/source/groonga/groonga-2.0.8.tar.gz
+md5sum = 2ad20b64d57d28b90f78be7d97e20b3a
 configure-options =
   --disable-static
   --disable-glibtest
@@ -16,3 +19,7 @@ configure-options =
   --disable-document
   --disable-groonga-httpd
   --without-mecab
+environment =
+  CPPFLAGS =-I${zlib:location}/include
+  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
+

component/gtk-2/buildout.cfg

@@ -20,6 +20,7 @@ url = http://cairographics.org/releases/cairo-1.10.2.tar.gz
 md5sum = f101a9e88b783337b20b2e26dfd26d5f
 configure-options = 
   --enable-tee=yes
+  --enable-xlib=no
 environment = 
   PATH=${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig
@@ -36,7 +37,7 @@ configure-options =
 # XXX-Cedric : Why, god, why do I have to supply the -lXrender option to linker?
 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
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
   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

component/imagemagick/buildout.cfg

@@ -16,6 +16,7 @@ extends =
   ../jasper/buildout.cfg
   ../jbigkit/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../webp/buildout.cfg
   ../zlib/buildout.cfg
 
 [imagemagick-6.6.6-1-no-gsx-gsc-probe.patch]
@@ -28,7 +29,7 @@ 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.8-8.tar.bz2
+url = http://ftp.vim.org/ImageMagick/ImageMagick-6.7.8-8.tar.bz2
 md5sum = 4e5c8f102f3e7401587c924f5b4bca15
 depends =
   ${libtiff:version}
@@ -66,5 +67,5 @@ patches =
 environment =
   PATH=${freetype:location}/bin:${ghostscript:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   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
+  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 -I${webp: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 -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib

component/kumo/buildout.cfg

@@ -34,5 +34,5 @@ configure-options =
   --with-msgpack=${messagepack:location}
 
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include -DKUMO_IPV6
+  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
   LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${tokyocabinet:location}/lib -Wl,-rpath=${messagepack:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib

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

@@ -3,8 +3,10 @@
 
 [buildout]
 extends =
+  ../bzip2/buildout.cfg
   ../imagemagick/buildout.cfg
   ../jbigkit/buildout.cfg
+  ../zlib/buildout.cfg
 parts =
   libdmtx
   dmtx-utils
@@ -26,4 +28,4 @@ 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
+  LDFLAGS=-Wl,-rpath=${jbigkit:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib

component/libpng/buildout.cfg

@@ -21,5 +21,5 @@ md5sum = 717caa58e9c71a80820eb38c4f4d6ec3
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.12.tar.bz2
-md5sum = d87f9c34ccab8242c00e41925839f6c9
+url = http://download.sourceforge.net/libpng/libpng-1.5.13.tar.bz2
+md5sum = 186b3098d1ef844f76681bc69968efe2

component/librsvg/buildout.cfg

@@ -14,7 +14,8 @@ 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
+  PKG_CONFIG_PATH=${pkgconfig:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
+  LDFLAGS=-Wl,-rpath=${zlib:location}/lib
 
 [librsvg]
 recipe = hexagonit.recipe.cmmi
@@ -36,4 +37,4 @@ configure-options =
 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
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib

component/libtiff/buildout.cfg

@@ -9,11 +9,9 @@ parts =
 
 [libtiff]
 recipe = hexagonit.recipe.cmmi
-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 = 04a08fa1e07e696e820a0c3f32465a13
+version = 4.0.3
+url = http://download.osgeo.org/libtiff/tiff-${:version}.tar.gz
+md5sum = 051c1068e6a0627f461948c365290410
 configure-options =
   --disable-static
   --without-x

component/libxml2/buildout.cfg

@@ -8,8 +8,8 @@ parts =
 
 [libxml2]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz
-md5sum = c62106f02ee00b6437f0fb9d370c1093
+url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.9.0.tar.gz
+md5sum = 5b9bebf4f5d2200ae2c4efe8fa6103f7
 configure-options =
   --disable-static
   --without-python

component/libxslt/buildout.cfg

@@ -8,8 +8,8 @@ parts =
   libxslt
 
 [libxslt]
-url = ftp://xmlsoft.org/libxslt/libxslt-1.1.26.tar.gz
-md5sum = e61d0364a30146aaa3001296f853b2b9
+url = ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz
+md5sum = 9667bf6f9310b957254fdcf6596600b7
 recipe = hexagonit.recipe.cmmi
 configure-options =
   --disable-static

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/mariadb/buildout.cfg

@@ -25,10 +25,10 @@ download-only = true
 
 [mariadb]
 recipe = hexagonit.recipe.cmmi
-version = 5.5.27
+version = 5.5.28a
 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 = ad6f3239a1d5af0a667e30f7c0b05037
+md5sum = a2d20a040ef1e49944a4ffe65ed7fefa
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0
@@ -62,8 +62,8 @@ environment =
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/
 recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-2.06.tar.gz
-md5sum = 89ce640a57ed8f2161b8358ff4c29c66
+url = https://github.com/downloads/mroonga/mroonga/mroonga-2.08.tar.gz
+md5sum = bb04d973569a1b17f811fc344c0feb95
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config

component/mydumper/buildout.cfg

@@ -3,6 +3,7 @@
 extends =
     ../cmake/buildout.cfg
     ../glib/buildout.cfg
+    ../openssl/buildout.cfg
     ../pcre/buildout.cfg
     ../mariadb/buildout.cfg
 
@@ -15,17 +16,17 @@ parts = 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
+url = https://launchpad.net/mydumper/0.5/0.5.1/+download/mydumper-0.5.1.tar.gz
+md5sum = b4df42dfe23f308ab13eb6ecb73a0d21
 buildout-bin-dir = ${buildout:bin-directory}
 cmake-command = ${cmake:location}/bin/cmake
 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/
-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
+pkg-config-path = ${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/:${openssl:location}/lib/pkgconfig/
+libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/:${openssl:location}/lib/
+includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include:${openssl:location}/include/
+cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include -I${openssl:location}/include/
+mysql-include-dir = ${mariadb:location}/include
 mydumper-patches =
    ${:_profile_base_location_}/mydumper-remove-warnings-errors.patch 917fea16b5ddea195cfa33fbd9827f57 -p1
 slapos_promise =
@@ -49,17 +50,13 @@ script =
                     '-DMYSQL_CONFIG=%%s' %% self.options['mysql-config'],
                     '-DCMAKE_C_FLAGS=%%s' %% self.options['cflags'],
                     '-DCMAKE_INSTALL_RPATH=%%s' %% self.options['libraries'],
+                    '-DMYSQL_INCLUDE_DIR=%%s' %% self.options['mysql-include-dir'],
+                    '-DBUILD_DOCS=OFF',
                     '.']
     call(command_line, cwd=workdir, env=env)
     call(['make'], cwd=workdir, env=env)
     call(['make', 'install'], cwd=workdir, env=env)
 
-[mydumper-doc]
-recipe = zc.recipe.egg
-eggs =
-    Sphinx
-dependent-scripts = true
-
 # XXX-Antoine: here's what I did using hexagonit.recipe.cmmi.
 # and it wasn't working !
 #[mydumper]
@@ -78,4 +75,3 @@ dependent-scripts = true
 #environment=
 #    PATH=$PATH:${buildout:bin-directory}
 #    PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/
-

component/nginx/buildout.cfg

+[buildout]
+extends =
+  ../pcre/buildout.cfg
+  ../zlib/buildout.cfg
+  ../openssl/buildout.cfg
+
+parts = nginx
+
+[nginx]
+recipe = hexagonit.recipe.cmmi
+url = http://nginx.org/download/nginx-1.0.14.tar.gz
+configure-options=
+  --with-ipv6
+  --with-http_ssl_module
+  --with-ld-opt="-L ${zlib:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib"
+  --with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include -I ${zlib:location}/include"
+

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,23 +3,40 @@ extends =
   ../git/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../openssl/buildout.cfg
-  ../python-2.7/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
   nodejs
 
 [nodejs]
+<= nodejs-0.8
+
+[nodejs-0.8]
+# Server-side Javascript.
+recipe = hexagonit.recipe.cmmi
+url = http://nodejs.org/dist/v0.8.8/node-v0.8.8.tar.gz
+md5sum = f4dae84e96a94b768404c14633bccd49
+configure-options =
+  --openssl-includes=${openssl:location}/include
+  --openssl-libpath=${openssl:location}/lib
+environment =
+  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
+
+[nodejs-0.6]
 # Server-side Javascript.
 recipe = hexagonit.recipe.cmmi
-url = http://nodejs.org/dist/v0.6.19/node-v0.6.19.tar.gz
-md5sum = f5669a9717422b811c6bad1cc961b1e5
+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 =
   HOME=${buildout:parts-directory}/${:_buildout_section_name_}
-  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
@@ -32,7 +49,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/openssl/buildout.cfg

@@ -7,6 +7,7 @@
 extends =
   ../ca-certificates/buildout.cfg
   ../zlib/buildout.cfg
+  ../patch/buildout.cfg
 
 parts =
   openssl
@@ -30,6 +31,7 @@ download-only = true
 recipe = hexagonit.recipe.cmmi
 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/pcre/buildout.cfg

@@ -4,9 +4,8 @@ parts =
 
 [pcre]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2
-md5sum = 0a7b592bea64b7aa7f4011fc7171a730
+url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.31.tar.bz2
+md5sum = 1c9a276af932b5599157f96e945391f0
 configure-options =
   --disable-static
-  --enable-utf8
   --enable-unicode-properties

component/percona-toolkit/buildout.cfg

@@ -10,7 +10,8 @@ parts =
 recipe = hexagonit.recipe.cmmi
 depends =
   ${perl:version}
-url = http://www.percona.com/redir/downloads/percona-toolkit/2.1.3/percona-toolkit-2.1.3.tar.gz
-md5sum = 6f8c4a0a0e43e467766cbdabaec9ef93
+version = 2.1.7
+url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/percona-toolkit-${:version}.tar.gz
+md5sum = 12b096cf027395f0bf085f7314f95886
 configure-command =
   ${perl:location}/bin/perl Makefile.PL

component/perl/buildout.cfg

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

component/pkgconfig/buildout.cfg

@@ -11,8 +11,8 @@ extends =
 
 [pkgconfig]
 recipe = hexagonit.recipe.cmmi
-url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-md5sum = 47525c26a9ba7ba14bf85e01509a7234
+url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz
+md5sum = 5392b4e3372879c5bf856173b418d6a2
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 # build pkg-config twice so that second configure can use pkg-config
 # to compute GLIB_CFLAGS and GLIB_LIBS.

component/python-setuptools/buildout.cfg

+[buildout]
+parts = python-setuptools
+
+[setuptools-download]
+recipe = slapos.recipe.download
+filename = setuptools-0.6c11-py2.7.egg
+url = http://pypi.python.org/packages/2.7/s/setuptools/${:filename}
+md5sum = fe1f997bc722265116870bc7919059ea
+
+[python-setuptools]
+# Hack to manually install setuptools outside of the Buildout environment.
+# It is useful in case of using things like "python setup.py test" in eggs
+# downloaded from source (so not using bildout magic).
+# To be able to use it, you should in your instance do an:
+# export PYTHONPATH=${:location} (defined in ${:environment})
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+environment = export PATH=${python2.7:location}/bin:$PATH; export PYTHONPATH=${:location};
+stop-on-error = true
+recipe = plone.recipe.command
+update = true
+command = ${:environment} (mkdir ${:location}; sh ${setuptools-download:location}/${setuptools-download:filename} --install-dir ${:location}) || (rm -fr ${:location}; exit 1)

component/rpm2cpio/buildout.cfg

@@ -4,5 +4,5 @@ parts =
 
 [rpm2cpio]
 recipe = slapos.recipe.build:download
-url = http://ruda.googlecode.com/hg-history/2989f0531de63872cc7327590798d1898ac91246/rpm/rpm2cpio.py
+url = https://raw.github.com/ruda/rpm2cpio/e196173f1f6b746463b7398e381b94a42edfa345/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

+# This file is used to install SlapOS Node itself.
+
 [buildout]
 extends =
   ../../stack/shacache-client.cfg
@@ -19,6 +21,7 @@ extends =
   ../sqlite3/buildout.cfg
   ../swig/buildout.cfg
   ../zlib/buildout.cfg
+  ../patch/buildout.cfg
 
 parts =
   slapos
@@ -47,7 +50,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,53 +113,50 @@ 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-006
-hexagonit.recipe.download = 1.5.1-dev-slapos-002
+zc.buildout = 1.6.0-dev-SlapOS-008
+
 
-# Generated by buildout-versions
 Jinja2 = 2.6
-Pygments = 1.5
 Werkzeug = 0.8.3
 buildout-versions = 1.7
 collective.recipe.template = 1.9
-docutils = 0.9.1
 hexagonit.recipe.cmmi = 1.6
-ipython = 0.13
-lxml = 2.3.4
-meld3 = 0.6.8
-netaddr = 0.7.7
-slapos.core = 0.26.1
-slapos.libnetworkcache = 0.12
+lxml = 2.3.5
+meld3 = 0.6.9
+netaddr = 0.7.10
+slapos.core = 0.29
+slapos.libnetworkcache = 0.13.2
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.26.1
+# slapos.core==0.29
 Flask = 0.9
 
 # Required by:
-# netaddr==0.7.7
-Sphinx = 1.1.3
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
-# slapos.core==0.26.1
+# slapos.core==0.29
 netifaces = 0.8
 
 # Required by:
-# slapos.core==0.26.1
-# slapos.libnetworkcache==0.12
-# supervisor==3.0a12
+# slapos.core==0.29
+# slapos.libnetworkcache==0.13.2
+# supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-006
 # zope.interface==4.0.1
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.26.1
-supervisor = 3.0a12
+# slapos.core==0.29
+supervisor = 3.0b1
 
 # Required by:
-# slapos.core==0.26.1
+# slapos.core==0.29
 zope.interface = 4.0.1

component/sphinx/README

+This component is not used anymore - but might be revived within 4 months.
+If not used within 6 months, feel free to delete this.

component/sqlite3/buildout.cfg

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

component/stunnel/buildout.cfg

@@ -17,8 +17,8 @@ filename = stunnel-4-hooks.py
 
 [stunnel-4]
 recipe = hexagonit.recipe.cmmi
-url = http://mirror.bit.nl/stunnel/stunnel-4.53.tar.gz
-md5sum = ab3bfc915357d67da18c73f73610d593
+url = ftp://ftp.stunnel.org/stunnel/archive/4.x/stunnel-4.54.tar.gz
+md5sum = c2b1db99e3ed547214568959a8ed18ac
 pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook
 configure-options =
   --enable-ipv6

component/tar/buildout.cfg

+[buildout]
+
+parts = tar
+
+[tar-drop.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 9352820566aa3534a04bd269c9f89f48
+download-only = true
+filename = drop.gets.patch
+
+[tar]
+virtual-depends = ${tar-drop.gets.patch:md5sum}
+patch-options = -p1
+patches =
+  ${tar-drop.gets.patch:location}/${tar-drop.gets.patch:filename}
+
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnu.org/gnu/tar/tar-1.26.tar.gz
+md5sum = 00d1e769c6af702c542cca54b728920d
+environment =
+  FORCE_UNSAFE_CONFIGURE=1

component/tar/drop.gets.patch

+diff -ur tar-1.26.orig/gnu/stdio.in.h tar-1.26/gnu/stdio.in.h
+--- tar-1.26.orig/gnu/stdio.in.h	2011-03-12 10:14:33.000000000 +0100
++++ tar-1.26/gnu/stdio.in.h	2012-08-24 15:35:22.299190847 +0200
+@@ -164,7 +164,10 @@
+    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/webp/buildout.cfg

+# WebP - A new image format for the Web
+# https://developers.google.com/speed/webp/
+
 [buildout]
 parts =
   webp
+extends =
+  ../libjpeg/buildout.cfg
+  ../libpng/buildout.cfg
 
 [webp]
 recipe = hexagonit.recipe.cmmi
@@ -8,3 +14,7 @@ url = https://webp.googlecode.com/files/libwebp-0.1.3.tar.gz
 md5sum = 254d4670e14e9ed881f0536b006ab336
 configure-options =
   --disable-static
+  --with-jpegincludedir=${libjpeg:location}/include
+  --with-jpeglibdir=${libjpeg:location}/lib
+environment =
+  PATH=${libpng:location}/bin:%(PATH)s

component/xorg/buildout.cfg

@@ -120,7 +120,7 @@ configure-options =
   --disable-static
   --disable-build-docs
 environment =
-  PKG_CONFIG_PATH=${xcbproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${libXau:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:${libxslt:location}/bin:%(PATH)s
   PYTHON=${buildout:executable}
 # Python note: libxcb requires python with ElementTree. In case of appliance
@@ -133,10 +133,8 @@ recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libXext-1.2.0.tar.bz2
 md5sum = 9bb236ff0193e9fc1c1fb504dd840331
 environment =
-  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xcbproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig
-  CPPFLAGS=-I${xcbproto:location}/include -I${libXau:location}/include -I${xproto:location}/include -I${xorg-libpthread-stubs:location}/include -I${xextproto:location}/include -I${libX11:location}/include -I${libxcb:location}/include
-  LD_LIBRARY_PATH=${xcbproto:location}/lib:${libXau:location}/lib:${xorg-libpthread-stubs:location}/lib:${xextproto:location}/lib:${libX11:location}/lib:${libxcb:location}/lib
-  LD_RUN_PATH=${xcbproto:location}/lib:${libXau:location}/lib:${xorg-libpthread-stubs:location}/lib:${xextproto:location}/lib:${libX11:location}/lib:${libxcb:location}/lib
+  PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  LD_LIBRARY_PATH=${libX11:location}/lib
   PATH=${pkgconfig:location}/bin:%(PATH)s
 # Warning: do *not* enable -fPIC CFLAGS for this library. Even if it fails and ld asks you to enable it. This will not solve your problem, and create an unexpected (by build chain) setup (all .o will be position-independant code).
 # CFLAGS=-fPIC
@@ -183,9 +181,7 @@ configure-options =
   --without-xmlto
   --without-fop
 environment =
-  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
+  PKG_CONFIG_PATH=${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 
@@ -342,11 +338,7 @@ md5sum = ce7cda009aa0b10a73637941d44ae789
 configure-options =
   --disable-static
 environment =
-  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 
+  PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${render:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [libXinerama]

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.59-dev'
+version = '0.67-dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
@@ -46,97 +46,113 @@ setup(name=name,
           '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',
           'check_url_available = slapos.recipe.check_url_available:Recipe',
+          'check_page_content = slapos.recipe.check_page_content:Recipe',
           'cloud9 = slapos.recipe.cloud9:Recipe',
-          'cron = slapos.recipe.dcron: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',
+          'egg_test = slapos.recipe.erp5_test:EggTestRecipe',
           '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',
           'generate.password = slapos.recipe.generatepassword:Recipe',
-          'nbdserver = slapos.recipe.nbdserver:Recipe',
-          'onetimeupload = slapos.recipe.onetimeupload:Recipe',
-          'helloworld = slapos.recipe.helloworld:Recipe',
           'generic.cloudooo = slapos.recipe.generic_cloudooo:Recipe',
           'cloudooo.test = slapos.recipe.cloudooo_test:Recipe',
-          'firefox = slapos.recipe.firefox:Recipe',
-          'fontconfig = slapos.recipe.fontconfig:Recipe',
+          'ipv6toipv4 = slapos.recipe.6tunnel:SixToFour',
+          'ipv4toipv6 = slapos.recipe.6tunnel:FourToSix',
+          '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',
+          'neoppod.admin = slapos.recipe.neoppod:Admin',
+          'neoppod.master = slapos.recipe.neoppod:Master',
+          'neoppod.storage = slapos.recipe.neoppod:Storage',
           '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',
+          'publish.serialised = slapos.recipe.publish:Serialised',
           'publishurl = slapos.recipe.publishurl:Recipe',
           'pwgen = slapos.recipe.pwgen:Recipe',
           'pwgen.stable = slapos.recipe.pwgen:StablePasswordGeneratorRecipe',
-          'proactive = slapos.recipe.proactive:Recipe',
+          'requestoptional = slapos.recipe.requestoptional:Recipe',
           'request = slapos.recipe.request:Recipe',
+          'request.serialised = slapos.recipe.request:Serialised',
           'seleniumrunner = slapos.recipe.seleniumrunner:Recipe',
           'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',
-          'shell = slapos.recipe.shell:Recipe',
           'shellinabox = slapos.recipe.shellinabox:Recipe',
-          'slapconfiguration = slapos.recipe.slapconfiguration: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',
-          'slaprunner = slapos.recipe.slaprunner:Recipe',
+          'siptester = slapos.recipe.siptester:SipTesterRecipe',
+          'slapconfiguration = slapos.recipe.slapconfiguration:Recipe',
+          'slapconfiguration.serialised = slapos.recipe.slapconfiguration:Serialised',
+          'slapcontainer = slapos.recipe.container:Recipe',
           'slapmonitor = slapos.recipe.slapmonitor:Recipe',
           'slapreport = slapos.recipe.slapreport:Recipe',
-          'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
-          'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
+          'slaprunner = slapos.recipe.slaprunner:Recipe',
+          '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',
           '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',
           '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',
-          'signalwrapper= slapos.recipe.signal_wrapper:Recipe',
         ],
         'slapos.recipe.nosqltestbed.plugin': [
           'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',

slapos/recipe/6tunnel/__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):
+  """
+  ipv4toipv6 tunnel configuration.
+  """
+  # Override in subclasses
+  template_name = None
+
+  def install(self):
+    return [
+      self.createExecutable(
+        self.options['runner-path'],
+        self.substituteTemplate(
+          self.getTemplateFilename(self.template_name),
+          {
+            'ipv6': self.options['ipv6'],
+            'ipv6_port': self.options['ipv6-port'],
+            'ipv4': self.options['ipv4'],
+            'ipv4_port': self.options['ipv4-port'],
+            'shell_path': self.options['shell-path'],
+            '6tunnel_path': self.options['6tunnel-path'],
+          },
+        ),
+      )
+    ]
+
+class SixToFour(Recipe):
+    template_name = '6to4.in'
+
+class FourToSix(Recipe):
+    template_name = '4to6.in'

slapos/recipe/6tunnel/template/4to6.in

+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+exec %(6tunnel_path)s -d -l %(ipv4)s %(ipv4_port)s %(ipv6)s %(ipv6_port)s

slapos/recipe/6tunnel/template/6to4.in

+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+exec %(6tunnel_path)s -6 -4 -d -l %(ipv6)s %(ipv6_port)s %(ipv4)s %(ipv4_port)s

slapos/recipe/cloudooo_test/__init__.py → slapos/recipe/_uuid.py

@@ -24,28 +24,32 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
+
+import uuid
+
+import os
+
 from slapos.recipe.librecipe import GenericBaseRecipe
-import urlparse
 
 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):
-    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
+        return []

slapos/recipe/apache_zope_backend/__init__.py

@@ -29,61 +29,71 @@ import pkg_resources
 
 class Recipe(GenericBaseRecipe):
   def install(self):
-    path_list = []
-    ip = self.options['ip']
-    port = self.options['port']
-    backend = self.options['backend']
-
-    apache_conf = dict()
+    try:
+      backend_list = self.options['backend-list']
+    except KeyError:
+      backend_list = [(self.options['port'], self.options['backend'])]
 
     scheme = self.options['scheme']
     if scheme == 'http':
       required_path_list = []
-      apache_conf['ssl_snippet'] = ''
+      ssl_enable = ssl_snippet = ''
     elif scheme == 'https':
       key = self.options['key-file']
       certificate = self.options['cert-file']
       required_path_list = [key, certificate]
-      apache_conf['key'] = key
-      apache_conf['certificate'] = certificate
-      apache_conf['ssl_session_cache'] = self.options['ssl-session-cache']
-      apache_conf['ssl_snippet'] = pkg_resources.resource_string(__name__,
-          'template/snippet.ssl.in') % apache_conf
+      ssl_snippet = self.substituteTemplate(self.getTemplateFilename('snippet.ssl.in'), {
+        'key': key,
+        'certificate': certificate,
+        'ssl_session_cache': self.options['ssl-session-cache'],
+      })
       if 'ssl-authentication' in self.options and self.optionIsTrue(
           'ssl-authentication'):
-        apache_conf['ssl_snippet'] += pkg_resources.resource_string(__name__,
-          'template/snippet.ssl.ca.in') % dict(
-            ca_certificate=self.options['ssl-authentication-certificate'],
-            ca_crl=self.options['ssl-authentication-crl']
-          )
+        ssl_snippet += self.substituteTemplate(self.getTemplateFilename('snippet.ssl.ca.in'), {
+          'ca_certificate': self.options['ssl-authentication-certificate'],
+          'ca_crl': self.options['ssl-authentication-crl'],
+        })
+      ssl_enable = 'SSLEngine on'
     else:
-      raise ValueError, "Unsupported scheme %s" % scheme
+      raise ValueError('Unsupported scheme %s' % scheme)
 
-    access_control_string = self.options['access-control-string']
-    apache_conf['pid_file'] = self.options['pid-file']
-    apache_conf['lock_file'] = self.options['lock-file']
-    apache_conf['ip'] = ip
-    apache_conf['port'] = port
-    apache_conf['server_admin'] = 'admin@'
-    apache_conf['error_log'] = self.options['error-log']
-    apache_conf['access_log'] = self.options['access-log']
-    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$1 [L,P]" % (backend,
-      self.options.get('backend-path', '/'))
-    apache_conf_string = pkg_resources.resource_string(__name__,
-          'template/apache.zope.conf.in') % apache_conf
-    apache_config_file = self.createFile(self.options['configuration-file'],
-      apache_conf_string)
-    path_list.append(apache_config_file)
-    wrapper = self.createPythonScript(self.options['wrapper'], __name__ +
-      '.apache.runApache', [
-            dict(
-              required_path_list=required_path_list,
-              binary=self.options['apache-binary'],
-              config=apache_config_file
+    ip = self.options['ip']
+    backend_path = self.options.get('backend-path', '/')
+    vhost_template_name = self.getTemplateFilename('vhost.in')
+    apache_config_file = self.createFile(
+      self.options['configuration-file'],
+      self.substituteTemplate(
+        self.getTemplateFilename('apache.zope.conf.in'),
+        {
+          'path': '/',
+          'server_admin': 'admin@',
+          'pid_file': self.options['pid-file'],
+          'lock_file': self.options['lock-file'],
+          'error_log': self.options['error-log'],
+          'access_log': self.options['access-log'],
+          'access_control_string': self.options['access-control-string'],
+          'ssl_snippet': ssl_snippet,
+          'vhosts': ''.join(self.substituteTemplate(vhost_template_name, {
+            'ip': ip,
+            'port': port,
+            'backend': backend,
+            'backend-path': backend_path,
+            'ssl_enable': ssl_enable,
+          }) for (port, backend) in backend_list),
+        },
+      )
     )
-          ])
-    path_list.append(wrapper)
-    return path_list
+    return [
+      apache_config_file,
+      self.createPythonScript(
+        self.options['wrapper'],
+        __name__ + '.apache.runApache',
+        [
+          {
+            'required_path_list': required_path_list,
+            'binary': self.options['apache-binary'],
+            'config': apache_config_file,
+          },
+        ],
+      ),
+    ]

slapos/recipe/apache_zope_backend/template/apache.zope.conf.in

@@ -22,7 +22,6 @@ LoadModule headers_module modules/mod_headers.so
 
 # Basic server configuration
 PidFile "%(pid_file)s"
-Listen %(ip)s:%(port)s
 ServerAdmin %(server_admin)s
 TypesConfig conf/mime.types
 AddType application/x-compress .Z
@@ -63,4 +62,4 @@ CustomLog "%(access_log)s" combined
 
 # Magic of Zope related rewrite
 RewriteEngine On
-%(rewrite_rule)s
+%(vhosts)s

slapos/recipe/apache_zope_backend/template/snippet.ssl.in

-
-# SSL Configuration
-SSLEngine on
 SSLCertificateFile %(certificate)s
 SSLCertificateKeyFile %(key)s
 SSLRandomSeed startup builtin

slapos/recipe/apache_zope_backend/template/vhost.in

+Listen %(ip)s:%(port)s
+<VirtualHost *:%(port)s>
+  %(ssl_enable)s
+  RewriteRule (.*) %(backend)s%(backend-path)s$1 [L,P]
+</VirtualHost>

slapos/recipe/check_page_content/__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 content at "url" is available 
+  (e.g page has a link to itself).
+  """
+
+  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_page_content.in'), config)
+    )
+
+    return [promise]

slapos/recipe/check_page_content/template/check_page_content.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
+
+%(curl_path)s -k -sL $URL | grep "$URL" > /dev/null
+
+if [ $? != 0 ]; then
+  echo "Content at $URL seems to be corrupted" >&2
+  exit 1
+fi

slapos/recipe/check_url_available/template/check_url.in

@@ -3,14 +3,25 @@
 # 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 ]; then
+  echo "$URL is not available (server not reachable)." >&2
+  exit 1
+fi
+
 if [ $CODE -eq 000 ]; then
-  echo "$URL is not available (server not reachable)" >&2
+  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
+  echo "$URL is not available (returned $CODE)." >&2
   exit 2
 fi

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']:
+                shutil.move(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])):
+                    shutil.move(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_test/__init__.py

@@ -27,6 +27,9 @@
 from slapos.recipe.librecipe import GenericBaseRecipe
 import urlparse
 
+# The follow recipes should be unified somehow in order to improve
+# code mantainence.
+
 class Recipe(GenericBaseRecipe):
   def install(self):
     testinstance = self.options['test-instance-path']
@@ -72,3 +75,62 @@ class Recipe(GenericBaseRecipe):
           ] + common_list, **common_dict)]))
 
     return path_list
+
+class CloudoooRecipe(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
+
+class EggTestRecipe(GenericBaseRecipe):
+  """
+  Recipe used to create wrapper used to run test suite (python setup.py test)
+  off a list of Python eggs.
+  """
+  def install(self):
+    path_list = []
+    test_list = self.options['test-list'].strip().replace('\n', ',')
+    common_dict = {}
+
+    environment_dict = {}
+    if self.options.get('environment'):
+      environment_part = self.buildout.get(self.options['environment'])
+      if environment_part:
+        for key, value in environment_part.iteritems():
+          environment_dict[key] = value
+
+    common_list = [ "--source_code_path_list", test_list]
+
+    argument_dict = dict(
+        call_list=[self.options['run-test-suite-binary'],] + common_list,
+        environment=environment_dict,
+        **common_dict
+    )
+    if 'prepend-path' in self.options:
+      argument_dict['prepend_path'] = self.options['prepend-path']
+
+    run_test_suite_script = self.createPythonScript(
+        self.options['run-test-suite'], __name__ + '.test.runTestSuite',
+        [argument_dict]
+    )
+
+    path_list.append(run_test_suite_script)
+
+    return path_list

slapos/recipe/erp5_test/test.py

@@ -29,11 +29,20 @@ import sys
 def runTestSuite(args):
   env = os.environ.copy()
   d = args[0]
+  if 'openssl_binary' in d:
     env['OPENSSL_BINARY'] = d['openssl_binary']
+  if 'test_ca_path' in d:
     env['TEST_CA_PATH'] = d['test_ca_path']
-  env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
+  if 'prepend_path' in d:
+    env['PATH'] = ':'.join([d['prepend_path']] + os.environ.get('PATH', '').split(':'))
+  if 'instance_home' in d:
     env['INSTANCE_HOME'] = d['instance_home']
     env['REAL_INSTANCE_HOME'] = d['instance_home']
+
+  # If defined, will add (and replace if existing) envvars to environment.
+  if 'environment' in d:
+    env.update(d['environment'])
+
   # Deal with Shebang size limitation
   executable_filepath = d['call_list'][0]
   file_object = open(executable_filepath, 'r')
@@ -51,9 +60,13 @@ def runTestSuite(args):
 def runUnitTest(args):
   env = os.environ.copy()
   d = args[0]
+  if 'openssl_binary' in d:
     env['OPENSSL_BINARY'] = d['openssl_binary']
+  if 'test_ca_path' in d:
     env['TEST_CA_PATH'] = d['test_ca_path']
+  if 'prepend_path' in d:
     env['PATH'] = ':'.join([d['prepend_path']] + os.environ.get('PATH', '').split(':'))
+  if 'instance_home' in d:
     env['INSTANCE_HOME'] = d['instance_home']
     env['REAL_INSTANCE_HOME'] = d['instance_home']
   # Deal with Shebang size limitation

slapos/recipe/generic_kumofs/__init__.py

@@ -30,11 +30,6 @@ from slapos.recipe.librecipe import GenericBaseRecipe
 class Recipe(GenericBaseRecipe):
   def install(self):
     ip = self.options['ip']
-    address_family = self.options.get('address-family', 'inet4')
-    if address_family == 'inet6':
-      ip = '[' + ip + ']'
-    elif address_family != 'inet4':
-      raise ValueError('Unsupported address family: %r' % (address_family, ))
     kumo_manager_port = int(self.options['manager-port'])
     kumo_server_port = int(self.options['server-port'])
     kumo_server_listen_port = int(self.options['server-listen-port'])

slapos/recipe/generic_mysql/__init__.py

@@ -69,9 +69,16 @@ class Recipe(GenericBaseRecipe):
     mysql_script_list = []
 
     # user defined functions
+    mroonga = self.options.get('mroonga', 'ha_mroonga.so')
+    if mroonga:
+      last_insert_grn_id = "CREATE FUNCTION last_insert_grn_id RETURNS " \
+        "INTEGER SONAME '" + mroonga + "';"
+    else:
+      last_insert_grn_id = ""
     mysql_script_list.append(self.substituteTemplate(
       self.getTemplateFilename('mysql-init-function.sql.in'),
       {
+        'last_insert_grn_id': last_insert_grn_id,
       }
     ))
     # real database

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

@@ -24,7 +24,7 @@ long_query_time = 1
 max_allowed_packet = 128M
 query_cache_size = 32M
 
-plugin-load = ha_mroonga.so;ha_sphinx.so;handlersocket.so
+plugin-load = ha_mroonga.so;handlersocket.so
 
 # By default only 100 connections are allowed, when using zeo
 # we may have much more connections

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

 USE mysql;
 DROP FUNCTION IF EXISTS last_insert_grn_id;
-CREATE FUNCTION last_insert_grn_id RETURNS INTEGER SONAME 'ha_mroonga.so';
+%(last_insert_grn_id)s
 DROP FUNCTION IF EXISTS sphinx_snippets;
 #CREATE FUNCTION sphinx_snippets RETURNS STRING SONAME 'ha_sphinx.so';

slapos/recipe/cloudooo_test/test.py → slapos/recipe/gitinit.py

@@ -24,41 +24,26 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
+import json
 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)
+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, desc in repolist.iteritems():
+            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])
+                # XXX: Hardcoded path
+                description_filename = os.path.join(absolute_path, 'description')
+                with open(description_filename, 'w') as description_file:
+                    description_file.write(desc)
+
+        return []

slapos/recipe/haproxy/__init__.py

@@ -66,36 +66,53 @@ class Recipe(GenericBaseRecipe):
     #      stick in other nodes and are not coming back. Please note this option
     #      is not an issue if you have more than (maxqueue * node_quantity) requests
     #      because haproxy will handle a top-level queue
+    try:
+      backend_dict = self.options['backend-dict']
+    except KeyError:
+      backend_list = self.options['backend-list']
+      if isinstance(backend_list, str):
+        # BBB
+        backend_list = backend_list.split()
+      backend_dict = {
+        self.options['name']: (self.options['port'], backend_list),
+      }
 
-    snippet_filename = self.getTemplateFilename(
+    server_snippet_filename = self.getTemplateFilename(
       'haproxy-server-snippet.cfg.in')
-    # Prepare all filestorages
+    listen_snippet_filename = self.getTemplateFilename(
+      'haproxy-listen-snippet.cfg.in')
     server_snippet = ""
+    ip = self.options['ip']
+    server_check_path = self.options['server-check-path']
+    # FIXME: maxconn must be provided per-backend, not globally
+    maxconn = self.options['maxconn']
     i = 0
-    name = self.options['name']
-    for address in self.options['backend-list'].split():
+    for name, (port, backend_list) in backend_dict.iteritems():
+      server_snippet += self.substituteTemplate(
+        listen_snippet_filename, {
+          'name': name,
+          'ip': ip,
+          'port': port,
+          'server_check_path': server_check_path,
+        })
+      for address in backend_list:
         i += 1
         server_snippet += self.substituteTemplate(
-          snippet_filename, dict(
-             name='%s_%s' % (name, i), 
-             address=address,
-             cluster_zope_thread_amount=self.options['maxconn']))
+          server_snippet_filename, {
+            'name': '%s_%s' % (name, i),
+            'address': address,
+            'cluster_zope_thread_amount': maxconn,
+          })
 
-    config = dict(
-        name=name, 
-        ip=self.options['ip'], 
-        port=self.options['port'],
-        server_text=server_snippet,
-        server_check_path=self.options['server-check-path'],)
-    template_filename = self.getTemplateFilename('haproxy.cfg.in')
     configuration_path = self.createFile(
       self.options['conf-path'],
-        self.substituteTemplate(template_filename, config))
-
-    # Create running wrapper
+      self.substituteTemplate(
+        self.getTemplateFilename('haproxy.cfg.in'),
+        {'server_text': server_snippet},
+      )
+    )
     wrapper_path = self.createPythonScript(
       self.options['wrapper-path'],
       'slapos.recipe.librecipe.execute.execute',
       arguments=[self.options['binary-path'].strip(), '-f', configuration_path],)
-
     return [configuration_path, wrapper_path]

slapos/recipe/haproxy/template/haproxy-listen-snippet.cfg.in

+listen %(name)s %(ip)s:%(port)s
+  cookie  SERVERID insert
+  balance roundrobin
+  option httpchk GET %(server_check_path)s
+  stats uri /haproxy
+  stats realm Global\ statistics

slapos/recipe/haproxy/template/haproxy-server-snippet.cfg.in

   server %(name)s %(address)s cookie %(name)s check inter 3s rise 1 fall 2 maxqueue 5 maxconn %(cluster_zope_thread_amount)s
-

slapos/recipe/haproxy/template/haproxy.cfg.in

@@ -29,13 +29,4 @@ defaults
   # to render a page
   option forceclose
 
-listen %(name)s %(ip)s:%(port)s
-  cookie  SERVERID insert
-  balance roundrobin
-
 %(server_text)s
-
-  option httpchk GET %(server_check_path)s
-
-  stats uri /haproxy
-  stats realm Global\ statistics

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/lamp/template/my.cnf.in

@@ -21,7 +21,7 @@ long_query_time = 5
 max_allowed_packet = 128M
 query_cache_size = 32M
 
-plugin-load = ha_mroonga.so;ha_sphinx.so
+plugin-load = ha_mroonga.so
 
 # The following are important to configure and depend a lot on to the size of
 # your database and the available resources.

slapos/recipe/librecipe/__init__.py

@@ -35,12 +35,28 @@ import netaddr
 import time
 import re
 import urlparse
+import json
 
 # Use to do from slapos.recipe.librecipe import GenericBaseRecipe
 from generic import GenericBaseRecipe
 from genericslap import GenericSlapRecipe
 from filehash import filehash
 
+# Utility functions to (de)serialise live python objects in order to send them
+# to master.
+JSON_SERIALISED_MAGIC_KEY = '_'
+def wrap(value):
+  return {JSON_SERIALISED_MAGIC_KEY: json.dumps(value)}
+
+def unwrap(value):
+  try:
+    value = value[JSON_SERIALISED_MAGIC_KEY]
+  except (KeyError, TypeError):
+    pass
+  else:
+    value = json.loads(value)
+  return value
+
 class BaseSlapRecipe:
   """Base class for all slap.recipe.*"""
 

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, 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/mysql/__init__.py

@@ -107,6 +107,7 @@ class Recipe(GenericBaseRecipe):
         mysql_binary=mysql_binary,
         socket=socket,
         configuration_file=mysql_conf_file,
+        cwd=self.options['mysql-base-directory'],
        )
     )
     path_list.append(mysqld)

slapos/recipe/mysql/mysql.py

@@ -17,7 +17,7 @@ def runMysql(conf):
       popen = subprocess.Popen([conf['mysql_install_binary'],
         '--skip-name-resolve', '--skip-host-cache', '--no-defaults',
         '--datadir=%s' % conf['data_directory']],
-        stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=conf['cwd'])
       result = popen.communicate()[0]
       if popen.returncode is None or popen.returncode != 0:
         print "Failed to initialise server.\nThe error was: %s" % result

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

@@ -19,7 +19,7 @@ long_query_time = 5
 max_allowed_packet = 128M
 query_cache_size = 32M
 
-plugin-load = ha_mroonga.so;ha_sphinx.so
+plugin-load = ha_mroonga.so
 
 # The following are important to configure and depend a lot on to the size of
 # your database and the available resources.

slapos/recipe/neoppod.py

+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class NeoBaseRecipe(GenericBaseRecipe):
+
+  _binding_port_mandatory = True
+
+  def install(self):
+    options = self.options
+    if not options['masters']:
+      # All parameters are always provided.
+      # This parameter needs special care, because it is initially generated
+      # empty, until all requested master nodes get their partitions
+      # allocated.
+      # Only then can this recipe start succeeding and actually doing anything
+      # useful, as per NEO deploying constraints.
+      raise Exception('"masters" parameter is mandatory')
+    option_list = [
+      options['binary'],
+      '-l', options['logfile'],
+      '-m', options['masters'],
+      '-b', self._getBindingAddress(),
+      # TODO: reuse partition reference for better log readability.
+      #'-n', options['name'],
+      '-c', options['cluster'],
+    ]
+    if options['verbose']:
+      option_list.append('-v')
+    option_list.extend(self._getOptionList())
+    return [self.createPythonScript(
+      options['wrapper'],
+      'slapos.recipe.librecipe.execute.execute',
+      option_list
+    )]
+
+  def _getBindingAddress(self):
+    options = self.options
+    bind = options['ip']
+    if 'port' in options:
+      # Some node types support port auto-allocation when no binding port is
+      # requested.
+      bind = bind + ':' + options['port']
+    elif self._binding_port_mandatory:
+      raise ValueError('"port" option is mandatory.')
+    return bind
+
+  def _getOptionList(self):
+    raise NotImplementedError
+
+class Storage(NeoBaseRecipe):
+
+  _binding_port_mandatory = False
+
+  def _getOptionList(self):
+    return [
+      '-d', self.options['database-parameters'],
+      '-a', self.options['database-adapter'],
+      '-w', self.options['wait-database'],
+    ]
+
+class Admin(NeoBaseRecipe):
+  def _getOptionList(self):
+    return []
+
+class Master(NeoBaseRecipe):
+  def _getOptionList(self):
+    options = self.options
+    return [
+      '-p', options['partitions'],
+      '-r', options['replicas'],
+    ]

slapos/recipe/publish.py

@@ -25,7 +25,7 @@
 #
 ##############################################################################
 import zc.buildout
-
+from slapos.recipe.librecipe import wrap
 from slapos.recipe.librecipe import GenericSlapRecipe
 
 class Recipe(GenericSlapRecipe):
@@ -36,5 +36,14 @@ class Recipe(GenericSlapRecipe):
 
     for k, v in options.iteritems():
       publish_dict[k] = v
-    self.setConnectionDict(publish_dict)
+    self._setConnectionDict(publish_dict)
     return []
+
+  def _setConnectionDict(self, publish_dict):
+    return self.setConnectionDict(publish_dict)
+
+SERIALISED_MAGIC_KEY = '_'
+
+class Serialised(Recipe):
+  def _setConnectionDict(self, publish_dict):
+    return super(Serialised, self)._setConnectionDict(wrap(publish_dict))

slapos/recipe/pwgen.py

@@ -41,7 +41,9 @@ class Recipe(GenericBaseRecipe):
         password = password_file.read()
     options['password'] = password
 
-  update = install = lambda self: []
+  def install(self):
+    os.chmod(self.options['file'], 0600)
+    return []
 
 class StablePasswordGeneratorRecipe(GenericBaseRecipe):
   """

slapos/recipe/request.py

@@ -25,7 +25,8 @@
 #
 ##############################################################################
 import logging
-
+from slapos.recipe.librecipe import wrap, JSON_SERIALISED_MAGIC_KEY
+import json
 from slapos import slap as slapmodule
 
 class Recipe(object):
@@ -119,19 +120,33 @@ class Recipe(object):
       for config_parameter in options['config'].split():
         partition_parameter_kw[config_parameter] = \
             options['config-%s' % config_parameter]
+    partition_parameter_kw = self._filterForStorage(partition_parameter_kw)
 
     self.instance = instance = request(software_url, software_type,
       name, partition_parameter_kw=partition_parameter_kw,
       filter_kw=filter_kw, shared=isSlave)
-
+    return_parameter_dict = self._getReturnParameterDict(instance,
+      return_parameters)
     for param in return_parameters:
       try:
-        options['connection-%s' % param] = str(
-          instance.getConnectionParameter(param))
-      except slapmodule.NotFoundError:
-        options['connection-%s' % param] = ''
+        value = return_parameter_dict[param]
+      except KeyError:
+        value = ''
         if self.failed is None:
           self.failed = param
+      options['connection-%s' % param] = value
+
+  def _filterForStorage(self, partition_parameter_kw):
+    return partition_parameter_kw
+
+  def _getReturnParameterDict(self, instance, return_parameter_list):
+    result = {}
+    for param in return_parameter_list:
+      try:
+        result[param] = str(instance.getConnectionParameter(param))
+      except slapmodule.NotFoundError:
+        pass
+    return result
 
   def install(self):
     if self.failed is not None:
@@ -150,3 +165,13 @@ class Recipe(object):
     return []
 
   update = install
+
+class Serialised(Recipe):
+  def _filterForStorage(self, partition_parameter_kw):
+    return wrap(partition_parameter_kw)
+
+  def _getReturnParameterDict(self, instance, return_parameter_list):
+    try:
+      return json.loads(instance.getConnectionParameter(JSON_SERIALISED_MAGIC_KEY))
+    except slapmodule.NotFoundError:
+      return {}

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/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/slapconfiguration.py

@@ -25,6 +25,7 @@
 #
 ##############################################################################
 import slapos.slap
+from slapos.recipe.librecipe import unwrap
 from ConfigParser import RawConfigParser
 from netaddr import valid_ipv4, valid_ipv6
 
@@ -91,9 +92,21 @@ class Recipe(object):
           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')
+      # Make them available as individual section keys.
+      for his_key in (
+                  'slap_software_type',
+                  'slap_computer_partition_id',
+                  'slap_computer_id',
+                  'slap_software_release_url',
+                  'slave_instance_list',
+                  'timestamp',
+              ):
+          try:
+              value = parameter_dict.pop(his_key)
+          except KeyError:
+              pass
+          else:
+              options[his_key.replace('_', '-')] = value
       ipv4_set = set()
       v4_add = ipv4_set.add
       ipv6_set = set()
@@ -110,11 +123,23 @@ class Recipe(object):
       options['ipv4'] = ipv4_set
       options['ipv6'] = ipv6_set
       options['tap'] = tap_set
-      options['configuration'] = parameter_dict
+      parameter_dict = self._expandParameterDict(options, parameter_dict)
       match = self.OPTCRE_match
       for key, value in parameter_dict.iteritems():
           if match(key) is not None:
               continue
           options['configuration.' + key] = value
 
+  def _expandParameterDict(self, options, parameter_dict):
+      options['configuration'] = parameter_dict
+      return parameter_dict
+
   install = update = lambda self: []
+
+class Serialised(Recipe):
+  def _expandParameterDict(self, options, parameter_dict):
+      options['configuration'] = parameter_dict = unwrap(parameter_dict)
+      if isinstance(parameter_dict, dict):
+          return parameter_dict
+      else:
+          return {}

slapos/recipe/slaprunner/__init__.py

@@ -58,6 +58,7 @@ class Recipe(GenericBaseRecipe):
         supervisord_config=os.path.join(self.instance_directory, 'etc',
           'supervisord.conf'),
         runner_workdir=self.workdir,
+        etc_dir=self.options['etc_dir'],
         runner_host=self.ipv6,
         runner_port=self.runner_port,
         ipv4_address=self.ipv4,
@@ -81,8 +82,9 @@ class Recipe(GenericBaseRecipe):
         PATH=os.path.dirname(self.options['git-binary']) + ':' + os.environ['PATH'],
         GIT_SSH=self.options['ssh_client']
     )
-
-    launch_args = [self.options['slaprunner'].strip(), config_file, '--debug']
+    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',

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

@@ -19,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/tidstorage/template/tidstorage.py.in

 known_tid_storage_identifier_dict = %(known-tid-storage-identifier-dict)s
-base_url = '%(base-url)s'
 address = '%(ip)s'
 port = %(port)s
 

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/xwiki/template/my.cnf.in

@@ -21,7 +21,7 @@ long_query_time = 5
 max_allowed_packet = 128M
 query_cache_size = 32M
 
-plugin-load = ha_mroonga.so;ha_sphinx.so
+plugin-load = ha_mroonga.so
 
 # The following are important to configure and depend a lot on to the size of
 # your database and the available resources.

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/__init__.py

@@ -56,7 +56,9 @@ class Recipe(GenericBaseRecipe):
                                     'zeo-filestorage-snippet.conf.in')
     # Prepare all filestorages
     filestorage_snippet = ""
-    for storage_definition in self.options['storage'].splitlines():
+    storage = self.options['storage']
+    if isinstance(storage, basestring):
+      for storage_definition in storage.splitlines():
         storage_definition = storage_definition.strip()
         if not storage_definition:
           continue
@@ -67,6 +69,10 @@ class Recipe(GenericBaseRecipe):
             zodb_path = q.split('=')[1].strip()
         filestorage_snippet += self.substituteTemplate(
             snippet_filename, dict(storage_name=storage_name, path=zodb_path))
+    else:
+      for storage_name, path in storage:
+        filestorage_snippet += self.substituteTemplate(snippet_filename,
+          {'storage_name': storage_name, 'path': path})
 
     config = dict(
       zeo_ip=self.options['ip'],

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/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/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/software.cfg

@@ -6,9 +6,10 @@ extends =
 versions = versions
 
 # Local development
-develop +=
+develop =
   ${:parts-directory}/slapos.cookbook-repository
   ${:parts-directory}/cloudooo-repository
+
 parts +=
 # Local development
   slapos.cookbook-repository

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/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/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/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/software.cfg

@@ -5,8 +5,8 @@ extends =
 
 [application]
 recipe = slapos.recipe.build:download-unpacked
-url = http://ftp.drupal.org/files/projects/drupal-7.14.tar.gz
-md5sum = af7abd95c03ecad4e1567ed94a438334
+url = http://ftp.drupal.org/files/projects/drupal-7.15.tar.gz
+md5sum = f42c9baccd74e1d035d61ff537ae21b4
 
 [application-template]
 recipe = slapos.recipe.download

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
+Software types
+==============
+Which software type is an entry point and can be used for root software
+instance.
 
-Instance Parameters
-===================
+Parameters are expected to be passed as of *.serialised recipes expect them::
 
-Zope Parameters
----------------
-Needed by software-type development (default) and zope.
+```
+<?xml version='1.0' encoding='utf-8'?>
+<instance>
+  <parameter id="_">...</parameter>
+</instance>
+```
+
+where `...` is a json expression (typically a dict).
+
+single (default)
+----------------
+This creates an ERP5 instance suited for small needs/resources, or local
+development. A minimal ERP5 site is created when instance is started.
 
 frontend-software-url
 ~~~~~~~~~~~~~~~~~~~~~
@@ -31,3 +43,257 @@ frontend-domain (optional)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 Domain name frontend must recognise as belonging to this instance.
 
+cluster
+-------
+This creates a massive ERP5 instance suited for high-demanding production
+setups - which also have a lot of available resources (several machines,
+several CPUs per machine, GBs of ram, several machines...).
+
+For each available key in the outmost dict are described below.
+Publishes a dict in which each entry is the URL to a balancer entry point
+(apache listening socket), witht the same keys as zope-partition-dict.
+
+'zodb-software-type' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Storage mechanism to use. To know the list of supported values, see all keys in
+instance.cfg.in's section [switch-softwaretype] which start with "zodb-".
+Defaults to 'zeo'.
+
+'zodb-dict' (dict, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Describes ZODBs to create and use in the instance. At least one entry is
+required to achieve anything sensible with the instance.
+key (str)
+  Zope internal name for this ZODB. Used to tell mountpoints apart in the ZMI
+  when populating them.
+value (dict)
+  key (str)
+    Possible keys and associated value types:
+    'storage-family' (str, optional)
+      Storage family. All zodbs requested with the same value are provided
+      by the same service (ex: same ZEO process). Might not be supported by
+      all zodb-software-type, silently ignored if so (ie, each ZODB gets its
+      own family).
+      Defaults to 'default'.
+    'mount-point' (str, optional)
+      Storage mount point.
+      Defaults to '/'.
+    'cache-size' (int, optional)
+      Storage ZODB cache size (aka 'Connection cache'), in objects. No value
+      is specified when negative is provided (ie, uses ZODB's default).
+      Defaults to -1.
+    'storage-dict' (dict, optional)
+      Storage-type-specific parameters. For example, it can be used to tell where
+      a ZEO filestorage database is located.
+      When zodb-software-type is 'zeo', the following keys are supported:
+      'path' (string, optional)
+        FileStorage file path. Occurrences of '%(zodb)s' are replaced with the
+        path to partition's srv/zodb directory.
+        Defaults to '%(zodb)s/', Zope's internal name for this ZODB, and '.fs'.
+      'client' (dict, optional)
+        Client(=Zope)-side settings. 'server' and 'storage' keys will be
+        overwritten. Keys and values are expected to be strings, and map
+        directly to options in the resulting <zeoclient> section.
+        Defaults to {}.
+
+'tidstorage-dict' (dict, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Backup parameters for tidstorage-related backup scripts.
+TIDStorage is not deployed if not provided.
+key (str)
+  Possible keys and associated value types:
+  'zodb-dict' (dict, optional)
+    key (str)
+      (same as zodb-dict)
+    value (str, optional)
+      Path to store backups of this zodb into. Occurrences of '%(backup)s' are
+      replaced with the path to partition's srv/backup/zodb directory.
+    Defaults to {}.
+    If an item is missing compared to zodb-dict, value defaults to
+    '%(backup)s/' + key.
+  'timestamp-path' (str, optional)
+    Path to backup timestamp file.
+    Occurrences of '%(backup)s' are replaced with the path to partition's
+    srv/backup/tidstorage directory.
+    Defaults to '%(backup)s/repozo_tidstorage_timestamp.log'.
+
+'zope-partition-dict' (dict, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+key (str)
+  Instance name.
+value (dict)
+  Possible keys and associated value types:
+  'family' (str, optional)
+    The family this partition is part of. For example: 'public', 'admin',
+    'backoffice', 'web-service'... Each family gets its own frontend
+    (=client-facing ip & port). It has no special meaning as far as
+    buildout is concerned.
+    Defaults to 'default'.
+  'instance-count' (int, optional)
+    The number of Zopes to setup on this partition.
+    Defaults to 1.
+  'thread-amount' (int, optional)
+    The number of worker threads for each created Zope process.
+    Defaults to 1.
+  'timerserver-interval' (int, optional)
+    The timerserver tick perdiod. 0 to disable timerserver.
+    Defaults to 5.
+  'computer-guid' (string, optional)
+    Computer on which partition should be allocated.
+    Defauts to the same computer as the one this .cfg is executed in.
+  'longrequest-logger-interval' (int, optional)
+    The period, in seconds, with which LongRequestLogger polls worker thread
+    stack traces. -1 to disable.
+    Defaults to -1.
+  'longrequest-logger-timeout' (int, optional)
+    The transaction duration after which LongRequestLogger will start logging
+    its stack trace, in seconds. Ignored if longrequest-logger-interval is -1.
+    Defaults to 1.
+  'port-base' (int, optional)
+    Start allocating ports at this value. Useful if one needs to make several
+    partitions share the same port range (ie, several partitions bound to a
+    single address).
+    Defaults to 2000.
+
+'haproxy-maxconn' (int, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The number of connections haproxy accepts for a given backend.
+See haproxy's "server maxconn" setting.
+Defaults to 1 (correct for single-worker-threaded zopes).
+
+'haproxy-server-check-path' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The path haproxy accesses on a each backend to test their responsiveness.
+Occurrences of '%(site-id)s' are replaced with site-id value (see below).
+Defaults to '/'.
+
+'apache-backend-path' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Used as a rewriterule to strip components from site's URL.
+Occurrences of '%(site-id)s' are replaced with site-id value (see below).
+XXX: You may want to avoid using this when also requesting a frontend apache.
+Defaults to '/' (ie, nothing is stripped).
+
+'apache-access-control-string' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The list of hosts apache accepts connections from.
+Defaults to 'all'.
+
+'apache-ssl-authentication' (booleanish, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Controls certificate-based authentication.
+Defaults to '0' (disabled).
+
+'site-id' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~
+Site object's id. Defaults to 'erp5'.
+
+'ca' (dict, optional)
+~~~~~~~~~~~~~~~~~~~~~
+Certificate autority parameters.
+Possible keys and associated value types:
+'country-code' (str, optional)
+  ISO 3166-1 alpha-2 country code. Defaults to 'ZZ'.
+'email' (str, optional)
+  E-mail address. Defaults to 'nobody@example.com'
+'state' (str, optional)
+  State name. Defaults to 'Dummy State'.
+'city' (str, optional)
+  City name. Default to 'Dummy City'.
+'company' (str, optional)
+  Company name. Defaults to 'Dummy Company'.
+
+'use-ipv6' (boolean, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Use IPv6 to communicate between partitions.
+Defaults to False.
+
+'test-database-amount' (int, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The number of databases to create in mariadb instance for tests' needs.
+Defaults to 0.
+
+'mariadb-computer-guid' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Computer GUID identifying the partition mariadb is to be requested on.
+Defaults to "cluster" software type's partition's effective computer GUID.
+
+'cloudooo-computer-guid' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Computer GUID identifying the partition cloudooo is to be requested on.
+Defaults to "cluster" software type's partition's effective computer GUID.
+
+'memcached-computer-guid' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Computer GUID identifying the partition memcached is to be requested on.
+Defaults to "cluster" software type's partition's effective computer GUID.
+
+'kumofs-computer-guid' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Computer GUID identifying the partition kumofs is to be requested on.
+Defaults to "cluster" software type's partition's effective computer GUID.
+
+'zodb-computer-guid' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Computer GUID identifying the partition ZODB server is to be requested on.
+Defaults to "cluster" software type's partition's effective computer GUID.
+
+'balancer-computer-guid' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Computer GUID identifying the partition balander (haproxy, apache, some HTTP
+cache) is to be requested on.
+Defaults to "cluster" software type's partition's effective computer GUID.
+
+'cloudooo-json' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+XXX: what is this ?
+XXX: should not require serialising json by hand as parameter value
+
+'bt5' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~
+XXX: what is this ?
+Defaults to 'erp5_full_text_myisam_catalog \
+erp5_configurator_standard \
+erp5_configurator_maxma_demo \
+erp5_configurator_ung \
+erp5_configurator_run_my_doc'.
+
+'bt5-repository-url' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+XXX: what is this ?
+Defaults to SR's buildout['local-bt5-repository']['list'].
+
+'smtp-url' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+XXX: what is this ?
+Defaults to 'smtp://localhost:25/'.
+
+'timezone' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+Timezone to put processes in (default timezone for DateTime instances).
+Defaults to 'Europe/Paris'.
+
+'frontend-software-url' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Frontend's software url.
+Defaults to ''.
+If non-empty, the following options are used (otherwise, they are all
+optional and ignored):
+
+'frontend-software-type' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Frontend's software type.
+Defaults to 'RootSoftwareInstance'
+
+'frontend-instance-guid' (str, mandatory)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Instance GUID identifying the partition frontend is on.
+
+'frontend-domain' (str, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The domain name used to access this ERP5 cluster, ignored if empty.
+Defaults to ''.
+
+For a better description of these parameters, see a frontend software
+release documentation.
+

software/erp5testnode/software.cfg

@@ -232,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/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/README.txt

+gitrepo
+=======
+
+This software release allow you to get a private mono-user git
+repository with web interface.
+
+This software release only need one parameter “repos”, which is
+a json object of the repos and their description.
+
+It can receive a “title” parameter as well in order to specify
+a title for gitweb interface interface.
+
+Example
+--------
+
+::
+  repo = request(
+      software_release=gitrepo,
+      partiion_reference="My SlapGit",
+      partition_parameter_kw={
+        'repos': """
+          {
+            "repo": "description",
+            "foo": "bar"
+          }
+        """,
+        'title': 'optional title',
+      }
+  )
+

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

+#!/usr/bin/env sh
+
+## This is a very dirty hack
+export PATH_INFO="$${REDIRECT_URL:-$PATH_INFO}"
+
+GIT_PROJECT_ROOT='${git-repos:base-directory}' GIT_HTTP_EXPORT_ALL= exec '${:githttpbackend}' $@

software/gitrepo/gitweb.cgi.in

+#!/usr/bin/env sh
+
+GITWEB_CONFIG='${gitweb-conf:output}' exec '${:perl}' '${:gitweb}' $@

software/gitrepo/gitweb.conf.in

+$projectroot = '${git-repos:base-directory}';
+
+$site_name = '${slap-parameter:title}';
+
+our @git_base_url_list = qw(${:url-list});
+
+# Beautiful URLs
+$feature{'pathinfo'}{'default'} = [1];
+$feature{'blame'}{'default'} = [1];

software/gitrepo/httpd.conf.in

+PidFile "${:pid-file}"
+Listen ${slap-network-information:global-ipv6}:${:port}
+ServerAdmin someone@email
+
+ErrorLog "${:error-log}"
+LogLevel warn
+
+ScriptSock "${:cgid-sock}"
+
+<Directory />
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+</Directory>
+
+Alias "/static/" "${:gitweb-static-dir}"
+<Directory "${:gitweb-static-dir}">
+    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})$"          "${:project-dir}/$1"
+AliasMatch "^/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$" "${:project-dir}/$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))(/push)?$" \
+        "${:git-http-backend}/$1"
+
+# Everything else is gitweb interface
+ScriptAlias "/"                                                "${:gitweb-script}/"
+
+<Location />
+    Order deny,allow
+    Allow from all
+    RewriteEngine On
+    RewriteCond %{QUERY_STRING} service=git-receive-pack
+    RewriteRule ^(.*)$ $1/push [END]
+</Location>
+
+<LocationMatch "(^/.*/git-receive-pack|/push)$">
+    AuthType Basic
+    AuthName "Git Push Access"
+    AuthBasicProvider file
+    AuthUserFile "${:passwd-file}"
+    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 rewrite_module modules/mod_rewrite.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 =
+  publish
+  httpd
+  httpd-conf
+  gitweb-conf
+  gitweb-cgi
+  gitdaemon
+  git-http-backend-cgi
+  htpasswd
+  pwgen
+  git-repos
+
+[publish]
+recipe = slapos.cookbook:publish
+url = http://[$${slap-network-information:global-ipv6}]:$${httpd-conf:port}/
+user = $${pwgen:user}
+password = $${pwgen:password}
+
+[httpd]
+recipe = slapos.cookbook:wrapper
+command-line = ${apache:location}/bin/httpd -DFOREGROUND -f "$${httpd-conf:output}"
+output = $${basedirectory:services}/httpd
+
+
+[httpd-conf]
+recipe = slapos.recipe.template
+url = ${template-httpd-conf:location}/${template-httpd-conf:filename}
+output = $${rootdirectory:etc}/httpd.conf
+
+pid-file = $${basedirectory:run}/httpd.pid
+error-log = $${basedirectory:log}/httpd-errorlog.log
+gitweb-static-dir = ${gitweb:location}/share/gitweb/static/
+gitweb-script = $${gitweb-cgi:output}
+git-http-backend = $${git-http-backend-cgi:output}
+cgid-sock = $${basedirectory:run}/cgid.sock
+project-dir = $${git-repos:base-directory}
+passwd-file = $${htpasswd:output}
+port = 8080
+
+
+[gitweb-conf]
+recipe = slapos.recipe.template
+url = ${template-gitweb-conf:location}/${template-gitweb-conf:filename}
+output = $${rootdirectory:etc}/gitweb.conf
+url-list = http://[$${slap-network-information:global-ipv6}]:$${httpd-conf:port} git://[$${slap-network-information:global-ipv6}]
+
+[gitweb-cgi]
+recipe = slapos.recipe.template
+url = ${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
+
+
+[git-http-backend-cgi]
+recipe = slapos.recipe.template
+url = ${template-git-http-backend-cgi:location}/${template-git-http-backend-cgi:filename}
+output = $${rootdirectory:bin}/git-http-backend.cgi
+mode = 700
+
+githttpbackend = ${git:location}/libexec/git-core/git-http-backend
+
+[gitdaemon]
+recipe = slapos.cookbook:wrapper
+ip = $${slap-network-information:global-ipv6}
+port = 9418
+command-line = ${git:location}/bin/git daemon --export-all --listen=$${:ip} --port=$${:port} --interpolated-path=$${git-repos:base-directory}/%D
+output = $${basedirectory:services}/git-daemon
+
+[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 = 15dd1b7ea3259197b847e94342adf872
+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 = 5c720202053bfba06eec6e97d8d47cd0
+
+[template-gitweb-conf]
+<= template-download
+filename = gitweb.conf.in
+md5sum = 580d4bd2723f7e0a44ec8fc5b360b429
+
+[template-git-http-backend-cgi]
+<= template-download
+filename = git-http-backend.cgi.in
+md5sum = 7e0562b0ce8d48bc8f6b422850dc53af
+
+[template-httpd-conf]
+<= template-download
+filename = httpd.conf.in
+md5sum = e5e6a6de32323248d11918934f6aad99
+
+[collective-recipe-cmd]
+recipe = zc.recipe.egg
+eggs =
+  collective.recipe.cmd
+
+
+[version]
+slapos.cookbook = 0.64.2

software/html5as/README.md

+# Html5 Application Server #
+
+## Presentation ##
+
+* Fast hosting software for static website (html5)
+
+* Use Nginx server
+
+## Parameter ##
+
+download_url (string) :required
+
+Details :
+
+* Only tarball (tar) is supported
+
+* Compressed format is gunzip (optional)
+
+* Tarball must contain an index.html at its root
+
+## How it works ##
+
+Each time you (re)start your instance or update parameters, html5as will remove previous website then download tarball and extract it in docroot directory.

software/html5as/instance.cfg

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

software/html5as/instance_html5as.cfg

+[buildout]
+parts =
+    nginx_conf
+    downloader
+    launcher
+    mime_types
+    publish-connection-information
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+# partition tree
+# /
+# |- etc/
+# |    |- nginx.conf
+# |    |- run/
+# |         |- html5as (binary)
+# |- var/
+# |    |- run/
+# |    |    |- nginx.pid
+# |    |- log/
+# |    |    |- nginx.log
+# |    |    |- nginx.access.log
+# |- srv/
+# |    |- html5as/ (doc root)
+# |    |        |- index.html
+# |    |- backup/
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+var = $${buildout:directory}/var
+srv = $${buildout:directory}/srv
+tmp = $${buildout:directory}/tmp
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+services = $${rootdirectory:etc}/run
+log = $${rootdirectory:var}/log
+run = $${rootdirectory:var}/run
+backup = $${rootdirectory:srv}/backup
+data = $${rootdirectory:srv}/html5as
+
+[tempdirectory]
+recipe = slapos.cookbook:mkdirectory
+client_body_temp_path = $${rootdirectory:tmp}/client_body_temp_path
+proxy_temp_path = $${rootdirectory:tmp}/proxy_temp_path
+fastcgi_temp_path = $${rootdirectory:tmp}/fastcgi_temp_path
+uwsgi_temp_path = $${rootdirectory:tmp}/uwsgi_temp_path
+scgi_temp_path = $${rootdirectory:tmp}/scgi_temp_path
+
+[html5as]
+# Options
+nb_workers = 2
+
+# Network
+ip = $${slap-network-information:global-ipv6}
+port = 8080
+
+# Paths
+# Log
+path_pid = $${basedirectory:run}/nginx.pid
+path_log = $${basedirectory:log}/nginx.log
+path_access_log = $${basedirectory:log}/nginx.access.log
+path_error_log = $${basedirectory:log}/nginx.error.log
+path_tmp = $${buildout:directory}/tmp
+# Docroot
+docroot = $${basedirectory:data}
+default_index = $${basedirectory:data}/index.html
+# Config files
+path_nginx_conf = $${rootdirectory:etc}/nginx.conf
+path_mime_types = $${rootdirectory:etc}/mime_types
+# Executables
+bin_nginx = ${nginx:location}/sbin/nginx
+bin_launcher = $${basedirectory:services}/launcher
+bin_downloader = $${basedirectory:services}/downloader
+
+# Utils
+path_shell = ${dash:location}/bin/dash
+path_curl = ${curl:location}/bin/curl
+path_tar = ${tar:location}/bin/tar
+
+[nginx_conf]
+recipe = slapos.recipe.template:jinja2
+template = ${template_nginx_conf:location}/${template_nginx_conf:filename}
+rendered = $${html5as:path_nginx_conf}
+context = 
+    section param_html5as html5as
+    section param_tempdir tempdirectory
+
+[mime_types]
+recipe = slapos.recipe.template:jinja2
+template = ${template_mime_types:location}/${template_mime_types:filename}
+rendered = $${html5as:path_mime_types}
+
+[downloader]
+recipe = slapos.recipe.template:jinja2
+template = ${template_downloader:location}/${template_downloader:filename}
+rendered = $${html5as:bin_downloader}
+mode = 700
+context = 
+    section param_html5as html5as
+    key download_url slap-parameter:download_url
+
+[launcher]
+recipe = slapos.recipe.template:jinja2
+template = ${template_launcher:location}/${template_launcher:filename}
+rendered = $${html5as:bin_launcher}
+mode = 700
+context = 
+    section param_html5as html5as
+
+[publish-connection-information]
+recipe = slapos.cookbook:publish
+server_url = http://[$${html5as:ip}]:$${html5as:port}

software/html5as/software.cfg

+[buildout]
+versions = versions
+extensions = buildout-versions
+
+
+
+extends =
+  ../../stack/slapos.cfg
+  ../../component/nginx/buildout.cfg
+  ../../component/curl/buildout.cfg
+  ../../component/dash/buildout.cfg
+  ../../component/tar/buildout.cfg
+
+allow-hosts =
+    *.nexedi.org
+    *.python.org
+    *.sourceforge.net
+    www.slapos.org
+    launchpad.net
+    github.com
+    alastairs-place.net
+    www.alittletooquiet.net
+
+parts =
+    dash
+    tar
+    curl
+    nginx
+    eggs
+    template
+    template_nginx_conf
+    template_downloader
+    template_launcher
+    template_mime_types
+    instance_html5as
+
+[eggs]
+recipe = z3c.recipe.scripts
+eggs = slapos.cookbook
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+output = ${buildout:directory}/template.cfg
+md5sum = 918e0d6513e4d1c92051431d83261dab
+mode = 0644
+
+[instance_html5as]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance_html5as.cfg
+output = ${buildout:directory}/template_html5as.cfg
+md5sum = 579eceb768e8d25fb53338fc4fac6944
+mode = 0644
+
+[template_nginx_conf]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/templates/nginx_conf.in
+md5sum = 0ae1fb1c777c332d76f680c681a4f48a
+filename = nginx_conf.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[template_launcher]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/templates/launcher.in
+md5sum = acf5bb55ceac2e826259d28ed5c1de3a
+filename = launcher.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[template_downloader]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/templates/downloader.in
+md5sum = 7b374a03f4086fcae47491d449da1f09
+filename = downloader.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[template_mime_types]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/templates/mime_types.in
+md5sum = 4ef94a7b458d885cd79ba0b930a5727e
+filename = mime_types.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[versions]
+zc.buildout = 1.6.0-dev-SlapOS-006
+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.61
+slapos.recipe.template = 2.4.2
+slapos.recipe.download = 1.0.dev-r4053
+z3c.recipe.scripts = 1.0.1
+
+# Required by:
+# slapos.core==0.28.2
+Flask = 0.9
+
+# Required by:
+# slapos.cookbook==0.61
+PyXML = 0.8.4
+
+# Required by:
+# netaddr==0.7.7
+Sphinx = 1.1.3
+
+# Required by:
+# slapos.cookbook==0.61
+inotifyx = 0.2.0
+
+# Required by:
+# slapos.cookbook==0.61
+# slapos.core==0.28.2
+# xml-marshaller==0.9.7
+lxml = 2.3.5
+
+# Required by:
+# slapos.cookbook==0.61
+netaddr = 0.7.7
+
+# Required by:
+# slapos.core==0.28.2
+netifaces = 0.8
+
+# Required by:
+# slapos.cookbook==0.61
+# slapos.core==0.28.2
+# zc.buildout==1.6.0-dev-SlapOS-006
+# zc.recipe.egg==1.3.2
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.61
+slapos.core = 0.28.2
+
+# Required by:
+# slapos.core==0.28.2
+supervisor = 3.0a12
+
+# Required by:
+# slapos.cookbook==0.61
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.cookbook==0.61
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.28.2
+zope.interface = 4.0.1
+
+# Required by:
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.5.1
+
+[networkcache]
+# signature certificates of the following uploaders.
+# Łukasz Nowak
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJANLesB1hoQIEMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMTMyMCAXDTEyMDgyODE0MjEyOFoYDzIxMTIwODA0MTQyMTI4WjAT
+  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  9ED8i6211znu1Z0milwuNZCLlmQlFP590neGjvSRla7wzIBwWreNAX2Hl05sd1og
+  PFZBSeWsStFHQRqjNYOx1WoS4olRGIAwiwLh3Hgmkc8oOe7/q3W22xOZTUXOIiq1
+  FV96jUHe9RmZ910VqLPCMK44aCTmabSCWwk4OfRzI3kCAwEAAaNQME4wHQYDVR0O
+  BBYEFBgvpmTAS/O9vfvSLnwKy/eJC/NAMB8GA1UdIwQYMBaAFBgvpmTAS/O9vfvS
+  LnwKy/eJC/NAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAM3qIP3sY
+  DtqzUJJ7WEbD0dcniHGEycOk/3EKB663jULar+KOuTIFmMGOy5MVWcDsCqjODWXK
+  9LnVeCSkC4Ct8kvkT/WdRFF/nqprbZ6bUrhx2yAKTH6CMhIjDJ8F7fAkH48fLD7M
+  HPuwnRO7OewFpzT/gfQgFKpmVBNUYq7YddE=
+  -----END CERTIFICATE-----

software/html5as/templates/downloader.in

+#! {{ param_html5as['path_shell'] }}
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+
+# Remove exsistant website
+rm -r {{ param_html5as['docroot'] }}/*
+
+# Download and extract website tarball into docroot directory
+exec {{ param_html5as['path_curl'] }} -s {{ download_url }} | {{ param_html5as['path_tar'] }} -z -x -C {{ param_html5as['docroot'] }}

software/html5as/templates/launcher.in

+#! {{ param_html5as['path_shell'] }}
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+
+# Run nginx
+exec {{ param_html5as['bin_nginx'] }} -c {{ param_html5as['path_nginx_conf'] }}

software/html5as/templates/mime_types.in

+types {
+	text/html				html htm shtml;
+	text/css				css;
+	text/xml				xml rss;
+	image/gif				gif;
+	image/jpeg				jpeg jpg;
+	application/x-javascript		js;
+	application/atom+xml			atom;
+
+	text/mathml				mml;
+	text/plain				txt;
+	text/vnd.sun.j2me.app-descriptor	jad;
+	text/vnd.wap.wml			wml;
+	text/x-component			htc;
+
+	image/png				png;
+	image/tiff				tif tiff;
+	image/vnd.wap.wbmp			wbmp;
+	image/x-icon				ico;
+	image/x-jng				jng;
+	image/x-ms-bmp				bmp;
+	image/svg+xml				svg svgz;
+
+	application/java-archive		jar war ear;
+	application/mac-binhex40		hqx;
+	application/msword			doc;
+	application/pdf				pdf;
+	application/postscript			ps eps ai;
+	application/rtf				rtf;
+	application/vnd.ms-excel		xls;
+	application/vnd.ms-powerpoint		ppt;
+	application/vnd.wap.wmlc		wmlc;
+	application/vnd.google-earth.kml+xml	kml;
+	application/vnd.google-earth.kmz	kmz;
+	application/x-7z-compressed		7z;
+	application/x-cocoa			cco;
+	application/x-java-archive-diff		jardiff;
+	application/x-java-jnlp-file		jnlp;
+	application/x-makeself			run;
+	application/x-perl			pl pm;
+	application/x-pilot			prc pdb;
+	application/x-rar-compressed		rar;
+	application/x-redhat-package-manager	rpm;
+	application/x-sea			sea;
+	application/x-shockwave-flash		swf;
+	application/x-stuffit			sit;
+	application/x-tcl			tcl tk;
+	application/x-x509-ca-cert		der pem crt;
+	application/x-xpinstall			xpi;
+	application/xhtml+xml			xhtml;
+	application/zip				zip;
+
+	application/octet-stream		bin exe dll;
+	application/octet-stream		deb;
+	application/octet-stream		dmg;
+	application/octet-stream		eot;
+	application/octet-stream		iso img;
+	application/octet-stream		msi msp msm;
+	application/ogg				ogx;
+
+	audio/midi				mid midi kar;
+	audio/mpeg				mpga mpega mp2 mp3 m4a;
+	audio/ogg				oga ogg spx;
+	audio/x-realaudio			ra;
+	audio/webm				weba;
+
+	video/3gpp				3gpp 3gp;
+	video/mp4				mp4;
+	video/mpeg				mpeg mpg mpe;
+	video/ogg				ogv;
+	video/quicktime				mov;
+	video/webm				webm;
+	video/x-flv				flv;
+	video/x-mng				mng;
+	video/x-ms-asf				asx asf;
+	video/x-ms-wmv				wmv;
+	video/x-msvideo				avi;
+}

software/html5as/templates/nginx_conf.in

+worker_processes {{ param_html5as['nb_workers'] }};
+
+pid {{ param_html5as['path_pid'] }};
+error_log {{ param_html5as['path_error_log'] }};
+
+daemon off;
+
+events {
+	worker_connections 1024;
+	accept_mutex off;
+}
+
+http {
+	include {{ param_html5as['path_mime_types'] }};
+	default_type application/octet-stream;
+    access_log {{ param_html5as['path_access_log'] }} combined;
+	index index.html;
+
+    server {
+        listen [{{ param_html5as['ip'] }}]:{{ param_html5as['port'] }};
+        server_name _;
+
+        keepalive_timeout 5;
+        client_body_temp_path {{ param_tempdir['client_body_temp_path'] }};
+        proxy_temp_path {{ param_tempdir['proxy_temp_path'] }};
+        fastcgi_temp_path {{ param_tempdir['fastcgi_temp_path'] }};
+        uwsgi_temp_path {{ param_tempdir['uwsgi_temp_path'] }};
+        scgi_temp_path {{ param_tempdir['scgi_temp_path'] }};
+
+        # path for static files
+        root {{ param_html5as['docroot'] }};
+    }
+}

software/joomla/database.xml-in

+<?xml version="1.0" encoding="utf-8"?>
+<form>
+  <fieldset>
+  	<fieldset name="basic">
+			<field name="db_type" type="databaseconnection"
+				id="db_type" class="inputbox"
+				label="INSTL_DATABASE_TYPE_LABEL"
+				supported="mysql,mysqli,sqlsrv,sqlazure"
+				required="true"
+				default="mysql"
+				filter="string"
+			/>
+
+			<field name="db_host" type="text" id="db_host" class="inputbox"
+				label="INSTL_DATABASE_HOST_LABEL"
+				default="%(mysql_host)s"
+				required="true"
+			/>
+			<field name="db_user" type="text" id="db_user" class="inputbox"
+				label="INSTL_DATABASE_USER_LABEL"
+        default="%(mysql_user)s"
+				required="true"
+			/>
+			<field name="db_pass" type="password" id="db_pass" class="inputbox"
+				label="INSTL_DATABASE_PASSWORD_LABEL"
+        default="%(mysql_password)s"
+				filter="raw"
+			/>
+			<field name="db_name" type="text" id="db_name" class="inputbox"
+				label="INSTL_DATABASE_NAME_LABEL"
+        default="%(mysql_database)s"
+				required="true"
+			/>
+		</fieldset>
+
+		<!-- Advanced Settings -->
+		<fieldset name="advanced">
+			<field name="db_old" type="radio" id="db_old" class="inputbox"
+				label="INSTL_DATABASE_OLD_PROCESS_LABEL"
+				default="backup"
+				required="true"
+			>
+				<option value="backup">INSTL_DATABASE_FIELD_VALUE_BACKUP</option>
+				<option value="remove">INSTL_DATABASE_FIELD_VALUE_REMOVE</option>
+			</field>
+			<field name="db_prefix" type="prefix" id="db_prefix" class="inputbox"
+				label="INSTL_DATABASE_PREFIX_LABEL"
+				required="true"
+				validate="prefix"
+				message="INSTL_DATABASE_PREFIX_MSG"
+			/>
+		</fieldset>
+	</fieldset>
+</form>

software/joomla/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_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql

software/joomla/software.cfg

 [buildout]
 versions = versions
 
-parts =
-  template
-  apache-php
-  mariadb
-  eggs
-  instance-recipe-egg
-  downloadcache-workaround
+
   
 extends =
-  ../../stack/lamp.cfg
+  ../../stack/lamp/buildout.cfg
   ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked
-url = http://joomlacode.org/gf/download/frsrelease/15278/66554/Joomla_1.7.0-Stable-Full_Package.tar.gz
-md5sum = 19451c0352e4c72d871cc8817126286a
-  
-[instance-recipe]
-egg = slapos.cookbook
-module = lamp.simple
-
-[template]
-# Default template for the instance.
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-#${:_profile_base_location_}/instance.cfg
-#md5sum = Student shall put md5 of instance.cfg here
-output = ${buildout:directory}/template.cfg
+url = http://joomlacode.org/gf/download/frsrelease/17173/74758/Joomla_2.5.6-Stable-Full_Package.zip
+md5sum = 3aa7d7b58bfa4eec3c3724209894d14e
+strip-top-level-dir = false
+  
+[application-template]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/database.xml-in
+md5sum = 6ae063318a251b70ae7d037e3ae375d6 
+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.6
-
-# 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
+[application-configuration]
+location = installation/models/forms/database.xml
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically

software/kumofs/software.cfg

 [buildout]
-extensions =
-  buildout-versions
-
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
 
 extends =
   ../../component/kumo/buildout.cfg
@@ -11,23 +6,7 @@ extends =
   ../../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
-  alastairs-place.net
-  dist.repoze.org
-  effbot.org
-  github.com
-  peak.telecommunity.com
-  psutil.googlecode.com
-  www.dabeaz.com
-  www.owlfish.com
-
-versions = versions
+  ../../stack/slapos.cfg
 
 parts =
 # Create instance template
@@ -39,11 +18,6 @@ parts =
   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
-
 [instance-recipe]
 egg = slapos.cookbook
 module = kumofs
@@ -65,74 +39,6 @@ md5sum = 056a4af7128fd9e31da42c85cc039420
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-003
-
-Jinja2 = 2.6
-Werkzeug = 0.8.2
-buildout-versions = 1.7
-erp5.recipe.cmmiforcei686 = 0.1.3
-hexagonit.recipe.cmmi = 1.5.0
-meld3 = 0.6.8
-rdiff-backup = 1.0.5
-slapos.cookbook = 0.38
-slapos.recipe.template = 2.2
-
-# Required by:
-# slapos.core==0.21
-Flask = 0.8
-
-# Required by:
-# slapos.cookbook==0.38
-PyXML = 0.8.5
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# Required by:
-# slapos.cookbook==0.38
-# slapos.core==0.21
-# xml-marshaller==0.9.7
-lxml = 2.3.3
-
-# Required by:
-# slapos.cookbook==0.38
-netaddr = 0.7.6
-
-# Required by:
-# slapos.core==0.21
-netifaces = 0.6
-
-# Required by:
-# slapos.cookbook==0.38
-# slapos.core==0.21
-# zc.buildout==1.6.0-dev-SlapOS-003
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
-
-# Required by:
-# slapos.cookbook==0.38
-slapos.core = 0.21
-
-# Required by:
-# slapos.core==0.21
-supervisor = 3.0a12
-
-# Required by:
-# slapos.cookbook==0.38
-xml-marshaller = 0.9.7
-
-# Required by:
-# erp5.recipe.cmmiforcei686==0.1.3
-# slapos.cookbook==0.38
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.21
-zope.interface = 3.8.0
-
 [networkcache]
 # Cedric de Saint Martin signature certificate
 signature-certificate-list =

software/kvm/instance-kvm.cfg

@@ -126,7 +126,7 @@ db-path = $${rootdirectory:srv}/slapmonitor_database
 
 
 [request-slave-frontend]
-recipe = slapos.cookbook:request
+recipe = slapos.cookbook:requestoptional
 software-url = $${slap-parameter:frontend-software-url}
 server-url = $${slap-connection:server-url}
 key-file = $${slap-connection:key-file}
@@ -158,3 +158,11 @@ 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

@@ -48,7 +48,7 @@ bytes = 24
 [onetimeupload-instance]
 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

software/kvm/software.cfg

@@ -50,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
@@ -133,21 +130,21 @@ command =
 [template-kvm]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-kvm.cfg
-md5sum = c0f24f40e3c55a30fb584c40e81956da
+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 = 692b3da84473fbc962bea9b371b5355b
+md5sum = c030e7be231aba25ee0f51703e60ce67
 output = ${buildout:directory}/template-nbd.cfg
 mode = 0644
 
@@ -169,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
@@ -196,97 +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.9.1
+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.4
+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.57
-slapos.recipe.build = 0.7
-slapos.recipe.template = 2.3
-slapos.toolbox = 0.24
+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.24
-# slapos.toolbox==0.24
-Flask = 0.8
+# slapos.core==0.27
+# slapos.toolbox==0.28
+Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.24
+# slapos.toolbox==0.28
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.cookbook==0.57
+# slapos.cookbook==0.60
 PyXML = 0.8.4
 
 # Required by:
-# slapos.toolbox==0.24
+# netaddr==0.7.7
+Sphinx = 1.1.3
+
+# Required by:
+# slapos.toolbox==0.28
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.24
-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.57
+# slapos.cookbook==0.60
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.cookbook==0.57
-netaddr = 0.7.6
+# slapos.cookbook==0.60
+netaddr = 0.7.7
 
 # Required by:
-# slapos.core==0.24
+# 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.24
-paramiko = 1.7.7.1
+# slapos.toolbox==0.28
+paramiko = 1.7.7.2
 
 # Required by:
-# slapos.toolbox==0.24
-psutil = 0.4.1
+# slapos.toolbox==0.28
+psutil = 0.6.0
 
 # Required by:
-# slapos.cookbook==0.57
-# slapos.core==0.24
-# slapos.toolbox==0.24
+# slapos.cookbook==0.60
+# slapos.core==0.27
+# slapos.toolbox==0.28
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.57
-# slapos.toolbox==0.24
-slapos.core = 0.24
+# slapos.cookbook==0.60
+# slapos.toolbox==0.28
+slapos.core = 0.27
 
 # Required by:
-# slapos.core==0.24
+# slapos.core==0.27
 supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.57
-# slapos.toolbox==0.24
+# slapos.cookbook==0.60
+# slapos.toolbox==0.28
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.57
+# slapos.cookbook==0.60
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.24
-zope.interface = 3.8.0
-
-websockify = 0.1-dev
+# 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_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

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/check_exists.sh.in

+#!${:bash} -e
+
+${:test-binary} -f ${:file}

software/lxc/check_state.sh.in

+#!${:bash} -e
+
+if [ -f ${:file} ]
+then
+    ${:test-binary} $(${:cat} ${:file}) = ${:value}
+else
+    exit 1
+fi

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
+    container-promise
+    shellinabox-promise
+    rootfs-promise
+
+
+[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
+promises = $${rootdirectory:etc}/promise
+
+[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.recipe.template
+url = ${lxc-conf-in:location}/${lxc-conf-in:filename}
+output = $${rootdirectory:etc}/lxc.conf
+bridge = !!BRIDGE_NAME!!
+interface = lxc$${slap-network-information:network-interface}
+
+[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}
+
+[template-promise-state]
+recipe = slapos.recipe.template
+url = ${promise-state:location}/${promise-state:filename}
+bash = ${bash:location}/bin/bash
+test-binary = ${coreutils:location}/bin/test
+cat = ${coreutils:location}/bin/cat
+value = started
+mode = 700
+
+[container-promise]
+<= template-promise-state
+output = $${basedirectory:promises}/slapcontainer
+file = $${buildout:directory}/.slapcontainer.state
+
+[shellinabox-promise]
+<= template-promise-state
+output = $${basedirectory:promises}/shellinabox
+file = $${buildout:directory}/.shellinabox.state
+
+[rootfs-promise]
+recipe = slapos.recipe.template
+url = ${promise-exists:location}/${promise-exists:filename}
+output = $${basedirectory:promises}/rootfs
+bash = ${bash:location}/bin/bash
+test-binary = ${coreutils:location}/bin/test
+file = $${rootfs:downloaded-file-complete}
+mode = 700
+
+[slap-parameter]
+rootfs-md5sum =

software/lxc/instance.cfg

+[buildout]
+parts = 
+    switch-softwaretype
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${template-lxc: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/lxc/lxc.conf.in

+# ${slap-connection:requested}
+
+lxc.utsname = ${uuid:uuid}
+
+lxc.network.type = veth
+lxc.network.link = ${:bridge}
+lxc.network.veth.pair = ${:interface}
+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:downloaded-file}
+
+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.
+
+NB: A ready to use rootfs is available at :
+  http://[2001:380:e0c:155:5054:ff:fe5d:a604]/debian-wheezy.tar.xz
+
+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
+  ../../component/bash/buildout.cfg
+  ../../component/coreutils/buildout.cfg
+
+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 = af5e31fb41e2d31b25f172df45f29fc6
+output = ${buildout:directory}/template-lxc.cfg
+mode = 0644
+
+[download]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+mode = 0644
+
+[lxc-conf-in]
+<= download
+filename = lxc.conf.in
+md5sum = b25334fc369e4e0f608bc64f14b0315d
+
+[promise-state]
+<= download
+filename = check_state.sh.in
+md5sum = 725fb0477f8b8778566ed4b22b25bf27
+
+[promise-exists]
+<= download
+filename = check_exists.sh.in
+md5sum = 60d4f5f73a3d10a3d7d7201aab977d19
+
+[slapos-toolbox]
+recipe = zc.recipe.egg
+scripts = slapcontainer
+eggs =
+  slapos.toolbox
+
+[versions]
+slapos.cookbook = 0.64.1
+slapos.toolbox = 0.30

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/software.cfg

 [buildout]
 
-extensions =
-  slapos.zcbworkarounds
-
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-
 extends =
   ../../component/mariadb/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/logrotate/buildout.cfg
   ../../component/stunnel/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
   ../../component/lxml-python/buildout.cfg
   ../../component/gzip/buildout.cfg
   ../../component/duplicity/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
-
-# XXX: This is dirty, recipe trick shall be used.
-develop =
-  /opt/slapdev
-
-versions = versions
+  ../../stack/slapos.cfg
 
 parts =
 # Create instance template
@@ -50,28 +25,16 @@ parts =
   mariadb
   stunnel
 
-# 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 = mysql
 
 [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}
 
@@ -103,20 +66,3 @@ url = ${:_profile_base_location_}/instance-recover.cfg
 md5sum = a8df936b6abf82d0d798b83ddfebdc8a
 output = ${buildout:directory}/template-recover.cfg
 mode = 0644
-
-[versions]
-slapos.cookbook =
-
-# Required by slapos.cookbook==0.25
-slapos.core = 0.4
-collective.recipe.template = 1.8
-netaddr = 0.7.5
-xml-marshaller = 0.9.7
-setuptools = 0.6c12dev-r88795
-
-hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.0
-plone.recipe.command = 1.1
-
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-002

software/memcached/software.cfg

@@ -45,7 +45,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
 
 Jinja2 = 2.6

software/mysql-5.1/software.cfg

 [buildout]
-extensions =
-  buildout-versions
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
 
 extends =
   ../../component/dcron/buildout.cfg
@@ -13,23 +9,7 @@ extends =
   ../../component/rdiff-backup/buildout.cfg
   ../../component/stunnel/buildout.cfg
   ../../component/xtrabackup/buildout.cfg
-  ../../stack/shacache-client.cfg
-
-# 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
-
-versions = versions
+  ../../stack/slapos.cfg
 
 parts =
   template
@@ -42,11 +22,6 @@ parts =
   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
-
 [instance-recipe]
 egg = slapos.cookbook
 module = mysql
@@ -77,7 +52,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/neoppod/README.txt

+Software types
+==============
+Which software type is an entry point and can be used for root software
+instance.
+
+Parameters are expected to be passed as of *.serialised recipes expect them.
+Minimal parameters::
+
+```
+<?xml version='1.0' encoding='utf-8'?>
+<instance>
+  <parameter id="_">{
+    'cluster': 'dummy',
+  }</parameter>
+</instance>
+```
+
+For each available key in the outmost dict are described below.
+
+default (default)
+-----------------
+Deploy a NEO cluster.
+
+'cluster' (str, mandatory)
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+Cluster unique identifier. Your last line of defense against mixing up neo
+clusters and corrupting your data. Choose a unique value for each of your
+cluster.
+
+'partitions' (int, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Number of partitions. You cannot change this value once you created a cluster.
+Defautls to 12.
+
+'replicas' (int, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+Number of replicates.
+Defaults to 0 (no resilience).
+
+'verbose' (int, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~
+Non-zero to increase verbosity.
+Defaults to 0.
+
+'mysql-storage-count' (int, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Number of MySQL-based storage nodes to deploy. One master node is deployed
+along with each storage.
+Defaults to 1.
+
+'admin-count' (int, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Number of admin nodes to deploy.
+Defaults to 1.

software/neoppod/cluster.cfg.in

+{% if slap_software_type not in (
+    mysql_storage_software_type,
+    admin_software_type,
+) -%}
+{% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%}
+{% set part_list = [] -%}
+{% set master_list = [] -%}
+{% set admin_list = [] -%}
+[request-common]
+recipe = slapos.cookbook:request
+software-url = ${slap-connection:software-release-url}
+sla = computer_guid
+sla-computer_guid = ${slap-connection:computer-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}
+config-cluster = {{ slapparameter_dict['cluster'] }}
+config-partitions = {{ slapparameter_dict.get('partitions', 12) }}
+config-replicas = {{ slapparameter_dict.get('replicas', 0) }}
+config-verbose = {{ dumps(slapparameter_dict.get('verbose', 0)) }}
+
+[request-config]
+base = cluster verbose
+master = partitions replicas
+node = masters
+
+[node-base]
+< = request-common
+config = ${request-config:base} ${request-config:node}
+config-masters = ${all-masters:addresses}
+
+[mysql-storage-base]
+< = request-common
+config = ${request-config:base} ${request-config:master}
+software-type = {{ mysql_storage_software_type }}
+
+[mysql-storage-request-base]
+< = mysql-storage-base
+return = master
+
+[admin-base]
+< = node-base
+return = admin
+software-type = {{ admin_software_type }}
+
+[publish]
+recipe = slapos.cookbook:publish
+masters = ${all-masters:addresses}
+admins = ${all-admins:addresses}
+
+{% for node_number in range(slapparameter_dict.get('mysql-storage-count', 1)) -%}
+{%   set section_id = 'storage-%i' % (node_number, ) -%}
+{%   set final_section_id = 'final-' ~ section_id -%}
+{%   do master_list.append(section_id) -%}
+[{{ section_id }}]
+< = mysql-storage-request-base
+name = {{ section_id }}
+
+[{{ section(final_section_id) }}]
+< = mysql-storage-base
+	node-base
+name = {{ section_id }}
+config = ${request-config:base} ${request-config:master} ${request-config:node}
+
+{% endfor -%}
+{% for node_number in range(slapparameter_dict.get('admin-count', 1)) -%}
+{%   set section_id = 'admin-%i' % (node_number, ) -%}
+{%   do admin_list.append(section_id)%}
+[{{ section(section_id) }}]
+< = admin-base
+name = {{ section_id }}
+
+{% endfor -%}
+[buildout]
+parts = 
+	{{ part_list | join('\n\t') }}
+	publish
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[all-masters]
+addresses = {% for master in master_list -%}
+{{   '${' + master + ':connection-master}' -}}
+{%   if not loop.last %} {% endif -%}
+{% endfor %}
+
+[all-admins]
+addresses = {% for admin in admin_list -%}
+{{  '${' + admin + ':connection-admin}' -}}
+{%  if not loop.last %} {% endif -%}
+{% endfor %}
+{% endif -%}

software/neoppod/instance-neo-admin.cfg.in

+[buildout]
+parts =
+  neo-admin-run-wrapper
+  neo-admin-promise
+
+eggs-directory = {{eggs_directory}}
+develop-eggs-directory = {{develop_eggs_directory}}
+offline = true
+
+[neo-admin]
+recipe = slapos.cookbook:neoppod.admin
+binary = {{bin_directory}}/neoadmin
+wrapper = ${directory:bin}/neoadmin
+logfile = ${directory:log}/neoadmin.log
+ip = ${publish:ip}
+port = ${publish:port}
+cluster = ${slap-parameter:cluster}
+masters = ${slap-parameter:masters}
+verbose = ${slap-parameter:verbose}
+
+[publish]
+recipe = slapos.cookbook:publish
+# TODO: make port a partition parameter
+# TODO: stop using slap-network-information
+ip = [${slap-network-information:global-ipv6}]
+port = 10002
+admin = ${:ip}:${:port}
+
+[neo-admin-run-wrapper]
+recipe = slapos.cookbook:symbolic.link
+target-directory = ${directory:run}
+link-binary = ${neo-admin:wrapper}
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+run = ${buildout:directory}/etc/run
+log = ${buildout:directory}/var/log
+bin = ${buildout:directory}/bin
+
+[neo-admin-promise]
+recipe = slapos.cookbook:check_port_listening
+hostname = ${neo-admin:ip}
+port = ${neo-admin:port}
+path = ${directory:promises}/neo-admin-promise

software/neoppod/instance-neo-master.cfg.in

+[buildout]
+parts =
+  neo-master-run-wrapper
+  neo-master-promise
+eggs-directory = {{eggs_directory}}
+develop-eggs-directory = {{develop_eggs_directory}}
+offline = true
+
+[neo-master]
+recipe = slapos.cookbook:neoppod.master
+binary = {{bin_directory}}/neomaster
+wrapper = ${directory:bin}/neomaster
+logfile = ${directory:log}/neomaster.log
+ip = ${publish:ip}
+port = ${publish:port}
+cluster = ${slap-parameter:cluster}
+partitions = ${slap-parameter:partitions}
+replicas = ${slap-parameter:replicas}
+masters = ${slap-parameter:masters}
+verbose = ${slap-parameter:verbose}
+
+[publish]
+recipe = slapos.cookbook:publish
+# TODO: make port a partition parameter
+# TODO: stop using slap-network-information
+ip = [${slap-network-information:global-ipv6}]
+port = 10000
+master = ${:ip}:${:port}
+
+[neo-master-run-wrapper]
+recipe = slapos.cookbook:symbolic.link
+target-directory = ${directory:run}
+link-binary = ${neo-master:wrapper}
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+run = ${buildout:directory}/etc/run
+log = ${buildout:directory}/var/log
+bin = ${buildout:directory}/bin
+
+[neo-master-promise]
+recipe = slapos.cookbook:check_port_listening
+hostname = ${neo-master:ip}
+port = ${neo-master:port}
+path = ${directory:promises}/neo-master-promise
+
+[slap-parameter]
+# "masters" parameter is not provided when just requesting a partition.
+# No actuall installation takes place at that time
+# (slapos.cookbook:neoppod.master raises), but cfg expansion must succeed. So
+# this default value is required.
+masters =

software/neoppod/instance-neo-storage-mysql.cfg.in

+[buildout]
+extends = {{ master_cfg }}
+parts += neo-storage-run-wrapper
+
+[mariadb-instance]
+recipe = slapos.cookbook:generic.mysql
+user = user
+database = neo
+
+conf-file = ${directory:etc}/mariadb.cnf
+# No networking (ip & port options)
+data-directory = ${directory:srv_mariadb}
+pid-file = ${directory:var_run}/mariadb.pid
+socket = ${directory:var_run}/mariadb.sock
+error-log = ${directory:log}/mariadb_error.log
+slow-query-log = ${directory:log}/mariadb_slowquery.log
+
+wrapper = ${directory:etc_run}/mariadb
+update-wrapper = ${directory:etc_run}/mariadb_update
+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
+
+mroonga =
+
+[neo-storage]
+recipe = slapos.cookbook:neoppod.storage
+binary = {{ bin_directory }}/neostorage
+wrapper = ${directory:bin}/neostorage
+logfile = ${directory:log}/neostorage.log
+ip = [${slap-network-information:global-ipv6}]
+cluster = ${slap-parameter:cluster}
+masters = ${slap-parameter:masters}
+verbose = ${slap-parameter:verbose}
+database-adapter = MySQL
+database-parameters = ${mariadb-instance:user}:${mariadb-instance:password}@${mariadb-instance:database}${mariadb-instance:socket}
+wait-database = 60
+
+[neo-storage-run-wrapper]
+recipe = slapos.cookbook:symbolic.link
+target-directory = ${directory:etc_run}
+link-binary = ${neo-storage:wrapper}
+
+[directory]
+etc = ${buildout:directory}/etc
+var = ${buildout:directory}/var
+etc_run =  ${:etc}/run
+var_run =  ${:var}/run
+srv_mariadb = ${buildout:directory}/srv/mariadb

software/neoppod/instance.cfg.in

+{% set admin_software_type = 'neo-admin' -%}
+{% set mysql_storage_software_type = 'neo-storage-mysql' -%}
+[buildout]
+parts = switch-softwaretype
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[slap-connection]
+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}
+
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration.serialised
+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}
+
+[neo-cluster]
+recipe = slapos.recipe.template:jinja2
+template = {{ cluster }}
+rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/cluster.cfg
+extensions = jinja2.ext.do
+context =
+    key eggs_directory buildout:eggs-directory
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key slap_software_type slap-configuration:slap-software-type
+    key slapparameter_dict slap-configuration:configuration
+    raw admin_software_type {{ admin_software_type }}
+    raw mysql_storage_software_type {{ mysql_storage_software_type }}
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${neo-cluster:rendered}
+{{ admin_software_type }} = {{ neo_admin }}
+{{ mysql_storage_software_type }} = {{ neo_storage_mysql }}

software/neoppod/software.cfg

+# Note on COOKBOOK/END COOKBOOK: the areas delimited by those tags should be
+# dropped when a cookbook version containing neoppod recipe is released as an
+# egg on pypi.
+# Note on LXML/END LXML: they delimit areas where lxml magic is needed. lxml is
+# a slapos.cookbook dependency, so it should be fetched automatically. But when
+# automatically fetched, it gets built against system headers/libs, which is
+# forbidden in slapos. So we need to fetch lxml explicitly so it is properly
+# built.
+
+[buildout]
+extends =
+    ../../stack/slapos.cfg
+#COOKBOOK
+    ../../component/git/buildout.cfg
+#END COOKBOOK
+#LXML
+    ../../component/lxml-python/buildout.cfg
+#END LXML
+    ../../component/python-2.7/buildout.cfg
+    ../../component/mariadb/buildout.cfg
+    ../../component/mysql-python/buildout.cfg
+
+develop =
+#COOKBOOK
+# Note: as we develop a path we fetch, first buildout execution will fail as
+# develop couldn't find the clone. Second (and later) runs will succeed.
+    ${:parts-directory}/slapos.cookbook-repository
+#END COOKBOOK
+
+parts =
+#COOKBOOK
+    slapos.cookbook-repository
+    check-recipe
+#END COOKBOOK
+    slapos-deps-eggs
+# NEO & dependencies
+    python2.7
+    mariadb
+    mysql-python
+    neoppod
+# NEO instanciation
+    template-instance
+
+[slapos-deps-eggs]
+recipe = zc.recipe.egg
+eggs =
+#LXML
+    ${lxml-python:egg}
+#END LXML
+#COOKBOOK
+    slapos.cookbook
+#END COOKBOOK
+
+#LXML
+[lxml-python]
+python = python2.7
+#END LXML
+
+#COOKBOOK
+[slapos.cookbook-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
+branch = neoppod
+git-executable = ${git:location}/bin/git
+
+[check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = test -e ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+#END COOKBOOK
+
+[base-template]
+recipe = slapos.recipe.template:jinja2
+template = ${:_profile_base_location_}/${:filename}.in
+rendered = ${buildout:directory}/${:filename}
+extensions = jinja2.ext.do
+extra-context =
+context =
+    key eggs_directory buildout:eggs-directory
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key bin_directory buildout:bin-directory
+    ${:extra-context}
+
+[template-neo-master]
+< = base-template
+filename = instance-neo-master.cfg
+md5sum = b48e9446fb8fdce24d954d7d4f4c7460
+
+[template-neo-storage-mysql]
+< = base-template
+filename = instance-neo-storage-mysql.cfg
+md5sum = e767c66e7de58232de30bdf26188efe1
+extra-context =
+    key mariadb_location mariadb:location
+    key master_cfg template-neo-master:rendered
+
+[template-neo-admin]
+< = base-template
+filename = instance-neo-admin.cfg
+md5sum = fcf1a5c937a609a934c8ccd7c1326726
+
+[template-cluster]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/cluster.cfg.in
+md5sum = fe37b2ff36fee65b44945393f63e51c3
+
+[template-instance]
+< = base-template
+template = ${:_profile_base_location_}/instance.cfg.in
+# XXX: "template.cfg" is hardcoded in instanciation recipe
+filename = template.cfg
+md5sum = 17e761b371487b55b39da1c39ebb1bb6
+extra-context =
+    key neo_master template-neo-master:rendered
+    key neo_storage_mysql template-neo-storage-mysql:rendered
+    key neo_admin template-neo-admin:rendered
+    key cluster template-cluster:target
+
+[neoppod]
+recipe = zc.recipe.egg
+eggs = neoppod[admin, master, storage-mysqldb]

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/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/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/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/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/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/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/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/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/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

@@ -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/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/software.cfg

@@ -81,7 +81,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.42

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/slapos-testing/instance.cfg

+[buildout]
+parts = 
+  slapos-test-runner
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[create-directory]
+recipe = slapos.cookbook:mkdirectory
+bin = $${buildout:directory}/bin
+etc = $${buildout:directory}/etc
+services = $${:etc}/run
+srv = $${buildout:directory}/srv
+source-code = $${:srv}/eggs-source-code
+
+[download-source]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+
+# Local development
+[slapos.core]
+<= download-source
+repository = ${slapos.core-repository:location}
+
+[slapos.recipe.template]
+<= download-source
+repository = ${slapos.recipe.template-repository:location}
+
+[slapos.recipe.build]
+<= download-source
+repository = ${slapos.recipe.build-repository:location}
+
+[slapos-test-runner]
+recipe = slapos.cookbook:egg_test
+run-test-suite = $${create-directory:bin}/runTestSuite
+run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
+# The list of executables should be defined here and a combination
+# of tests should dynamically generated.
+#python-list = $${}
+test-list =
+  $${slapos.core:location}
+  $${slapos.recipe.template:location}
+  $${slapos.recipe.build:location}
+prepend-path = ${git:location}/bin:${libxslt:location}/bin:${python2.7:location}/bin
+environment = environment
+
+[environment]
+CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
+LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib
+PYTHONPATH = ${python-setuptools:location}

software/slapos-testing/software.cfg

+[buildout]
+
+extends =
+  ../../component/git/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../component/libxml2/buildout.cfg
+  ../../component/libxslt/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/python-setuptools/buildout.cfg
+  ../../component/zlib/buildout.cfg
+  ../../stack/slapos.cfg
+
+parts =
+  slapos.cookbook-repository
+  slapos.core-repository
+  slapos.recipe.template-repository
+  slapos.recipe.build-repository
+  eggs
+  template
+
+[eggs]
+recipe = zc.recipe.egg
+eggs = 
+  ${lxml-python:egg}
+  erp5.util
+  slapos.cookbook
+entry-points =
+  runTestSuite=erp5.util.testsuite:runTestSuite
+scripts =
+  runTestSuite
+
+[erp5.util-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+repository = http://git.erp5.org/repos/erp5.git
+branch = master
+
+[slapos.cookbook-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+repository = http://git.erp5.org/repos/slapos.git
+branch = slapos-testing
+
+[slapos.core-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+repository = http://git.erp5.org/repos/slapos.core.git
+branch = master
+
+[slapos.recipe.template-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+repository = http://git.erp5.org/repos/slapos.recipe.template.git
+branch = master
+
+[slapos.recipe.build-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+repository = http://git.erp5.org/repos/slapos.recipe.build.git
+branch = master
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = d7dbd5da07c1170d0b80199d99f932eb
+output =  ${buildout:directory}/template.cfg
+mode = 640
+
+[versions]
+Jinja2 = 2.6
+Werkzeug = 0.8.3
+buildout-versions = 1.7
+erp5.util = 0.4.7
+hexagonit.recipe.cmmi = 1.6
+lxml = 3.0alpha2
+meld3 = 0.6.8
+plone.recipe.command = 1.1
+slapos.cookbook = 0.65
+slapos.libnetworkcache = 0.13.2
+slapos.recipe.build = 0.11.2
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.4.2
+
+# Required by:
+# slapos.core==0.28.5
+Flask = 0.9
+
+# Required by:
+# slapos.cookbook==0.65
+PyXML = 0.8.4
+
+# Required by:
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.5.1
+
+# Required by:
+# slapos.cookbook==0.65
+inotifyx = 0.2.0
+
+# Required by:
+# slapos.cookbook==0.65
+netaddr = 0.7.10
+
+# Required by:
+# slapos.core==0.28.5
+netifaces = 0.8
+
+# Required by:
+# erp5.util==0.4.7
+# slapos.cookbook==0.65
+# slapos.core==0.28.5
+# zc.buildout==1.6.0-dev-SlapOS-006
+# zc.recipe.egg==1.3.2
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.65
+slapos.core = 0.28.5
+
+# Required by:
+# slapos.core==0.28.5
+supervisor = 3.0a12
+
+# Required by:
+# slapos.cookbook==0.65
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.cookbook==0.65
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.28.5
+zope.interface = 4.0.1

software/slaprunner/README.txt

-kvm
-===
+slaprunner
+==========
 
 Introduction
 ------------

software/slaprunner/instance-runner.cfg

@@ -6,6 +6,11 @@ parts =
   dropbear-server-add-authorized-key
   sshkeys-authority
   publish-connection-informations
+  slaprunner-promise
+  slaprunner-frontend-promise
+  cloud9-promise
+  dropbear-promise
+
   
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -41,6 +46,12 @@ 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
@@ -50,7 +61,7 @@ wrapper = $${basedirectory:services}/cloud9
 working-directory = $${runnerdirectory:home}
 git-binary = ${git:location}/bin/git
 node-binary = ${nodejs:location}/bin/node
-cloud9 = ${cloud9:location}/server.js
+cloud9 = ${cloud9:executable}
 
 [slaprunner]
 recipe = slapos.cookbook:slaprunner
@@ -65,6 +76,8 @@ 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}
@@ -118,7 +131,7 @@ key = $${slap-parameter:authorized-key}
 # Request frontend
 [request-frontend]
 <= slap-connection
-recipe = slapos.cookbook:request
+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
@@ -135,6 +148,35 @@ 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}
+
+
+# Deploy promises scripts
+[slaprunner-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${basedirectory:promises}/slaprunner
+hostname = $${slaprunner:ipv6}
+port = $${slaprunner:runner_port}
+
+[slaprunner-frontend-promise]
+recipe = slapos.cookbook:check_url_available
+path = $${basedirectory:promises}/slaprunner_frontend
+url = $${request-frontend:connection-site_url}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+
+[cloud9-promise]
+recipe = slapos.cookbook:check_url_available
+path = $${basedirectory:promises}/cloud9
+url = http://$${cloud9:ip}:$${cloud9:port}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+
+[dropbear-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${basedirectory:promises}/dropbear
+hostname = $${dropbear-server:host}
+port = $${dropbear-server:port}
 
 
 [slap-parameter]

software/slaprunner/software.cfg

 [buildout]
+
 extends =
   ../../stack/slapos.cfg
   ../../stack/flask.cfg
@@ -6,11 +7,12 @@ extends =
   ../../component/dropbear/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/cloud9/buildout.cfg
+  ../../component/dash/buildout.cfg
 
 parts =
   template
-  eggs
   slapos-cookbook
+  eggs
 
 [template]
 recipe = slapos.recipe.template
@@ -23,13 +25,14 @@ md5sum = 5307e4200f044ae57b504ad68444491c
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg
-md5sum = 0ddddd0be595df4fb15d55e566cc3bc3
+md5sum = b57ebff565595fa92cd7d5adc6a22c7e
 mode = 0644
 
-[slapos-cookbook]
-eggs +=
+[eggs]
+recipe = z3c.recipe.scripts
+eggs =
   slapos.libnetworkcache
-  slapos.toolbox
+  slapos.toolbox[flask_auth]
   slapos.core
 
 [networkcache]
@@ -51,102 +54,104 @@ signature-certificate-list =
   -----END CERTIFICATE-----
 
 [versions]
+Flask-Auth = 0.8
 Jinja2 = 2.6
-Pygments = 1.5
 Werkzeug = 0.8.3
-apache-libcloud = 0.10.1
+apache-libcloud = 0.11.1
 async = 0.6.1
 buildout-versions = 1.7
-docutils = 0.9
 gitdb = 0.5.4
-hexagonit.recipe.cmmi = 1.5.1
-ipython = 0.12.1
+hexagonit.recipe.cmmi = 1.6
 meld3 = 0.6.8
 plone.recipe.command = 1.1
 pycrypto = 2.6
-slapos.cookbook = 0.53
-slapos.libnetworkcache = 0.12
-slapos.recipe.build = 0.9
-slapos.recipe.template = 2.4
-slapos.toolbox = 0.26
+slapos.cookbook = 0.64.2
+slapos.libnetworkcache = 0.13.2
+slapos.recipe.build = 0.11
+slapos.recipe.template = 2.4.2
+slapos.toolbox = 0.30
 smmap = 0.8.2
+z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.core==0.26.1
-Flask = 0.8
+# slapos.core==0.30
+# slapos.toolbox==0.30
+Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.24
+# slapos.toolbox==0.30
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.cookbook==0.53
+# slapos.cookbook==0.64.2
 PyXML = 0.8.4
 
 # Required by:
-# netaddr==0.7.7
-Sphinx = 1.1.3
-# Required by:
-# slapos.toolbox==0.24
+# slapos.toolbox==0.30
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.24
+# slapos.toolbox==0.30
 feedparser = 5.1.2
 
 # Required by:
-# slapos.cookbook==0.53
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.5.1
+
+# Required by:
+# slapos.cookbook==0.64.2
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.cookbook==0.53
-# slapos.core==0.26.1
+# slapos.core==0.30
+# slapos.toolbox==0.30
 # xml-marshaller==0.9.7
-lxml = 2.3.4
+lxml = 3.0alpha2
 
 # Required by:
-# slapos.cookbook==0.53
-netaddr = 0.7.7
+# slapos.cookbook==0.64.2
+netaddr = 0.7.9
 
 # Required by:
-# slapos.core==0.26.1
+# slapos.core==0.30
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.24
+# slapos.toolbox==0.30
 paramiko = 1.7.7.2
 
 # Required by:
-# slapos.toolbox==0.24
-psutil = 0.4.1
+# slapos.toolbox==0.30
+psutil = 0.6.1
 
 # Required by:
-# slapos.cookbook==0.53
-# slapos.core==0.26.1
-# slapos.libnetworkcache==0.12
-# slapos.toolbox==0.24
+# slapos.cookbook==0.64.2
+# slapos.core==0.30
+# slapos.libnetworkcache==0.13.2
+# slapos.toolbox==0.30
 # supervisor==3.0a12
-# zc.buildout==1.6.0-dev-SlapOS-004
+# zc.buildout==1.6.0-dev-SlapOS-007
 # zc.recipe.egg==1.3.2
 # zope.interface==4.0.1
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.53
-slapos.core = 0.26.1
+# slapos.cookbook==0.64.2
+slapos.core = 0.30
 
 # Required by:
-# slapos.core==0.26.1
+# slapos.core==0.30
 supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.53
+# slapos.cookbook==0.64.2
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.53
+# slapos.cookbook==0.64.2
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.26.1
+# slapos.core==0.30
 zope.interface = 4.0.1
+pe.egg = 1.3.2

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/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/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/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/wordpress/software.cfg

 [buildout]
-versions = versions
-
-  
 extends =
   ../../stack/lamp/buildout.cfg
 
-
 [application]
-url = http://wordpress.org/latest.tar.gz
-#md5sum = Student may put here md5sum of this file, this is good idea
+url = http://wordpress.org/wordpress-3.4.2.tar.gz
+md5sum = dfc56cee27eec8fb79070f033ecd4b25
 
 [application-template]
 recipe = slapos.recipe.download

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

@@ -2,18 +2,12 @@
 extends =
   ../../stack/tomcat.cfg
 
-find-links =
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-
-versions = versions
-
 [instance-recipe]
 egg = slapos.cookbook
 module = xwiki
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [template]
@@ -40,7 +34,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/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

@@ -69,6 +69,7 @@ parts =
 # fonts
   liberation-fonts
   ipaex-fonts
+  ocrb-fonts
 
 # Dependencies
   libpng12

stack/erp5/buildout.cfg

@@ -47,8 +47,6 @@ extends =
   ../../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
@@ -65,6 +63,7 @@ extends =
   ../../component/wget/buildout.cfg
   ../../component/aspell/buildout.cfg
   ../../component/cloudooo/buildout.cfg
+  ../../component/6tunnel/buildout.cfg
 
 parts =
   rdiff-backup
@@ -77,14 +76,12 @@ parts =
   memcached
   haproxy
   varnish-3.0
-  stunnel
   w3m
   poppler
   libpng
   ghostscript
   mariadb
   mroonga-mariadb
-  sphinx
   imagemagick
   libdmtx
   dmtx-utils
@@ -117,6 +114,7 @@ parts =
 # fonts
   liberation-fonts
   ipaex-fonts
+  ocrb-fonts
 
 # Cloudooo specific part
   cloudooo
@@ -141,13 +139,10 @@ parts =
 
 # Local development
 [slapos.cookbook-repository]
-recipe = plone.recipe.command
-stop-on-error = true
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
 branch = erp5-component
-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
+git-executable = ${git:location}/bin/git
 
 [check-recipe]
 recipe = plone.recipe.command
@@ -159,7 +154,7 @@ command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
 recipe = zc.recipe.egg
 eggs = slapos.cookbook
 scripts =
-ugly-depend-on = ${slapos.cookbook-repository:command} ${slapos.cookbook-repository:update-command}
+ugly-depend-on = ${slapos.cookbook-repository:repository} ${slapos.cookbook-repository:branch}
 
 [slapos.recipe.template]
 recipe = zc.recipe.egg
@@ -180,62 +175,33 @@ context =
     ${: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
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-mariadb.cfg.in
+md5sum = 0e67f6d8b7de909be1324c680cabe8f0
+mode = 640
 
 [template-zope]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-zope.cfg.in
-md5sum = de2918c8ca604f452a69108f6e31e78d
+md5sum = 7b1b6ee1fd122f5590844a90853622dc
 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
+url = ${:_profile_base_location_}/instance-kumofs.cfg.in
+md5sum = 62759c4cbb586bd4d0dcf82c08654e7a
 mode = 640
 
 [template-cloudooo]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
-md5sum = 53492e520be57f4c6a9eacd107c8d446
+md5sum = 24fc2dccc7ec20ec317ac4a9530ce6ac
 mode = 640
 
 [template-zope-conf]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/zope.conf.in
-md5sum = 599e004c18fd3461aa846ae75bd112f2
+md5sum = c4c42d06c63d33de703fc03415e34d84
 mode = 640
 
 [template]
@@ -243,7 +209,7 @@ mode = 640
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 26d26c357053af48602b5110120bd085
+md5sum = 2d9fa15edcc5d336b79a602d2c24d7e6
 extra-context =
     key apache_location apache:location
     key aspell_location aspell:location
@@ -258,12 +224,14 @@ extra-context =
     key fontconfig_location fontconfig:location
     key fonts_location fonts:location
     key freetype_location freetype:location
+    key gettext_location gettext: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 kumo_location kumo:location
     key libICE_location libICE:location
     key libSM_location libSM:location
     key libX11_location libX11:location
@@ -278,52 +246,83 @@ extra-context =
     key local_bt5_repository local-bt5-repository:list
     key logrotate_location logrotate:location
     key mariadb_location mariadb:location
+    key memcached_location memcached:location
     key openssl_location openssl:location
+    key perl_location perl:location
+    key perl_siteprefix perl:siteprefix
     key pdftk_location pdftk:location
     key poppler_location poppler:location
     key sed_location sed:location
+    key template_balancer template-balancer:target
     key template_cloudooo template-cloudooo:target
+    key template_cluster_zope template-cluster-zope:target
     key template_erp5_single template-erp5-single:target
-    key template_erp5_cluster template-erp5-cluster: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_erp5_cluster template-erp5-cluster:target
+    key template_kumofs template-kumofs:target
+    key template_logrotate_base template-logrotate-base:rendered
+    key template_mariadb template-mariadb:target
+    key template_memcached template-memcached:target
     key template_varnish template-varnish:target
+    key template_zeo template-zeo:target
     key template_zope template-zope:target
     key template_zope_conf template-zope-conf:target
     key tesseract_location tesseract:location
+    key sixtunnel_location 6tunnel:location
     key varnish_location varnish-3.0:location
     key w3m_location w3m:location
     key wget_location wget:location
+    key xtrabackup_location xtrabackup: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
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-memcached.cfg.in
+md5sum = 25bffcb311aa0a202e68399a413fd780
+mode = 640
 
 [template-erp5-single]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-erp5-single.cfg.in
-md5sum = 2a4312202a3160f874c4fa3ee9155a1d
+md5sum = f82d59347fdf707ffd671654d318ca70
 mode = 640
 
 [template-erp5-cluster]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-erp5-cluster.cfg.in
+md5sum = b044df76edad94dc5bfc2729e3041573
+mode = 640
+
+[template-zeo]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-zeo.cfg.in
+md5sum = 9d49e6787600a416545a8ff228abb720
+mode = 640
+
+[template-cluster-zope]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-cluster-zope.cfg.in
+md5sum = 22c351ae5edd507e8cd3de1abeb705f3
+mode = 640
+
+[template-balancer]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-balancer.cfg.in
+md5sum = 787fa10c0dc4e607706c572ba8e06386
+mode = 640
+
+[template-logrotate-base]
 < = template-jinja2-base
-filename = instance-erp5-cluster.cfg
-md5sum = 3051f3fea39d7409c417dcac26027b56
+filename = instance-logrotate-base.cfg
+md5sum = af19ff0c7817df85987c69738fb083f2
 extra-context =
-    key local_bt5_repository local-bt5-repository:list
+    key dcron_location dcron:location
+    key gzip_location gzip:location
+    key logrotate_location logrotate:location
 
 [template-varnish]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-varnish.cfg.in
-md5sum = 17aee2df57b121343b1fd65f4b51ce80
+md5sum = f7c47ffc3e23e07f81eb4ca172286ccc
 mode = 640
 
 [bt5-repository]
@@ -351,18 +350,10 @@ update-command = ${:command}
 repository_id_list = erp5
 
 [erp5]
-# Recipe zerokspot.recipe.git is disabled, as is not possible to change its
-# environment to use localy delivered git.
-# plone.recipe.command can do same job, but it is controllable which binary
-# will be used
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
+recipe = slapos.recipe.build:gitclone
 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:location}/bin/git" fetch && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --hard @{upstream} ; fi
+branch = erp5-component
+git-executable = ${git:location}/bin/git
 
 [fix-products-paths]
 recipe = plone.recipe.command
@@ -596,7 +587,7 @@ coverage = 3.5.2
 csp-eventlet = 0.7.0
 elementtree = 1.2.7-20070827-preview
 erp5.recipe.cmmiforcei686 = 0.1.3
-erp5.util = 0.4.6
+erp5.util = 0.4.22
 erp5diff = 0.8.1.5
 eventlet = 0.9.17
 feedparser = 5.1.2
@@ -621,12 +612,13 @@ polib = 1.0.0
 psutil = 0.6.1
 python-ldap = 2.4.10
 python-magic = 0.4.3
-python-memcached = 1.47
+python-memcached = 1.47-ipv6-1
 restkit = 4.2.0
 rtjp-eventlet = 0.3.2
 setuptools = 0.6c12dev-r88846
 slapos.core = 0.28
-slapos.recipe.build = 0.10
+slapos.libnetworkcache = 0.13.2
+slapos.recipe.build = 0.11.4
 slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.29
 smmap = 0.8.2

stack/erp5/instance-balancer.cfg.in

+{% if software_type == slap_software_type -%}
+{% set part_list = [] -%}
+{% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%}
+{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
+{#
+XXX: This template only supports exactly one IPv4 and (if ipv6 is used) one IPv6
+per partition. No more (undefined result), no less (IndexError).
+-#}
+# TODO: insert varnish between apache & haproxy.
+# And think of a way to specify which urls goe through varnish, which go
+# directly to haproxy. (maybe just passing literal configuration file chunk)
+{% set ipv4 = (ipv4_set | list)[0] -%}
+
+{% if use_ipv6 -%}
+{% set ipv6 = (ipv6_set | list)[0] -%}
+[zope-tunnel-base]
+recipe = slapos.cookbook:ipv4toipv6
+runner-path = ${directory:services}/${:base-name}
+6tunnel-path = {{ parameter_dict['6tunnel'] }}/bin/6tunnel
+shell-path = {{ parameter_dict['dash'] }}/bin/dash
+ipv4 = {{ ipv4 }}
+
+{% endif -%}
+{% set haproxy_dict = {} -%}
+{% set apache_dict = {} -%}
+{% set next_port = 9000 -%}
+{% for family_name, parameter_id_list in slapparameter_dict['zope-family-dict'].items() -%}
+{%   set zope_family_address_list = [] -%}
+{%   for parameter_id in parameter_id_list -%}
+{%     set zope_address_list = slapparameter_dict[parameter_id] -%}
+{%     for zope_address in zope_address_list -%}
+{%       if use_ipv6 -%}
+[{{ section('zope-tunnel-' ~ next_port) }}]
+< = zope-tunnel-base
+base-name = {{ 'zeo-tunnel-' ~ next_port }}
+ipv4-port = {{ next_port }}
+ipv6-port = {{ zope_address.split(']:')[1] }}
+ipv6 = {{ zope_address.split(']:')[0][1:] }}
+{%         set zope_effective_address = ipv4 ~ ":" ~ next_port -%}
+{%         set next_port = next_port + 1 -%}
+{%       else -%}
+{%         set zope_effective_address = zope_address -%}
+{%       endif -%}
+{%       do zope_family_address_list.append(zope_effective_address) -%}
+{%     endfor -%}
+{%   endfor -%}
+{%   set haproxy_port = next_port -%}
+{%   set next_port = next_port + 1 -%}
+{%   do haproxy_dict.__setitem__(family_name, (haproxy_port, zope_family_address_list)) -%}
+{%   do apache_dict.__setitem__(family_name, (next_port, 'http://' ~ ipv4 ~ ':' ~ haproxy_port)) -%}
+{%   set next_port = next_port + 1 -%}
+{% endfor -%}
+
+[haproxy]
+recipe = slapos.cookbook:haproxy
+conf-path = ${directory:etc}/haproxy.cfg
+ip = {{ ipv4 }}
+maxconn = {{ slapparameter_dict['haproxy-maxconn'] }}
+server-check-path = {{ slapparameter_dict['haproxy-server-check-path'] }}
+wrapper-path = ${directory:services}/haproxy
+binary-path = {{ parameter_dict['haproxy'] }}/sbin/haproxy
+backend-dict = {{ dumps(haproxy_dict) }}
+
+[apache]
+recipe = slapos.cookbook:apache.zope.backend
+backend-list = {{ dumps(apache_dict.values()) }}
+ip = {% if use_ipv6 %}{{ ipv6 }}{% else %}{{ ipv4 }}{% endif %}
+wrapper = ${directory:bin}/apache
+scheme = https
+key-file = ${directory:apache-conf}/apache.key
+cert-file = ${directory:apache-conf}/apache.crt
+configuration-file = ${directory:apache-conf}/apache.conf
+access-control-string = {{ slapparameter_dict['apache-access-control-string'] }}
+pid-file = ${directory:run}/apache.pid
+lock-file = ${directory:run}/apache.lock
+ssl-session-cache = $${directory:log}/apache-ssl-session-cache
+error-log = ${directory:log}/apache-error.log
+access-log = ${directory:log}/apache-access.log
+apache-binary = {{ parameter_dict['apache'] }}/bin/httpd
+ssl-authentication = {{ slapparameter_dict['apache-ssl-authentication'] }}
+backend-path = {{ slapparameter_dict['apache-backend-path'] }}
+# Note: Without certificate-authority main certificate have to be hardcoded
+ssl-authentication-certificate = ${certificate-authority:ca-dir}/cacert.pem
+ssl-authentication-crl = ${certificate-authority:ca-crl}
+
+[publish]
+recipe = slapos.cookbook:publish.serialised
+{% for family_name, (apache_port, _) in apache_dict.items() -%}
+{%   if use_ipv6 -%}
+{{     family_name }} = ${apache:scheme}://[${apache:ip}]:{{ apache_port }}
+{%   else -%}
+{{     family_name }} = ${apache:scheme}://${apache:ip}:{{ apache_port }}
+{%   endif -%}
+{% endfor -%}
+
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = {{ parameter_dict['openssl'] }}/bin/openssl
+ca-dir = ${directory:ca-dir}
+requests-directory = ${directory:requests}
+wrapper = ${directory:services}/ca
+ca-private = ${directory:private}
+ca-certs = ${directory:certs}
+ca-newcerts = ${directory:newcerts}
+ca-crl = ${directory:crl}
+{% set ca = slapparameter_dict['ca'] -%}
+country-code = {{ ca.get('country-code', 'ZZ') }}
+email = {{ ca.get('email', 'nobody@example.com') }}
+state = {{ ca.get('state', 'Dummy State') }}
+city = {{ ca.get('city', 'Dummy City') }}
+company = {{ ca.get('company', 'Dummy Company') }}
+
+[ca-apache]
+< = certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+key-file = ${apache:key-file}
+cert-file = ${apache:cert-file}
+executable = ${apache:wrapper}
+wrapper = ${directory:services}/apache
+
+[logrotate-apache]
+recipe = slapos.cookbook:logrotate.d
+logrotate-entries = ${logrotate:logrotate-entries}
+backup = ${logrotate:backup}
+name = apache
+log = ${apache:error-log} ${apache:access-log}
+post = {{ parameter_dict['bin-directory'] }}/killpidfromfile ${apache:pid-file} SIGUSR1
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+apache-conf = ${:etc}/apache
+bin = ${buildout:directory}/bin
+etc = ${buildout:directory}/etc
+services = ${:etc}/run
+var = ${buildout:directory}/var
+run = ${:var}/run
+log = ${:var}/log
+ca-dir = ${buildout:directory}/srv/ssl
+requests = ${:ca-dir}/requests
+private = ${:ca-dir}/private
+certs = ${:ca-dir}/certs
+newcerts = ${:ca-dir}/newcerts
+crl = ${:ca-dir}/crl
+
+[buildout]
+extends = {{ parameter_dict['instance-logrotate-cfg'] }}
+parts +=
+  publish
+  logrotate-apache
+  haproxy
+  ca-apache
+  {{ part_list | join('\n  ') }}
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+{% endif %}

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'] -%}
+{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
 [buildout]
 parts =
   publish-cloudooo-connection-information
   cloudooo-instance
   promise
   promise-openoffice
+{% if use_ipv6 -%}
+  promise-tunnel
+{% endif -%}
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [publish-cloudooo-connection-information]
-recipe = slapos.cookbook:publishurl
+recipe = slapos.cookbook:publish.serialised
+{% if use_ipv6 -%}
+url = cloudooo://[${ipv6toipv4:ipv6}]:${ipv6toipv4:ipv6-port}/
+{% else -%}
 url = cloudooo://${cloudooo-instance:ip}:${cloudooo-instance:port}/
+{% endif -%}
 
 [cloudooo-instance]
 recipe = slapos.cookbook:generic.cloudooo
@@ -61,6 +69,25 @@ path = ${directory:promise}/openoffice
 hostname = ${cloudooo-instance:ip}
 port = ${cloudooo-instance:openoffice-port}
 
+{% if use_ipv6 -%}
+[promise-tunnel]
+recipe = slapos.cookbook:check_port_listening
+path = ${directory:promise}/tunnel
+hostname = ${ipv6toipv4:ipv6}
+port = ${ipv6toipv4:ipv6-port}
+
+[ipv6toipv4]
+recipe = slapos.cookbook:ipv6toipv4
+runner-path = ${directory:service}/${:base-name}
+6tunnel-path = {{ parameter_dict['6tunnel'] }}/bin/6tunnel
+shell-path = {{ parameter_dict['dash'] }}/bin/dash
+ipv4 = ${cloudooo-instance:ip}
+ipv6 = {{ (ipv6_set | list)[0] }}
+ipv6-port = ${cloudooo-instance:port}
+ipv4-port = ${cloudooo-instance:port}
+base-name = cloudooo-tunnel
+
+{% endif -%}
 # rest of parts are candidates for some generic stuff
 [directory]
 recipe = slapos.cookbook:mkdirectory

stack/erp5/instance-cluster-zope.cfg.in

+{% if slap_software_type == software_type -%}
+{% set use_ipv6 = parameter_dict.get('use-ipv6', False) -%}
+{% set next_port = slapparameter_dict['port-base'] -%}
+{% set site_id = slapparameter_dict['site-id'] -%}
+{% set storage_type = slapparameter_dict['zodb-storage-type'] -%}
+{% set part_list = [] -%}
+{% set publish_list = [] -%}
+{% set zodb_dict = slapparameter_dict['zodb-dict'] -%}
+{% set longrequest_logger_base_path = buildout_directory ~ '/var/log/longrequest_logger_' -%}
+{% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%}
+{% 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] -%}
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+bin = ${buildout:directory}/bin
+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
+run = ${:var}/run
+services = ${:etc}/run
+srv = ${buildout:directory}/srv
+tmp = ${buildout:directory}/tmp
+var = ${buildout:directory}/var
+promises = ${:etc}/promise
+
+[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['pdftk'] }}/bin/pdftk
+  {{ parameter_dict['sed'] }}/bin/sed
+  {{ parameter_dict['tesseract'] }}/bin/tesseract
+  {{ parameter_dict['w3m'] }}/bin/w3m
+  {{ parameter_dict['openssl'] }}/bin/openssl
+  {{ parameter_dict['poppler'] }}/bin/pdfinfo
+  {{ parameter_dict['poppler'] }}/bin/pdftotext
+  {{ parameter_dict['poppler'] }}/bin/pdftohtml
+  {{ parameter_dict['dmtx-utils'] }}/bin/dmtxwrite
+
+[certificate-authority-common]
+requests-directory = ${directory:requests}
+ca-dir = ${directory:ca-dir}
+ca-private = ${directory:private}
+ca-certs = ${directory:certs}
+ca-newcerts = ${directory:newcerts}
+ca-crl = ${directory:crl}
+
+[certificate-authority]
+< = certificate-authority-common
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = {{ parameter_dict['openssl'] }}/bin/openssl
+wrapper = ${directory:services}/ca
+
+{% if use_ipv6 -%}
+{%   set ipv6 = (ipv6_set | list)[0] -%}
+[zeo-tunnel-base]
+recipe = slapos.cookbook:ipv4toipv6
+runner-path = ${directory:services}/${:base-name}
+6tunnel-path = {{ parameter_dict['6tunnel'] }}/bin/6tunnel
+shell-path = {{ parameter_dict['dash'] }}/bin/dash
+ipv4 = {{ ipv4 }}
+
+{%   if storage_type == 'zeoclient' -%}
+{#     ZEO needs tunelling for IPv6 (...until next version becomes current in Zope) -#}
+{%     set zeo_tunneling_dict = {} -%}
+{%     for _, _, storage_dict in zodb_dict.values() -%}
+{%       set storage_server = storage_dict['server'] -%}
+{%       if storage_server not in zeo_tunneling_dict -%}
+{%         set current_port = next_port + (zeo_tunneling_dict | length) -%}
+{%         do zeo_tunneling_dict.__setitem__(storage_server, current_port) -%}
+[{{ section('zeo-tunnel-' ~ current_port) }}]
+< = zeo-tunnel-base
+base-name = {{ 'zeo-tunnel-' ~ current_port }}
+ipv4-port = {{ current_port }}
+ipv6-port = {{ storage_server.split(']:')[1] }}
+ipv6 = {{ storage_server.split(']:')[0][1:] }}
+{%       endif -%}
+{%       do storage_dict.__setitem__('server', '' ~ ipv4 ~ ':' ~ zeo_tunneling_dict[storage_server]) -%}
+{%     endfor -%}
+{%     set next_port = next_port + (zeo_tunneling_dict | length) -%}
+{%   endif -%}
+{%   if slapparameter_dict.get('tidstorage-ip') -%}
+[tidstorage-tunnel]
+< = zeo-tunnel-base
+base-name = {{ 'tidstorage-tunnel' }}
+ipv4-port = {{ next_port }}
+ipv6 = {{ slapparameter_dict.get('tidstorage-ip') }}
+ipv6-port = {{ slapparameter_dict.get('tidstorage-port') }}
+{%     do slapparameter_dict.__setitem__('tidstorage-ip', ipv4) -%}
+{%     do slapparameter_dict.__setitem__('tidstorage-port', next_port) -%}
+{%     set next_port = next_port + 1 -%}
+
+[{{ section("promise-tidstorage-tunnel") }}]
+recipe = slapos.cookbook:check_port_listening
+hostname = ${tidstorage-tunnel:ipv4}
+port = ${tidstorage-tunnel:ipv4-port}
+path = ${directory:promises}/tidstorage
+{%   endif -%}
+
+[ipv6toipv4-base]
+recipe = slapos.cookbook:ipv6toipv4
+runner-path = ${directory:services}/${:base-name}
+6tunnel-path = {{ parameter_dict['6tunnel'] }}/bin/6tunnel
+shell-path = {{ parameter_dict['dash'] }}/bin/dash
+ipv4 = {{ ipv4 }}
+ipv6 = {{ ipv6 }}
+{% endif -%}
+
+{% if slapparameter_dict.get('tidstorage-ip') -%}
+[tidstorage]
+ipv4 = {{ slapparameter_dict['tidstorage-ip'] }}
+ipv4-port = {{ slapparameter_dict['tidstorage-port'] }}
+{% else -%}
+[tidstorage]
+ipv4 =
+ipv4-port =
+{% endif -%}
+
+[zope-base]
+recipe = slapos.cookbook:generic.zope.zeo.client
+user = zope
+ip = {{ ipv4 }}
+timezone = {{ slapparameter_dict['timezone'] }}
+tidstorage-ip = ${tidstorage:ipv4}
+tidstorage-port = ${tidstorage:ipv4-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 }}
+{% set zodb_list = [] -%}
+{% for key, (mount_point, cache_size, storage_dict) in zodb_dict.items() -%}
+{%   do zodb_list.append([key, mount_point, cache_size, storage_type, storage_dict]) -%}
+{% endfor -%}
+zodb-list = {{ dumps(zodb_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:ipv4
+  key tidstorage_port tidstorage:ipv4-port
+  key promise_path erp5-promise:promise-path
+  ${:extra-context}
+
+[logrotate-entry-base]
+recipe = slapos.cookbook:logrotate.d
+logrotate-entries = ${logrotate:logrotate-entries}
+backup = ${logrotate:backup}
+
+{% macro zope(
+  name,
+  port,
+  thread_amount,
+  timerserver_interval,
+  longrequest_logger_timeout,
+  longrequest_logger_interval
+) -%}
+{% set conf_name = name ~ '-conf' -%}
+{% set conf_parameter_name = conf_name ~ '-param' -%}
+{% set zope_tunnel_section_name = name ~ '-ipv6toipv4' -%}
+{% set zope_tunnel_base_name = zope_tunnel_section_name -%}
+[{{ conf_parameter_name }}]
+< = zope-conf-parameter-base
+pid-file = ${directory:run}/{{ name }}.pid
+lock-file = ${directory:run}/{{ name }}.lock
+port = {{ port }}
+thread-amount = {{ thread_amount }}
+timerserver-interval = {{ dumps(timerserver_interval) }}
+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 }}
+
+[{{ name }}]
+< = zope-base
+{% if longrequest_logger_interval < 0 -%}
+longrequest-logger-file =
+longrequest-logger-timeout =
+longrequest-logger-interval =
+{% else -%}
+longrequest-logger-file = {{ longrequest_logger_base_path ~ name ~ ".log" }}
+longrequest-logger-timeout = {{ dumps(longrequest_logger_timeout) }}
+longrequest-logger-interval = {{ dumps(longrequest_logger_interval) }}
+{% endif -%}
+wrapper = ${directory:services}/{{ name }}
+configuration-file = {{ '${' ~ conf_name ~ ':rendered}' }}
+port = {{ '${' ~ conf_parameter_name ~ ':port}' }}
+
+[{{ section("promise-" ~ name) }}]
+recipe = slapos.cookbook:check_port_listening
+hostname = {{ '${' ~ name ~ ':ip}' }}
+port = {{ '${' ~ name ~ ':port}' }}
+path = ${directory:promises}/{{ name }}
+
+{% if use_ipv6 -%}
+[{{ zope_tunnel_section_name }}]
+< = ipv6toipv4-base
+base-name = {{ zope_tunnel_base_name }}
+ipv6-port = {{ port }}
+ipv4-port = {{ port }}
+{%   do publish_list.append("[" ~ ipv6 ~ "]:" ~ port) -%}
+
+[{{ section("promise-tunnel-" ~ name) }}]
+recipe = slapos.cookbook:check_port_listening
+hostname = {{ '${' ~ zope_tunnel_section_name ~ ':ipv6}' }}
+port = {{ '${' ~ zope_tunnel_section_name ~ ':ipv6-port}' }}
+path = ${directory:promises}/{{ zope_tunnel_base_name }}
+{% else -%}
+{%   do publish_list.append(ipv4 ~ ":" ~ port) -%}
+{% endif -%}
+
+[{{ section('logrotate-entry-' ~ name) }}]
+< = logrotate-entry-base
+name = {{ name }}
+log = {{ '${' ~ conf_parameter_name ~ ':event-log}' }} {{ '${' ~ conf_parameter_name ~ ':z2-log}' }} {{ '${' ~ name ~ ':longrequest-logger-file}' }}
+post = {{ bin_directory }}/killpidfromfile {{ '${' ~ conf_parameter_name ~ ':pid-file}' }} SIGUSR2
+{% endmacro -%}
+
+{% for i in range(slapparameter_dict.get('instance-count', 1)) -%}
+{{   zope("zope-" ~ i, next_port, slapparameter_dict['thread-amount'], slapparameter_dict['timerserver-interval'], slapparameter_dict['longrequest-logger-timeout'], slapparameter_dict['longrequest-logger-interval']) }}
+{%   set next_port = next_port + 1 -%}
+{% endfor -%}
+
+[publish-zope]
+recipe = slapos.cookbook:publish.serialised
+zope-address-list = {{ dumps(publish_list) }}
+
+[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 = {{ slapparameter_dict['smtp-url'] }}
+bt5 = {{ slapparameter_dict['bt5'] }}
+bt5-repository-url = {{ slapparameter_dict['bt5-repository-url'] }}
+
+[buildout]
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+extends =
+  {{ parameter_dict['instance-logrotate-cfg'] }}
+parts +=
+  binary-link
+  erp5-promise
+  {{ part_list | join('\n  ') }}
+  publish-zope
+{% endif %}

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

-#############################
-#
-# Request erp5 production environnment
-#
-#############################
-[buildout]
-
-parts =
-  request-tidstorage
-  basedirectory
-
-eggs-directory = {{ eggs_directory }}
-develop-eggs-directory = {{ develop_eggs_directory }}
-offline = true
-
+{% if slap_software_type == software_type -%}
+{% set has_frontend = slapparameter_dict.get('frontend-software-url', '') != '' -%}
+{% set port_base = 2000 -%}
+{% set site_id = slapparameter_dict.get('site-id', 'erp5') -%}
 [request-common]
-recipe = slapos.cookbook:request
+recipe = slapos.cookbook:request.serialised
 software-url = ${slap-connection:software-release-url}
 sla = computer_guid
 return = url
@@ -23,96 +12,193 @@ 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}
-return = url-sphinx url-sphinx-sql
+config =
+  use-ipv6
+  ${:extra-config}
+extra-config =
+config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
 
 [request-mariadb]
 <=request-common
 name = MariaDB DataBase
+extra-config = test-database-amount
+config-test-database-amount = {{ slapparameter_dict.get('test-database-amount', 0) }}
 software-type = mariadb
-sla-computer_guid = ${slap-parameter:mariadb-computer-guid}
+sla-computer_guid = {{ slapparameter_dict.get('mariadb-computer-guid', computer_id) }}
 
 [request-cloudooo]
 <=request-common
 name = Cloudooo
-config = cloudooo-json
-config-cloudooo-json = ${slap-parameter:cloudooo-json}
+extra-config = cloudooo-json
+config-cloudooo-json = {{ slapparameter_dict.get('cloudooo-json', '') }}
 software-type = cloudooo
-sla-computer_guid = ${slap-parameter:cloudooo-computer-guid}
+sla-computer_guid = {{ slapparameter_dict.get('cloudooo-computer-guid', computer_id) }}
 
 [request-memcached]
 <=request-common
 name = Memcached
 software-type = memcached
-sla-computer_guid = ${slap-parameter:memcached-computer-guid}
+sla-computer_guid = {{ slapparameter_dict.get('memcached-computer-guid', computer_id) }}
 
 [request-kumofs]
 <=request-common
 name = KumoFS
 software-type = kumofs
-sla-computer_guid = ${slap-parameter:kumofs-computer-guid}
+sla-computer_guid = {{ slapparameter_dict.get('kumofs-computer-guid', computer_id) }}
 
-[request-tidstorage]
+[request-zope-base]
 <=request-common
-name = TidStorage
-return = url-login
-config =
-  json
+return =
+  zope-address-list
+extra-config =
   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}
+  zodb-dict
+  zodb-storage-type
+  tidstorage-ip
+  tidstorage-port
+  instance-count
+  thread-amount
+  timerserver-interval
+  timezone
+  site-id
+  longrequest-logger-interval
+  longrequest-logger-timeout
+  port-base
 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}
+config-bt5 = {{ slapparameter_dict.get('bt5', 'erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_run_my_doc') }}
+config-bt5-repository-url = {{ slapparameter_dict.get('bt5-repository-url', local_bt5_repository) }}
+config-smtp-url = {{ slapparameter_dict.get('smtp-url', 'smtp://localhost:25/') }}
+config-zodb-dict = ${request-zodb:connection-zodb-dict}
+config-zodb-storage-type = ${request-zodb:connection-zodb-storage-type}
+config-tidstorage-ip = ${request-zodb:connection-tidstorage-ip}
+config-tidstorage-port = ${request-zodb:connection-tidstorage-port}
+config-timezone = {{ slapparameter_dict.get('timezone', 'Europe/Paris') }}
+config-site-id = {{ site_id }}
+software-type = cluster-zope
 
-[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}
-software-type = varnish
-sla-computer_guid = ${slap-parameter:varnish-computer-guid}
+[request-zodb]
+< = request-common
+name = zodb
+return =
+  zodb-storage-type
+  zodb-dict
+  tidstorage-ip
+  tidstorage-port
+extra-config =
+  zodb-dict
+  tidstorage-dict
+config-zodb-dict = {{ dumps(slapparameter_dict.get('zodb-dict', {'root': {}})) }}
+config-tidstorage-dict = {{ dumps(slapparameter_dict.get('tidstorage-dict')) }}
+software-type = zodb-{{ slapparameter_dict.get('zodb-software-type', 'zeo') }}
+sla-computer_guid = {{ slapparameter_dict.get('zodb-computer-guid', computer_id) }}
+
+{% set zope_family_dict = {} -%}
+{% for custom_name, zope_parameter_dict in slapparameter_dict.get('zope-partition-dict', {'1': {}}).items() -%}
+{%   set base_name = 'zope-' ~ custom_name -%}
+{%   set name = 'request-' ~ base_name -%}
+{%   do zope_family_dict.setdefault(zope_parameter_dict.get('family', 'default'), []).append(name) -%}
+[{{ name }}]
+< = request-zope-base
+name = {{ base_name }}
+config-instance-count = {{ dumps(zope_parameter_dict.get('instance-count', 1)) }}
+config-thread-amount = {{ dumps(zope_parameter_dict.get('thread-amount', 1)) }}
+config-timerserver-interval = {{ dumps(zope_parameter_dict.get('timerserver-interval', 5)) }}
+config-longrequest-logger-interval = {{ dumps(zope_parameter_dict.get('longrequest-logger-interval', -1)) }}
+config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longrequest-logger-timeout', 1)) }}
+config-port-base = {{ dumps(zope_parameter_dict.get('port-base', port_base)) }}
+sla-computer_guid = {{ zope_parameter_dict.get('computer-guid', computer_id) }}
+{% endfor -%}
+
+{# We need to concatenate lists that we cannot read as lists, so this gets hairy. -#}
+{% set zope_address_list_id_dict = {} -%}
+{% set zope_family_parameter_dict = {} -%}
+{% set publish_dict = {} -%}
+{% for family_name, zope_section_id_list in zope_family_dict.items() -%}
+{%   for zope_section_id in zope_section_id_list -%}
+{%     set parameter_name = 'zope-family-entry-' ~ zope_section_id -%}
+{%     do zope_address_list_id_dict.__setitem__(zope_section_id, parameter_name) -%}
+{%     do zope_family_parameter_dict.setdefault(family_name, []).append(parameter_name) -%}
+{%   endfor -%}
+{%   if has_frontend -%}
+{%     set frontend_name = 'frontend-' ~ family_name -%}
+{%     set publishable = frontend_name ~ ':connection-site_url' -%}
+[{{ frontend_name }}]
+< = request-frontend-base
+name = {{ frontend_name }}
+config-url = {{ backend_url }}
+{%   else -%}
+{%     set publishable = 'request-balancer:connection-' ~ family_name -%}
+{%   endif -%}
+{%   do publish_dict.__setitem__(family_name, publishable) -%}
+{% endfor -%}
+
+[request-balancer]
+< = request-common
+name = balancer
+software-type = balancer
+sla-computer_guid = {{ slapparameter_dict.get('balancer-computer-guid', computer_id) }}
+extra-config =
+  haproxy-maxconn
+  haproxy-server-check-path
+  apache-access-control-string
+  apache-ssl-authentication
+  apache-backend-path
+  ca
+  zope-family-dict
+  {{ zope_address_list_id_dict.values() | join(' ') }}
+return =
+  {{ zope_family_dict.keys() | join(' ') }}
+config-zope-family-dict = {{ dumps(zope_family_parameter_dict) }}
+{% for zope_section_id, name in zope_address_list_id_dict.items() -%}
+config-{{ name }} = {{ ' ${' ~ zope_section_id ~ ':connection-zope-address-list}' }}
+{% endfor -%}
+# XXX: should those really be same for all families ?
+config-haproxy-maxconn = {{ slapparameter_dict.get('haproxy-maxconn', 1) }}
+config-haproxy-server-check-path = {{ slapparameter_dict.get('haproxy-server-check-path', '/') % {'site-id': site_id} }}
+config-apache-access-control-string = {{ slapparameter_dict.get('apache-access-control-string', 'all') }}
+config-apache-ssl-authentication = {{ slapparameter_dict.get('apache-ssl-authentication', '0') }}
+config-apache-backend-path = {{ slapparameter_dict.get('apache-backend-path', '/') % {'site-id': site_id} }}
+config-ca = {{ dumps(slapparameter_dict.get('ca', {})) }}
 
-[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}
-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 }}
-smtp-url = smtp://localhost:25/
+[request-frontend-base]
+{% if has_frontend -%}
+< = request-common
+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'] }}
+slave = true
+{% set config_dict = {
+  'type': 'zope',
+} -%}
+{%   if slapparameter_dict.get('frontend-domain') -%}
+{%     do config_dict.__setitem__('custom_domain', slapparameter_dict['frontend-domain']) -%}
+{%   endif -%}
+extra-config = url {{ config_dict.keys() | join(' ') }}
+{%   for name, value in config_dict.items() -%}
+config-{{ name }} = {{ value }}
+{%   endfor -%}
+return = site_url
+{% endif -%}
 
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = ${buildout:directory}/etc/run
+[publish]
+recipe = slapos.cookbook:publish.serialised
+{% for family_name, publishable in publish_dict.items() -%}
+{{   family_name }} = {{ '${' ~ publishable ~ '}' }}
+{% endfor -%}
+
+[buildout]
+parts = publish
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+{% endif %}

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

@@ -87,7 +87,7 @@ bt5 = ${slap-parameter:bt5}
 bt5-repository-url = ${slap-parameter:bt5-repository-url}
 
 [request-common]
-recipe = slapos.cookbook:request
+recipe = slapos.cookbook:request.serialised
 software-url = ${slap-connection:software-release-url}
 sla = computer_guid
 sla-computer_guid = ${slap-connection:computer-id}

stack/erp5/instance-kumofs.cfg.in

+{% if software_type == slap_software_type -%}
+{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
 [buildout]
 parts =
   publish-kumofs-connection-information
@@ -16,14 +18,24 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [publish-kumofs-connection-information]
-recipe = slapos.cookbook:publishurl
+recipe = slapos.cookbook:publish.serialised
+{% if use_ipv6 -%}
+url = memcached://[${kumofs-instance:ip}]:${kumofs-instance:gateway-port}/
+{% else -%}
 url = memcached://${kumofs-instance:ip}:${kumofs-instance:gateway-port}/
+{% endif -%}
 
 [kumofs-instance]
 recipe = slapos.cookbook:generic.kumofs
 
 # Network options
+{% if use_ipv6 -%}
+ip = ${slap-network-information:global-ipv6}
+address-family = inet6
+{% else -%}
 ip = ${slap-network-information:local-ipv4}
+address-family = inet4
+{% endif -%}
 manager-port = 13101
 server-port = 13201
 server-listen-port = 13202
@@ -43,10 +55,10 @@ 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
+kumo-gateway-binary = {{ parameter_dict['kumo-location'] }}/bin/kumo-gateway
+kumo-manager-binary = {{ parameter_dict['kumo-location'] }}/bin/kumo-manager
+kumo-server-binary = {{ parameter_dict['kumo-location'] }}/bin/kumo-server
+shell-path = {{ parameter_dict['dash-location'] }}/bin/dash
 
 [logrotate-entry-kumofs]
 <= logrotate
@@ -60,9 +72,9 @@ log = ${kumofs-instance:kumo-gateway-log} ${kumofs-instance:kumo-manager-log}
 [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
+logrotate-binary = {{ parameter_dict['logrotate-location'] }}/usr/sbin/logrotate
+gzip-binary = {{ parameter_dict['gzip-location'] }}/bin/gzip
+gunzip-binary = {{ parameter_dict['gzip-location'] }}/bin/gunzip
 # Directories
 wrapper = ${rootdirectory:bin}/logrotate
 conf = ${rootdirectory:etc}/logrotate.conf
@@ -96,7 +108,7 @@ bin = ${buildout:directory}/bin
 
 [cron]
 recipe = slapos.cookbook:cron
-dcrond-binary = {{ dcron_location }}/sbin/crond
+dcrond-binary = {{ parameter_dict['dcron-location'] }}/sbin/crond
 cron-entries = ${directory:cron-entries}
 crontabs = ${directory:crontabs}
 cronstamps = ${directory:cronstamps}
@@ -137,3 +149,4 @@ port = ${kumofs-instance:gateway-port}
 [promise-kumofs-manager]
 <= promise-template
 port = ${kumofs-instance:manager-port}
+{% endif %}

stack/erp5/instance-logrotate-base.cfg.in

+[buildout]
+parts =
+  cron-entry-logrotate
+
+[cron]
+recipe = slapos.cookbook:cron
+cron-entries = ${logrotate-directory:cron-entries}
+dcrond-binary = {{ dcron_location }}/sbin/crond
+crontabs = ${logrotate-directory:crontabs}
+cronstamps = ${logrotate-directory:cronstamps}
+catcher = ${cron-simplelogger:wrapper}
+binary = ${logrotate-directory:services}/crond
+
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = ${logrotate-directory:bin}/cron_simplelogger
+log = ${logrotate-directory:log}/cron.log
+
+[logrotate]
+recipe = slapos.cookbook:logrotate
+logrotate-entries = ${logrotate-directory:logrotate-entries}
+backup = ${logrotate-directory:logrotate-backup}
+logrotate-binary = {{ logrotate_location }}/usr/sbin/logrotate
+gzip-binary = {{ gzip_location }}/bin/gzip
+gunzip-binary = {{ gzip_location }}/bin/gunzip
+wrapper = ${logrotate-directory:bin}/logrotate
+conf = ${logrotate-directory:etc}/logrotate.conf
+state-file = ${logrotate-directory:srv}/logrotate.status
+
+[cron-entry-logrotate]
+recipe = slapos.cookbook:cron.d
+cron-entries = ${cron:cron-entries}
+name = logrotate
+frequency = 0 0 * * *
+command = ${logrotate:wrapper}
+
+[logrotate-directory]
+recipe = slapos.cookbook:mkdirectory
+cron-entries = ${:etc}/cron.d
+cronstamps = ${:etc}/cronstamps
+crontabs = ${:etc}/crontabs
+logrotate-backup = ${:backup}/logrotate
+logrotate-entries = ${:etc}/logrotate.d
+bin = ${buildout:directory}/bin
+srv = ${buildout:directory}/srv
+backup = ${:srv}/backup
+etc = ${buildout:directory}/etc
+services = ${:etc}/run
+log = ${buildout:directory}/var/log
+

stack/erp5/instance-mariadb.cfg.in

+{% if software_type == slap_software_type -%}
+{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
 [buildout]
 parts =
   publish-mariadb-url
@@ -15,8 +17,12 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [publish-mariadb-url]
-recipe = slapos.cookbook:publishurl
+recipe = slapos.cookbook:publish.serialised
+{% if use_ipv6 -%}
+url = mysql://${mariadb-instance:user}:${mariadb-instance:password}@[${mariadb-instance:ip}]:${mariadb-instance:port}/${mariadb-instance:database}
+{% else -%}
 url = mysql://${mariadb-instance:user}:${mariadb-instance:password}@${mariadb-instance:ip}:${mariadb-instance:port}/${mariadb-instance:database}
+{% endif -%}
 
 [cron-entry-mariadb-backup]
 <= cron
@@ -30,9 +36,13 @@ recipe = slapos.cookbook:generic.mysql
 
 # Options
 user = user
-parallel-test-database-amount = 100
+parallel-test-database-amount = {{ slapparameter_dict.get('test-database-amount', 100) }}
 port = 45678
-ip = ${slap-network-information:local-ipv4}
+{% if use_ipv6 -%}
+ip = {{ (ipv6_set | list)[0] }}
+{% else -%}
+ip = {{ (ipv4_set | list)[0] }}
+{% endif -%}
 database = erp5
 test-user = erp5_test
 test-database = erp5_test
@@ -56,46 +66,46 @@ 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
+innobackupex-binary = {{ parameter_dict['xtrabackup-location'] }}/bin/innobackupex
+mysql-base-directory = {{ parameter_dict['mariadb-location'] }}
+mysql-binary = {{ parameter_dict['mariadb-location'] }}/bin/mysql
+mysql-install-binary = {{ parameter_dict['mariadb-location'] }}/scripts/mysql_install_db
+mysql-upgrade-binary = {{ parameter_dict['mariadb-location'] }}/bin/mysql_upgrade
+mysqld-binary = {{ parameter_dict['mariadb-location'] }}/bin/mysqld
+pt-archiver-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-archiver
+pt-config-diff-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-config-diff
+pt-deadlock-logger-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-deadlock-logger
+pt-duplicate-key-checker-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-duplicate-key-checker
+pt-fifo-split-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-fifo-split
+pt-find-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-find
+pt-fk-error-logger-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-fk-error-logger
+pt-heartbeat-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-heartbeat
+pt-index-usage-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-index-usage
+pt-kill-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-kill
+pt-log-player-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-log-player
+pt-online-schema-change-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-online-schema-change
+pt-query-advisor-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-query-advisor
+pt-query-digest-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-query-digest
+pt-show-grants-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-show-grants
+pt-slave-delay-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-slave-delay
+pt-slave-find-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-slave-find
+pt-slave-restart-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-slave-restart
+pt-table-checksum-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-table-checksum
+pt-table-sync-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-table-sync
+pt-tcp-model-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-tcp-model
+pt-trend-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-trend
+pt-upgrade-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-upgrade
+pt-variable-advisor-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-variable-advisor
+pt-visual-explain-binary = {{ parameter_dict['perl-siteprefix'] }}/bin/pt-visual-explain
+xtrabackup-binary = {{ parameter_dict['xtrabackup-location'] }}/bin/xtrabackup_51
+perl-binary = {{ parameter_dict['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
+logrotate-binary = {{ parameter_dict['logrotate-location'] }}/usr/sbin/logrotate
+gzip-binary = {{ parameter_dict['gzip-location'] }}/bin/gzip
+gunzip-binary = {{ parameter_dict['gzip-location'] }}/bin/gunzip
 # Directories
 wrapper = ${rootdirectory:bin}/logrotate
 conf = ${rootdirectory:etc}/logrotate.conf
@@ -112,7 +122,7 @@ post = ${mariadb-instance:mysql-binary} --no-defaults -B --socket=${mariadb-inst
 
 [cron]
 recipe = slapos.cookbook:cron
-dcrond-binary = {{ dcron_location }}/sbin/crond
+dcrond-binary = {{ parameter_dict['dcron-location'] }}/sbin/crond
 cron-entries = ${directory:cron-entries}
 crontabs = ${directory:crontabs}
 cronstamps = ${directory:cronstamps}
@@ -135,16 +145,16 @@ command = ${logrotate:wrapper}
 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
+  {{ parameter_dict['coreutils-location'] }}/bin/basename
+  {{ parameter_dict['coreutils-location'] }}/bin/cat
+  {{ parameter_dict['coreutils-location'] }}/bin/cp
+  {{ parameter_dict['coreutils-location'] }}/bin/ls
+  {{ parameter_dict['coreutils-location'] }}/bin/tr
+  {{ parameter_dict['coreutils-location'] }}/bin/uname
+  {{ parameter_dict['gettext-location'] }}/lib/gettext/hostname
+  {{ parameter_dict['grep-location'] }}/bin/grep
+  {{ parameter_dict['sed-location'] }}/bin/sed
+  {{ parameter_dict['mariadb-location'] }}/bin/mysql
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
@@ -178,3 +188,4 @@ recipe = slapos.cookbook:check_port_listening
 path = ${basedirectory:promise}/mariadb
 hostname = ${mariadb-instance:ip}
 port = ${mariadb-instance:port}
+{% endif %}

stack/erp5/instance-memcached.cfg.in

-#############################
-#
-# Instanciate memcached
-#
-# No slapos parameter needed
-#
-#############################
+{% if software_type == slap_software_type -%}
+{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
 [buildout]
-parts =
-  memcached-instance
-  publish-memcached-connection-information
-  promise
-
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
+parts =
+  publish-memcached-connection-information
+  memcache-promise
+{% if use_ipv6 -%}
+  tunnel-promise
+
+[ipv6toipv4]
+recipe = slapos.cookbook:ipv6toipv4
+runner-path = ${directory:service}/${:base-name}
+6tunnel-path = {{ parameter_dict['6tunnel-location'] }}/bin/6tunnel
+shell-path = {{ parameter_dict['dash-location'] }}/bin/dash
+ipv4 = ${memcached-instance:ip}
+ipv6 = ${slap-network-information:global-ipv6}
+ipv6-port = ${memcached-instance:port}
+ipv4-port = ${memcached-instance:port}
+base-name = memcached-tunnel
+
+[tunnel-promise]
+recipe = slapos.cookbook:check_port_listening
+path = ${directory:promise}/tunnel
+hostname = ${ipv6toipv4:ipv6}
+port = ${ipv6toipv4:ipv6-port}
+{% endif -%}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
@@ -25,18 +38,22 @@ promise = ${:etc}/promise
 [memcached-instance]
 recipe = slapos.cookbook:generic.memcached
 wrapper_path = ${directory:service}/memcached
-binary_path = {{ memcached_location }}/bin/memcached
-shell-path = {{ dash_location }}/bin/dash
+binary_path = {{ parameter_dict['memcached-location'] }}/bin/memcached
+shell-path = {{ parameter_dict['dash-location'] }}/bin/dash
 ip = ${slap-network-information:local-ipv4}
 port = 11000
 
 [publish-memcached-connection-information]
-recipe = slapos.cookbook:publishurl
+recipe = slapos.cookbook:publish.serialised
+{% if use_ipv6 -%}
+url = memcached://[${ipv6toipv4:ipv6}]:${ipv6toipv4:ipv6-port}/
+{% else -%}
 url = memcached://${memcached-instance:ip}:${memcached-instance:port}/
+{% endif -%}
 
-# Deploy zope promises scripts
-[promise]
+[memcache-promise]
 recipe = slapos.cookbook:check_port_listening
 path = ${directory:promise}/memcache
 hostname = ${memcached-instance:ip}
 port = ${memcached-instance:port}
+{% endif %}

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

@@ -17,7 +17,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [publish-varnish-connection-information]
-recipe = slapos.cookbook:publishurl
+recipe = slapos.cookbook:publish.serialised
 url = http://${varnish-instance:ip}:${varnish-instance:server-port}/
 
 [varnish-instance]

stack/erp5/instance-zeo.cfg.in

+{% if software_type == slap_software_type -%}
+{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
+{% set next_port = 2000 -%}
+{% set part_list = [] -%}
+{% set storage_dict = {} -%}
+{% set zodb_dict = {} -%}
+{% set tidstorage_dict = slapparameter_dict.get('tidstorage-dict') -%}
+{% set known_tid_storage_identifier_dict = {} -%}
+{% set default_zodb_path = buildout_directory ~ '/srv/zodb' -%}
+{% set zodb_backup_path = buildout_directory ~ '/srv/backup/zodb' -%}
+{% set default_tidstorage_timestamp_path = buildout_directory ~ '/srv/backup/tidstorage' -%}
+{% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%}
+{#
+XXX: This template only supports exactly one IPv6 per
+partition. No more (undefined result), no less (IndexError).
+-#}
+{% set ipv4 = (ipv4_set | list)[0] -%}
+{% set tidstorage_ip = ipv4 -%}
+{% set tidstorage_port = 6001 -%}
+{% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
+
+[zeo-base]
+recipe = slapos.cookbook:zeo
+log-path = ${directory:log}/${:base-name}.log
+pid-path = ${directory:run}/${:base-name}.pid
+conf-path = ${directory:etc}/${:base-name}.conf
+wrapper-path = ${directory:services}/${:base-name}
+binary-path = {{ bin_directory }}/runzeo
+ip = {{ ipv4 }}
+
+{% if use_ipv6 -%}
+{% set ipv6 = (ipv6_set | list)[0] -%}
+[ipv6toipv4-base]
+recipe = slapos.cookbook:ipv6toipv4
+runner-path = ${directory:services}/${:base-name}
+6tunnel-path = {{ parameter_dict['6tunnel'] }}/bin/6tunnel
+shell-path = {{ parameter_dict['dash'] }}/bin/dash
+ipv4 = {{ ipv4 }}
+ipv6 = {{ ipv6 }}
+{% endif -%}
+
+{% for export_id, mountpoint_dict in slapparameter_dict['zodb-dict'].items() -%}
+{%   do storage_dict.setdefault(
+       mountpoint_dict.get('storage-family', 'default'), []
+     ).append((
+       export_id,
+       mountpoint_dict.get('mount-point', '/'),
+       mountpoint_dict.get('cache-size', -1),
+       mountpoint_dict.get('storage-dict', {}),
+     )) -%}
+{% endfor -%}
+{% for storage_family, export_list in storage_dict.items() -%}
+{%   set known_tid_storage_identifier_host = (ipv4, local_current_port) -%}
+{%   set client_dict = {} -%}
+{%   for export_id, mount_point, cache_size, storage_dict in export_list -%}
+{%     do storage_dict.__setitem__('path', storage_dict.get('path', '%(zodb)s/' ~ export_id ~ '.fs') % {'zodb': default_zodb_path}) -%}
+{%     do client_dict.update(storage_dict.get('client', {})) -%}
+{%     do client_dict.__setitem__('storage', export_id) -%}
+{#     XXX: I would like to raise if export_id is present in zodb_dict -#}
+{%     do zodb_dict.__setitem__(export_id, [
+         mount_point,
+         cache_size,
+         client_dict,
+       ]) -%}
+{%     if tidstorage_dict != None -%}
+{%       do known_tid_storage_identifier_dict.__setitem__(
+           (known_tid_storage_identifier_host, export_id), (
+             storage_dict['path'],
+             tidstorage_dict.get('zodb-dict', {}).get(export_id, '%(backup)s/' ~ export_id) % {'backup': zodb_backup_path},
+             mount_point,
+           ),
+         ) -%}
+{%     endif -%}
+{%   endfor -%}
+{%   set zeo_section_name = 'zeo-' ~ storage_family %}
+[{{ zeo_section_name }}]
+< = zeo-base
+base-name = zeo-{{ storage_family }}
+port = {{ next_port }}
+{%   set storage_list = [] -%}
+{%   for storage_name, _, _, storage_dict in export_list -%}
+{%     do storage_list.append((storage_name, storage_dict['path'])) -%}
+{%   endfor -%}
+storage = {{ dumps(storage_list) }}
+
+[{{ section(zeo_section_name ~ "-promise") }}]
+recipe = slapos.cookbook:check_port_listening
+hostname = {{ "${" ~ zeo_section_name ~ ":ip}" }}
+port = {{ next_port }}
+path = ${directory:promises}/zeo-{{ storage_family }}
+
+{%   if use_ipv6 -%}
+{%     do client_dict.__setitem__('server', '[' ~ ipv6 ~ ']:' ~ next_port) -%}
+{%     set tunnel_section_name = zeo_section_name ~ "-tunnel" -%}
+[{{ tunnel_section_name }}]
+< = ipv6toipv4-base
+base-name = zeo-tunnel-{{ storage_family }}
+ipv6-port = {{ next_port }}
+ipv4-port = {{ next_port }}
+
+[{{ section(tunnel_section_name ~ "-promise") }}]
+recipe = slapos.cookbook:check_port_listening
+hostname = {{ "${" ~ tunnel_section_name ~ ":ipv6}" }}
+port = {{ next_port }}
+path = ${directory:promises}/zeo-tunnel-{{ storage_family }}
+{%   else -%}
+{%     do client_dict.__setitem__('server', ipv4 ~ ':' ~ next_port) -%}
+{%   endif -%}
+{%   set next_port = next_port + 1 -%}
+{% endfor -%}
+
+{% if tidstorage_dict != None -%}
+[tidstorage]
+recipe = slapos.cookbook:tidstorage
+known-tid-storage-identifier-dict = {{ dumps(known_tid_storage_identifier_dict) }}
+configuration-path = ${directory:etc}/tidstorage.py
+ip = {{ tidstorage_ip }}
+port = {{ tidstorage_port }}
+timestamp-file-path = {{ tidstorage_dict.get('timestamp-path', '%(backup)s/repozo_tidstorage_timestamp.log' % {'backup': default_tidstorage_timestamp_path}) }}
+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
+
+[{{ section("promise-tidstorage") }}]
+recipe = slapos.cookbook:check_port_listening
+hostname = ${tidstorage:ip}
+port = ${tidstorage:port}
+path = ${directory:promises}/tidstorage
+
+{%  if use_ipv6 -%}
+[tidstorage-tunnel]
+< = ipv6toipv4-base
+base-name = tidstorage-tunnel
+ipv4-port = ${tidstorage:port}
+ipv6-port = ${tidstorage:port}
+
+[{{ section("promise-tidstorage-tunnel") }}]
+recipe = slapos.cookbook:check_port_listening
+hostname = ${tidstorage-tunnel:ipv6}
+port = ${tidstorage-tunnel:ipv6-port}
+path = ${directory:promises}/tidstorage
+{% endif -%}
+
+[{{ section("cron-entry-tidstorage-backup") }}]
+# TODO:
+# - configurable periodicity
+# - configurable full/incremental
+# - configurable retention
+recipe = slapos.cookbook:cron.d
+cron-entries = ${cron:cron-entries}
+name = tidstorage
+frequency = 0 0 * * *
+command = ${tidstorage:repozo-wrapper}
+
+[{{ section("logrotate-tidstorage") }}]
+recipe = slapos.cookbook:logrotate.d
+logrotate-entries = ${logrotate:logrotate-entries}
+backup = ${logrotate:backup}
+name = tidstorage
+log = ${tidstorage:logfile-name}
+post = {{ bin_directory }}/killpidfromfile ${tidstorage:pidfile-name} SIGHUP
+{% else -%}
+[tidstorage]
+ip =
+port =
+
+[tidstorage-tunnel]
+ipv6 =
+ipv6-port =
+{% endif -%}
+
+[publish]
+recipe = slapos.cookbook:publish.serialised
+zodb-storage-type = zeoclient
+zodb-dict = {{ dumps(zodb_dict) }}
+{% if use_ipv6 -%}
+tidstorage-ip = ${tidstorage-tunnel:ipv6}
+tidstorage-port = ${tidstorage-tunnel:ipv6-port}
+{% else -%}
+tidstorage-ip = ${tidstorage:ip}
+tidstorage-port = ${tidstorage:port}
+{% endif -%}
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+services = ${:etc}/run
+promises = ${:etc}/promise
+var = ${buildout:directory}/var
+log = ${:var}/log
+run = ${:var}/run
+backup-zodb = {{ zodb_backup_path }}
+zodb = {{ default_zodb_path }}
+tidstorage = {{ default_tidstorage_timestamp_path }}
+
+[buildout]
+extends =
+  {{ parameter_dict['instance-logrotate-cfg'] }}
+parts +=
+  {{ part_list | join('\n  ') }}
+  publish
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+{% endif %}

stack/erp5/instance-zope.cfg.in

@@ -21,7 +21,7 @@ offline = true
 
 {% if 'frontend-software-url' in slapparameter_dict -%}
 [request-slave-frontend]
-recipe = slapos.cookbook:request
+recipe = slapos.cookbook:request.serialised
 software-url = {{ slapparameter_dict['frontend-software-url'] }}
 software-type = {{ slapparameter_dict.get('frontend-software-type', 'RootSoftwareInstance') }}
 sla = instance_guid
@@ -47,14 +47,14 @@ config-{{ name }} = {{ value }}
 return = site_url
 
 [publish-apache-zope-backend-connection-string]
-recipe = slapos.cookbook:publish
+recipe = slapos.cookbook:publish.serialised
 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
+recipe = slapos.cookbook:publish.serialised
 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 %}
@@ -200,6 +200,7 @@ link-binary =
   {{ sed_location }}/bin/sed
   {{ tesseract_location }}/bin/tesseract
   {{ w3m_location }}/bin/w3m
+  {{ openssl_location }}/bin/openssl
   {{ poppler_location }}/bin/pdfinfo
   {{ poppler_location }}/bin/pdfseparate
   {{ poppler_location }}/bin/pdftotext

stack/erp5/instance.cfg.in

@@ -6,8 +6,8 @@ eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
-[slap-parameters]
-recipe = slapos.cookbook:slapconfiguration
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration.serialised
 computer = ${slap-connection:computer-id}
 partition = ${slap-connection:partition-id}
 url = ${slap-connection:server-url}
@@ -19,53 +19,15 @@ recipe = slapos.recipe.template:jinja2
 rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
 extra-context =
 context =
+    key ipv4_set slap-configuration:ipv4
+    key ipv6_set slap-configuration:ipv6
     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
+    key slap_software_type slap-configuration:slap-software-type
+    key slapparameter_dict slap-configuration:configuration
+    key computer_id slap-configuration:computer
     ${: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 }}
@@ -83,6 +45,8 @@ zlib = {{ zlib_location }}
 libreoffice-bin = {{ libreoffice_bin_location }}
 fonts = {{ fonts_location }}
 buildout-bin-directory = {{ buildout_bin_directory }}
+6tunnel = {{ sixtunnel_location }}
+dash = {{ dash_location }}
 
 [dynamic-template-cloudooo]
 < = jinja2-template-base
@@ -187,19 +151,150 @@ extra-context =
     key template_zope dynamic-template-zope:rendered
     key local_bt5_repository template-erp5-single-parameters:local_bt5_repository
 
+[dynamic-template-cluster-erp5-parameters]
+local-bt5-repository = {{ local_bt5_repository }}
+
+[dynamic-template-cluster-erp5]
+< = jinja2-template-base
+template = {{ template_erp5_cluster }}
+filename = instance-cluster-erp5.cfg
+extensions = jinja2.ext.do
+extra-context =
+    key local_bt5_repository dynamic-template-cluster-erp5-parameters:local-bt5-repository
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type cluster
+
+[dynamic-template-balancer-parameters]
+apache = {{ apache_location }}
+openssl = {{ openssl_location }}
+haproxy = {{ haproxy_location }}
+instance-logrotate-cfg = {{ template_logrotate_base }}
+bin-directory = {{ bin_directory }}
+6tunnel = {{ sixtunnel_location }}
+dash = {{ dash_location }}
+
+[dynamic-template-balancer]
+< = jinja2-template-base
+template = {{ template_balancer }}
+extensions = jinja2.ext.do
+filename = instance-balancer.cfg
+extra-context =
+    section parameter_dict dynamic-template-balancer-parameters
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type balancer
+
+[dynamic-template-zeo-parameters]
+buildout-bin-directory = {{ buildout_bin_directory }}
+instance-logrotate-cfg = {{ template_logrotate_base }}
+6tunnel = {{ sixtunnel_location }}
+dash = {{ dash_location }}
+
+[dynamic-template-zeo]
+< = jinja2-template-base
+template = {{ template_zeo }}
+filename = instance-zeo.cfg
+extensions = jinja2.ext.do
+extra-context =
+    key buildout_directory buildout:directory
+    section parameter_dict dynamic-template-zeo-parameters
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type zodb-zeo
+
+[dynamic-template-cluster-zope-parameters]
+zope-conf-template = {{ template_zope_conf }}
+instance-logrotate-cfg = {{ template_logrotate_base }}
+git = {{ git_location }}
+graphviz = {{ graphviz_location }}
+buildout-bin-directory = {{ buildout_bin_directory }}
+coreutils = {{ coreutils_location }}
+grep = {{ grep_location }}
+imagemagick = {{ imagemagick_location }}
+pdftk = {{ pdftk_location }}
+sed = {{ sed_location }}
+tesseract = {{ tesseract_location }}
+w3m = {{ w3m_location }}
+poppler = {{ poppler_location }}
+dmtx-utils = {{ dmtx_utils_location }}
+openssl = {{ openssl_location }}
+6tunnel = {{ sixtunnel_location }}
+dash = {{ dash_location }}
+
+[dynamic-template-cluster-zope]
+< = jinja2-template-base
+template = {{ template_cluster_zope }}
+filename = instance-cluster-zope.cfg
+extensions = jinja2.ext.do
+extra-context =
+    key buildout_directory buildout:directory
+    section parameter_dict dynamic-template-cluster-zope-parameters
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type cluster-zope
+
+[dynamic-template-kumofs-parameters]
+dash-location = {{ dash_location }}
+dcron-location = {{ dcron_location }}
+gzip-location = {{ gzip_location }}
+kumo-location = {{ kumo_location }}
+logrotate-location = {{ logrotate_location }}
+
+[dynamic-template-kumofs]
+< = jinja2-template-base
+template = {{ template_kumofs }}
+filename = instance-kumofs.cfg
+extra-context =
+    section parameter_dict dynamic-template-kumofs-parameters
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type kumofs
+
+[dynamic-template-mariadb-parameters]
+coreutils-location = {{ coreutils_location }}
+dcron-location = {{ dcron_location }}
+gettext-location = {{ gettext_location }}
+grep-location = {{ grep_location }}
+gzip-location = {{ gzip_location }}
+logrotate-location = {{ logrotate_location }}
+mariadb-location = {{ mariadb_location }}
+perl-location = {{ perl_location }}
+perl-siteprefix = {{ perl_siteprefix }}
+sed-location = {{ sed_location }}
+xtrabackup-location = {{ xtrabackup_location }}
+
+[dynamic-template-mariadb]
+< = jinja2-template-base
+template = {{ template_mariadb }}
+filename = instance-mariadb.cfg
+extra-context =
+    section parameter_dict dynamic-template-mariadb-parameters
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type mariadb
+
+[dynamic-template-memcached-parameters]
+dash-location = {{ dash_location }}
+6tunnel-location = {{ sixtunnel_location }}
+memcached-location = {{ memcached_location }}
+
+[dynamic-template-memcached]
+< = jinja2-template-base
+template = {{ template_memcached }}
+filename = instance-memcached.cfg
+extra-context =
+    section parameter_dict dynamic-template-memcached-parameters
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type memcached
+
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype
 default = ${template-erp5-single:rendered}
-production = {{ template_erp5_cluster }}
-cluster = {{ template_erp5_cluster }}
-kumofs = {{ template_kumofs }}
-memcached = {{ template_memcached }}
+cluster = ${dynamic-template-cluster-erp5:rendered}
+kumofs = ${dynamic-template-kumofs:rendered}
+memcached = ${dynamic-template-memcached:rendered}
 cloudooo = ${dynamic-template-cloudooo:rendered}
 zope = ${dynamic-template-zope:rendered}
-mariadb = {{ template_mariadb }}
-sphinx = {{ template_sphinx }}
-tidstorage = ${dynamic-template-tidstorage:rendered}
+mariadb = ${dynamic-template-mariadb:rendered}
 varnish = ${dynamic-template-varnish:rendered}
+balancer = ${dynamic-template-balancer:rendered}
+zodb-zeo = ${dynamic-template-zeo:rendered}
+cluster-zope = ${dynamic-template-cluster-zope:rendered}
 
 [slap-connection]
 # part to migrate to new - separated words

stack/erp5/zope.conf.in

@@ -43,10 +43,11 @@ products {{ instance_products }}
 </product-config>
 
 {% endif -%}
-{% if 'timerserver-interval' in parameter_dict -%}
+{% set timerserver_interval = parameter_dict.get('timerserver-interval', 0) -%}
+{% if timerserver_interval -%}
 %import timerserver
 <timer-server>
-  interval {{ parameter_dict['timerserver-interval'] }}
+  interval {{ timerserver_interval }}
 </timer-server>
 
 {% endif -%}
@@ -82,7 +83,7 @@ products {{ instance_products }}
 
 {% for db_name, mount_point, cache_size, storage_type, storage_dict in parameter_dict['zodb-list'] -%}
 <zodb_db {{ db_name }}>
-{%-   if cache_size %}
+{%-   if cache_size >= 0 %}
   cache-size {{ cache_size }}
 {%-   endif %}
   mount-point {{ mount_point }}

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/buildout.cfg

@@ -66,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 = ae9c0f8c70a62f13eb948424c99d71e2
+md5sum = a5dd222b3faa4e1ef2df9b3b9bb47966
 mode = 0644
 
 [template-apache-backup]
@@ -87,7 +87,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
 output = ${buildout:directory}/template-mariadb.cfg
-md5sum = ba5ebecbfe9fbb96d48f2baa43c37065  
+md5sum = 767452bc503ff6c1b7af0ebfac590c9f
 mode = 0644
 
 [template-mariadb-pbsready]
@@ -135,6 +135,16 @@ eggs =
 [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
@@ -163,17 +173,17 @@ signature-certificate-list =
   hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
   -----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
+  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
@@ -188,105 +198,169 @@ signature-certificate-list =
   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.10.1
+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.1
-ipython = 0.12.1
+hexagonit.recipe.cmmi = 1.6
 meld3 = 0.6.8
 pycrypto = 2.6
 rdiff-backup = 1.0.5
-slapos.cookbook = 0.55
-slapos.recipe.build = 0.9
+slapos.cookbook = 0.66
+slapos.libnetworkcache = 0.13.2
+slapos.recipe.build = 0.11.2
 slapos.recipe.download = 1.0.dev-r4053
-slapos.recipe.template = 2.4
-slapos.toolbox = 0.25
+slapos.recipe.template = 2.4.2
+slapos.toolbox = 0.30
 smmap = 0.8.2
 
 # Required by:
-# slapos.core==0.25
-# slapos.toolbox==0.25
-Flask = 0.8
+# slapos.core==0.28.5
+# slapos.toolbox==0.30
+Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.25
+# slapos.toolbox==0.30
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.cookbook==0.55
+# slapos.cookbook==0.66
 PyXML = 0.8.4
 
 # Required by:
-# netaddr==0.7.7
-Sphinx = 1.1.3
-
-# Required by:
-# slapos.toolbox==0.25
+# slapos.toolbox==0.30
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.25
+# slapos.toolbox==0.30
 feedparser = 5.1.2
 
 # Required by:
-# slapos.cookbook==0.55
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.5.1
+
+# Required by:
+# slapos.cookbook==0.66
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.cookbook==0.55
-# slapos.core==0.25
+# slapos.cookbook==0.66
+# slapos.core==0.28.5
 # xml-marshaller==0.9.7
-lxml = 2.3.4
+lxml = 3.0alpha2
 
 # Required by:
-# slapos.cookbook==0.55
-netaddr = 0.7.7
+# slapos.cookbook==0.66
+netaddr = 0.7.10
 
 # Required by:
-# slapos.core==0.25
+# slapos.core==0.28.5
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.25
+# slapos.toolbox==0.30
 paramiko = 1.7.7.2
 
 # Required by:
-# slapos.toolbox==0.25
-psutil = 0.4.1
+# slapos.toolbox==0.30
+psutil = 0.6.1
 
 # Required by:
-# slapos.cookbook==0.55
-# slapos.core==0.25
-# slapos.toolbox==0.25
+# slapos.cookbook==0.66
+# slapos.core==0.28.5
+# slapos.toolbox==0.30
 # zc.buildout==1.6.0-dev-SlapOS-006
 # zc.recipe.egg==1.3.2
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.55
-# slapos.toolbox==0.25
-slapos.core = 0.25
+# slapos.cookbook==0.66
+# slapos.toolbox==0.30
+slapos.core = 0.28.5
 
 # Required by:
-# slapos.core==0.25
+# slapos.core==0.28.5
 supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.55
-# slapos.toolbox==0.25
+# slapos.cookbook==0.66
+# slapos.toolbox==0.30
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.55
+# slapos.cookbook==0.66
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.25
+# slapos.core==0.28.5
 zope.interface = 4.0.1
+

stack/lamp/instance-apache-php.cfg

@@ -12,6 +12,7 @@ parts =
   slapmonitor
   slapreport
   frontend-promise
+  content-promise
   publish-connection-informations
 
 eggs-directory = ${buildout:eggs-directory}
@@ -66,7 +67,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
@@ -105,6 +106,8 @@ name = MariaDB
 software-url = $${slap-connection:software-release-url}
 software-type = mariadb
 return = url
+sla = computer_guid
+sla-computer_guid = $${slap-connection:computer-id}
 
 [mariadb-urlparse]
 recipe = slapos.cookbook:urlparse
@@ -201,7 +204,7 @@ command = $${logrotate:wrapper}
 # Request frontend
 [request-frontend]
 <= slap-connection
-recipe = slapos.cookbook:request
+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
@@ -256,6 +259,12 @@ url = $${request-frontend:connection-site_url}
 dash_path = ${dash:location}/bin/dash
 curl_path = ${curl:location}/bin/curl
 
+[content-promise]
+recipe = slapos.cookbook:check_page_content
+path = $${basedirectory:promises}/content
+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

stack/slapos.cfg

@@ -9,6 +9,10 @@ parts = slapos-cookbook
 extensions +=
   buildout-versions
 
+# Use shacache and lxml
+extends =
+  ../component/lxml-python/buildout.cfg
+
 # Separate from site eggs
 allowed-eggs-from-site-packages =
 include-site-packages = false
@@ -17,7 +21,6 @@ exec-sitecustomize = false
 # Add location for modified non-official slapos.buildout
 find-links +=
   http://www.nexedi.org/static/packages/source/slapos.buildout/
-  http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
 
 # Use only quite well working sites.
 allow-hosts +=
@@ -51,14 +54,12 @@ networkcache-section = networkcache
 [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-002
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-006
+zc.buildout = 1.6.0-dev-SlapOS-010
 
 [networkcache]
 download-cache-url = http://www.shacache.org/shacache

stack/tomcat.cfg

@@ -3,24 +3,8 @@ extends =
   ../component/lxml-python/buildout.cfg
   ../component/java/buildout.cfg
   ../component/mysql-5.1/buildout.cfg
-  ../component/python-2.7/buildout.cfg
   ../component/tomcat/buildout.cfg
-  ../stack/shacache-client.cfg
-
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-
-# 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
+  ../stack/slapos.cfg
 
 parts =
   template
@@ -45,7 +29,6 @@ md5sum = 22e1aff6104bb9006f8744a02bf73124
 
 [eggs]
 recipe = zc.recipe.egg
-python = python2.7
 eggs =
   ${lxml-python:egg}
   slapos.cookbook