Merge branch 'master' into slapos

Conflicts:
	component/slapos/buildout.cfg

CHANGES.txt

 Changes
 =======
 
+0.39 (unreleased)
+-----------------
+
+ * No changes yet.
+
+0.38 (2011-12-05)
+-----------------
+
+ * erp5: Swtich to percona, as maatkit is obsoleted. [Sebastien Robin]
+ * erp5: Improve haproxy configuration. [Sebastien Robin]
+ * erp5: Support sphinxd. [Kazuhiko Shiozaki]
+ * erp5: Improve and make logging more usual. [Sebastien Robin]
+ * erp5: Allow mysql connection from localhost. [Romain Courteaud]
+ * erp5: Allow to control Zope/Zeo cache [Arnaud Fontaine]
+ * erp5: Increase precision in logs [Julien Muchembled]
+ * erp5: Improve erp5 update [Arnaud Fontaine, Rafael Monnerat]
+
+0.37 (2011-11-24)
+-----------------
+
+ * KVM : allow access to several KVM instances without SSL certificate duplicate
+   problem. [Cedric de Saint Martin]
+
 0.36 (2011-11-16)
 -----------------
 

component/apache/buildout.cfg

@@ -13,61 +13,23 @@ extends =
   ../sqlite3/buildout.cfg
   ../zlib/buildout.cfg
 
-[apache-no-ssl]
-# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
-recipe = hexagonit.recipe.cmmi
-url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.21.tar.bz2
-md5sum = 1696ae62cd879ab1d4dd9ff021a470f2
-configure-options = --enable-authn-alias
-                    --enable-bucketeer
-                    --enable-cache
-                    --enable-case-filter
-                    --enable-case-filter-in
-                    --enable-cgid
-                    --enable-charset-lite
-                    --enable-disk-cache
-                    --enable-echo
-                    --enable-exception-hook
-                    --enable-mods-shared=all
-                    --enable-optional-fn-export
-                    --enable-optional-fn-import
-                    --enable-optional-hook-export
-                    --enable-optional-hook-import
-                    --enable-proxy
-                    --enable-proxy-ajp
-                    --enable-proxy-balancer
-                    --enable-proxy-connect
-                    --enable-proxy-ftp
-                    --enable-proxy-http
-                    --enable-proxy-scgi
-                    --enable-so
-                    --enable-dav
-                    --enable-dav-fs
-                    --disable-ssl
-                    --with-included-apr
-                    --with-z=${zlib:location}
-                    --with-expat=${libexpat:location}
-                    --with-pcre=${pcre:location}
-                    --with-sqlite3=${sqlite3:location}
-                    --with-gdbm=${gdbm:location}
-                    --without-ssl
-                    --without-lber
-                    --without-ldap
-                    --without-ndbm
-                    --without-berkeley-db
-                    --without-pgsql
-                    --without-mysql
-                    --without-sqlite2
-                    --without-oracle
-                    --without-freedts
-                    --without-odbc
-                    --without-iconv
+[apache-CVE-2011-3368.patch]
+recipe = hexagonit.recipe.download
+md5sum = 1ad598213480ddfc239ce6359b7b2c0b
+url = http://www.apache.org/dist/httpd/patches/apply_to_2.2.21/CVE-2011-3368.patch
+filename = ${:_buildout_section_name_}
+download-only = true
 
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = hexagonit.recipe.cmmi
+depends =
+  ${gdbm:version}
 url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.21.tar.bz2
 md5sum = 1696ae62cd879ab1d4dd9ff021a470f2
+patches =
+  ${apache-CVE-2011-3368.patch:location}/${apache-CVE-2011-3368.patch:filename}
+patch-options = -p1
 configure-options = --disable-static
                     --enable-authn-alias
                     --enable-bucketeer

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.3.tar.gz
-md5sum = a76a44b93acf5e3badda9de111385921
+url = http://www.cmake.org/files/v2.8/cmake-2.8.6.tar.gz
+md5sum = 2147da452fd9212bb9b4542a9eee9d5b

component/corosync/buildout.cfg

+[buildout]
+extends =
+  nss.cfg
+parts =
+  corocosync
+
+[corosync]
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp:downloads@corosync.org/downloads/corosync-1.3.1/corosync-1.3.1.tar.gz
+md5sum = c58459a009a3a9d0b9c00e276a190d90
+environment =
+  CPPFLAGS=-I${nspr:location}/include/nspr -I${nss:location}/include/nss
+  PKG_CONFIG_PATH=${nss:location}/lib/pkgconfig:${nspr:location}/lib/pkgconfig
+  LDFLAGS =-L${nspr:location}/lib -Wl,-rpath=${nspr:location}/lib -L${nss:location}/lib -Wl,-rpath=${nss:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib

component/dropbear/buildout.cfg

@@ -28,7 +28,9 @@ download-only = true
 [dropbear]
 recipe = hexagonit.recipe.cmmi
 md5sum = 0284ea239083f04c8b874e08e1aca243
-url = http://matt.ucc.asn.au/dropbear/dropbear-0.53.1.tar.bz2
+# XXX: We still use an old version of dropbear instead of the last one
+#      in order have all patches working.
+url = http://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2
 
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}

component/erlang/buildout.cfg

+[buildout]
+parts =
+  erlang
+
+[erlang]
+recipe = hexagonit.recipe.cmmi
+url = http://www.erlang.org/download/otp_src_R14B03.tar.gz
+md5sum = 7979e662d11476b97c462feb7c132fb7

component/fonts/buildout.cfg

@@ -2,6 +2,7 @@
 parts =
   liberation-fonts
   ipaex-fonts
+  ipa-fonts
 
 [fonts]
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -16,7 +17,7 @@ url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-tt
 md5sum = 8150db1c6e27cacdfd524b563b85b69e
 destination = ${fonts:location}/${:_buildout_section_name_}
 
-# IPAex Font - Japanese fonts provided by IPA
+# IPAex and IPA Font - Japanese fonts provided by IPA
 # http://ossipedia.ipa.go.jp/ipafont/index.html
 [ipaex-fonts]
 recipe = hexagonit.recipe.download
@@ -24,3 +25,10 @@ strip-top-level-dir = true
 url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAexfont00103.zip
 md5sum = ac67b2fc3aab7f683d89f0070df284e7
 destination = ${fonts:location}/${:_buildout_section_name_}
+
+[ipa-fonts]
+recipe = hexagonit.recipe.download
+strip-top-level-dir = true
+url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAfont00303.zip
+md5sum = 39a828acf27790adbe4944dfb4d94bb1
+destination = ${fonts:location}/${:_buildout_section_name_}

component/freetype/buildout.cfg

@@ -10,8 +10,8 @@ parts =
 
 [freetype]
 recipe = hexagonit.recipe.cmmi
-url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.6.tar.bz2
-md5sum = 5e6510613f612809d2d7862592b92ab7
+url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.8.tar.bz2
+md5sum = dbf2caca1d3afd410a29217a9809d397
 configure-options =
   --disable-static
 environment =

component/gdbm/buildout.cfg

@@ -2,25 +2,18 @@
 parts =
   gdbm
 
-[gdbm-nochange-patch-download]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = fafa6cae0afbf2b5afb9ef3b8e3035a4
-download-only = true
-filename = gdbm-Makefile.in-nochange.patch
-
 [gdbm]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-1.8.3.tar.gz
-md5sum = 1d1b1d5c0245b1c00aff92da751e9aa1
-patches = ${gdbm-nochange-patch-download:location}/${gdbm-nochange-patch-download:filename}
+version = 1.9.1
+url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
+md5sum = 59f6e4c4193cb875964ffbe8aa384b58
 configure-options =
   --disable-static
 # install as parts/gdbm/include/gdbm/*.h etc. because some softwares
 # (eg. python's dbmmodule.c extension) assume the location like this.
 includedir = ${buildout:parts-directory}/${:_buildout_section_name_}/include
 make-targets =
-  install install-compat includedir=${:includedir}/gdbm && rm -f ${:includedir}/*.h && ln -sf gdbm/gdbm.h ${:includedir}/gdbm.h
+  install includedir=${:includedir}/gdbm && rm -f ${:includedir}/*.h && ln -sf gdbm/gdbm.h ${:includedir}/gdbm.h
 # it seems that parallel build sometimes fails for gdbm.
 make-options =
   -j1

component/ghostscript/buildout.cfg

@@ -7,16 +7,8 @@ extends =
 
 parts = ghostscript
 
-[ghostscript-hooks-download]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-filename = ghostscript-hooks.py
-md5sum = 731475648c91507bd1dfe2a61ee84552
-download-only = true
-
 [ghostscript-common]
 recipe = hexagonit.recipe.cmmi
-pre-configure-hook = ${ghostscript-hooks-download:location}/${ghostscript-hooks-download:filename}:pre_configure_hook
 configure-options =
   --disable-cups
   --disable-cairo
@@ -32,17 +24,9 @@ environment =
   LD_LIBRARY_PATH=${fontconfig:location}/lib
 
 [ghostscript]
-# we prefer ghostscript-8 for now, because ghostscript-9.00 seems to have a
-# problem with Japanese fonts if -dTextAlphaBits=4 is specified by
-# imagemagick.
-<= ghostscript-8
+<= ghostscript-9
 
 [ghostscript-9]
 <= ghostscript-common
-url = http://ghostscript.com/releases/ghostscript-9.00.tar.gz
-md5sum = a402462478b4cdda3e1816899227b845
-
-[ghostscript-8]
-<= ghostscript-common
-url = http://www.nexedi.org/static/tarballs/ghostscript/ghostscript-8.71-no-looping-symlink.tar.bz2
-md5sum = 34639af3ffe8594f2c5ea944dfbe1d78
+url = http://downloads.ghostscript.com/public/ghostscript-9.04.tar.bz2
+md5sum = 9f6899e821ab6d78ab2c856f10fa3023

component/ghostscript/ghostscript-hooks.py

-import os
-def pre_configure_hook(oprtions, buildout):
-  # fixes python bug related to not creating symlink contained in tarfiles
-  for missing in 'configure.ac', 'Makefile.in':
-    if not os.path.exists(os.path.join(os.path.curdir, missing)):
-      os.symlink(os.path.join(os.path.curdir, 'base', missing),
-          os.path.join(os.path.curdir, missing))

component/grep/buildout.cfg

@@ -6,8 +6,8 @@ parts =
 
 [grep]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/grep/grep-2.8.tar.gz
-md5sum = cb2dfc502c5afc7a4a6e5f6cefd6850e
+url = http://ftp.gnu.org/gnu/grep/grep-2.9.tar.gz
+md5sum = 03e3451a38b0d615cb113cbeaf252dc0
 environment =
-  PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig
-  LDFLAGS =-Wl,--as-needed -Wl,-rpath=${pcre:location}/lib
+  CPPFLAGS=-I${pcre:location}/include
+  LDFLAGS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib

component/groonga/buildout.cfg

@@ -8,8 +8,8 @@ parts =
 
 [groonga]
 recipe = hexagonit.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-1.2.5.tar.gz
-md5sum = 7e608406677b7a3f91e287acc0c718c0
+url = http://packages.groonga.org/source/groonga/groonga-1.2.8.tar.gz
+md5sum = a319b1f3a55cbf250ef5255f5c51ff46
 configure-options =
   --disable-static
   --disable-glibtest

component/handlersocket/HandlerSocket-Plugin-for-MySQL-1.0.6-mariadb.patch

---- a/configure.ac
-+++ b/configure.ac
-@@ -28,7 +28,7 @@
-         MYSQL_INC="$MYSQL_INC -I$ac_mysql_source_dir/regex"
-         MYSQL_INC="$MYSQL_INC -I$ac_mysql_source_dir"
-         AC_SUBST(MYSQL_INC)
--        MYSQL_SOURCE_VERSION=`cat $ac_mysql_source_dir/configure.in | grep "\[[MySQL Server\]]" | sed -e "s|.*\([[0-9]]\+\.[[0-9]]\+\.[[0-9]]\+[[0-9a-zA-Z\_\-]]*\).*|\1|"`
-+        MYSQL_SOURCE_VERSION=`cat $ac_mysql_source_dir/configure.in | grep "\[[MariaDB Server\]]" | sed -e "s|.*\([[0-9]]\+\.[[0-9]]\+\.[[0-9]]\+[[0-9a-zA-Z\_\-]]*\).*|\1|"`
-         AC_MSG_RESULT([yes: Using $ac_mysql_source_dir, version $MYSQL_SOURCE_VERSION])
-       else
-         AC_MSG_ERROR([invalid MySQL source directory: $ac_mysql_source_dir])
---- a/handlersocket/database.cpp
-+++ b/handlersocket/database.cpp
-@@ -686,19 +686,19 @@
-   for (uint32_t i = 0; i < limit + skip; ++i) {
-     if (i == 0) {
-       const key_part_map kpm = (1U << args.kvalslen) - 1;
--      r = hnd->index_read_map(table->record[0], key_buf, kpm, find_flag);
-+      r = hnd->ha_index_read_map(table->record[0], key_buf, kpm, find_flag);
-     } else {
-       switch (find_flag) {
-       case HA_READ_BEFORE_KEY:
-       case HA_READ_KEY_OR_PREV:
--	r = hnd->index_prev(table->record[0]);
-+	r = hnd->ha_index_prev(table->record[0]);
- 	break;
-       case HA_READ_AFTER_KEY:
-       case HA_READ_KEY_OR_NEXT:
--	r = hnd->index_next(table->record[0]);
-+	r = hnd->ha_index_next(table->record[0]);
- 	break;
-       case HA_READ_KEY_EXACT:
--	r = hnd->index_next_same(table->record[0], key_buf, kplen_sum);
-+	r = hnd->ha_index_next_same(table->record[0], key_buf, kplen_sum);
- 	break;
-       default:
- 	r = HA_ERR_END_OF_FILE; /* to finish the loop */

component/handlersocket/buildout.cfg

-# Handlersocket - a NoSQL plugin for MySQL.
-# http://github.com/ahiguti/HandlerSocket-Plugin-for-MySQL
-
-[buildout]
-extends =
-  ../autoconf/buildout.cfg
-  ../automake/buildout.cfg
-  ../libtool/buildout.cfg
-  ../mariadb/buildout.cfg
-
-parts =
-  handlersocket
-
-[handlersocket-mariadb-patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 2654feea2e867c898b741ac0f0aa8e14
-filename = HandlerSocket-Plugin-for-MySQL-1.0.6-mariadb.patch
-download-only = true
-
-[handlersocket]
-recipe = hexagonit.recipe.cmmi
-url = http://github.com/ahiguti/HandlerSocket-Plugin-for-MySQL/tarball/1.0.6
-md5sum = 57f5c131e3d29701b01dd92c35ed25fd
-patch-options = -p1
-patches =
-  ${handlersocket-mariadb-patch:location}/${handlersocket-mariadb-patch:filename}
-configure-command =
-  ACLOCAL_ARGS=-I${libtool:location}/share/aclocal ./autogen.sh && ./configure
-configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-  --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
-  --with-mysql-bindir=${mariadb:location}/bin
-  --with-mysql-plugindir=${mariadb:location}/lib/mysql/plugin
-environment =
-  PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:%(PATH)s

component/imagemagick/buildout.cfg

@@ -35,8 +35,8 @@ filename = imagemagick-6.6.7-4-without-lzma.patch
 
 [imagemagick]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.2-10.tar.bz2
-md5sum = 073ec5d7f2a22db96a0e87e4322b75f9
+url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.3-1.tar.bz2
+md5sum = 89d378733d89bc61c04bc0fdc140a3a7
 configure-options =
   --disable-static
   --without-x

component/libaio/buildout.cfg

+[buildout]
+parts =
+  libaio
+
+[libaio]
+recipe = hexagonit.recipe.cmmi
+# originally located at http://www.kernel.org/pub/linux/libs/aio/
+url = http://ftp.free.fr/mirrors/ftp.debian.org/pool/main/liba/libaio/libaio_0.3.109.orig.tar.gz
+md5sum = 435a5b16ca6198eaf01155263d855756
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+configure-command = echo
+make-options = prefix=${:location}

component/libmemcached/buildout.cfg

+[buildout]
+
+parts =
+  libmemcached
+
+[libmemcached]
+<= libmemcached-0.50
+
+[libmemcached-0.50]
+<= libmemcached-common
+url = http://launchpad.net/libmemcached/1.0/0.50/+download/libmemcached-0.50.tar.gz
+md5sum = c8627014a37cd821cf93317b8de6f9f8
+
+[libmemcached-0.44]
+<= libmemcached-common
+url = http://launchpad.net/libmemcached/1.0/0.44/+download/libmemcached-0.44.tar.gz
+md5sum = e6bd825c46fa080b550f90f9001cba8c
+
+[libmemcached-common]
+recipe = hexagonit.recipe.cmmi
+configure-options =
+  --without-docs
+  --without-memcached
+  --without-libgtest-prefix
+  --without-libevent-prefix
+  --without-libinnodb-prefix
+  --without-libsasl-prefix
+  --without-libsasl2-prefix
+
+

component/libpng/buildout.cfg

@@ -15,5 +15,5 @@ environment =
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.4.tar.bz2
-md5sum = b43afe39237b69859522455b215f9e85
+url = http://download.sourceforge.net/libpng/libpng-1.5.5.tar.bz2
+md5sum = 3270bf2990c3174ae939388398de751e

component/libreoffice-bin/buildout.cfg

@@ -12,11 +12,11 @@ find-links =
 [libreoffice-bin]
 recipe = slapos.recipe.build
 # here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
-url = http://download.documentfoundation.org/libreoffice/stable/3.4.3/rpm/%s/LibO_3.4.3_Linux_%s_install-rpm_en-US.tar.gz
+url = http://download.documentfoundation.org/libreoffice/stable/3.4.4/rpm/%s/LibO_3.4.4_Linux_%s_install-rpm_en-US.tar.gz
 
 # supported architectures md5sums
-md5sum_x86 = ae1b2b387dcef513c378cc95b255affc
-md5sum_x86-64 = b2d6a902182c1af82ca088fbb665d0e3
+md5sum_x86 = 529c60e161d0c23405723f4a3cd1e046
+md5sum_x86-64 = fc6cb85312d6e11a7ab6ddb1bc4e79cc
 
 # where office code can be found?
 officedir = libreoffice3.4
@@ -37,7 +37,7 @@ script =
   rpmsdir = os.path.join(workdir, [q for q in os.listdir(workdir) if q == 'RPMS'][0])
   rpmlist = [os.path.join(rpmsdir, q) for q in os.listdir(rpmsdir) if q.endswith('.rpm') and 'javafilter' not in q and 'xsltfilter' not in q]
   [self.pipeCommand([[sys.executable, '${:rpm2cpio}', rpm], ['${:cpio}', '-idum']], cwd=storagedir) for rpm in rpmlist]
-  self.copyTree(os.path.join(storagedir, 'opt', '${:officedir}'), location, ['basis3.4', 'basis3.3', 'ure'])
+  self.copyTree(os.path.join(storagedir, 'opt', '${:officedir}'), location, ['basis3.4', 'ure'])
 
 # helper binaries
 cpio = ${cpio:location}/bin/cpio

component/libtool/buildout.cfg

@@ -3,7 +3,7 @@ parts = libtool
 
 [libtool]
 recipe = hexagonit.recipe.cmmi
-md5sum = b32b04148ecdd7344abc6fe8bd1bb021
-url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz
+md5sum = d2f3b7d4627e69e13514a40e72a24d50
+url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz
 configure-options =
   --disable-static

component/mariadb/buildout.cfg

@@ -5,6 +5,7 @@
 extends =
   ../zlib/buildout.cfg
   ../groonga/buildout.cfg
+  ../libevent/buildout.cfg
   ../ncurses/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../readline/buildout.cfg
@@ -12,11 +13,18 @@ extends =
 parts =
   mariadb
 
+[mariadb-no_test-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = d65f61829cfbcd5062f49db2b00bd6fe
+filename = mysql_create_system_tables__no_test.patch
+download-only = true
+
 [mariadb]
 recipe = hexagonit.recipe.cmmi
-version = 5.3.1-beta
-url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://mirror.layerjet.com/mariadb
-md5sum = 5b3a94de1c1fcaa193edbbc8d7f8ffe4
+version = 5.3.3-rc
+url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
+md5sum = 715c61bb101acc7d37e893f6a9de9267
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 # configure: how to avoid searching for my.cnf?
@@ -31,19 +39,29 @@ configure-options =
   --with-pic
   --with-fast-mutexes
   --with-charset=utf8
+  --with-extra-charsets=complex
   --with-collation=utf8_unicode_ci
+  --with-big-tables
+  --with-embedded-server
+  --with-plugins=max-no-ndb
+  --with-aria-tmp-tables
+  --without-plugin-innodb_plugin
   --without-readline
   --with-ssl
+  --with-libevent=${libevent:location}
   --with-zlib-dir=${zlib:location}
 
+patch-options = -p0
+patches =
+  ${mariadb-no_test-patch:location}/${mariadb-no_test-patch:filename}
 environment =
-  CPPFLAGS =-I${ncurses:location}/include -I${readline:location}/include
-  LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib
+  CPPFLAGS=-I${ncurses:location}/include -I${readline5:location}/include
+  LDFLAGS=-Wl,-rpath=${libevent:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline5:location}/lib -Wl,-rpath=${readline5:location}/lib -Wl,-rpath=${zlib:location}/lib
 
-[groonga-storage-engine-mariadb]
+[mroonga-mariadb]
 recipe = hexagonit.recipe.cmmi
-url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-0.5.tar.gz
-md5sum = 52fed75d97a91f239750a1011ea9e468
+url = https://github.com/downloads/mroonga/mroonga/mroonga-1.10.tar.gz
+md5sum = 6a712b2b20eddc65d918dabd8fba590f
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config

component/mariadb/groonga-storage-engine-1.0.1-mariadb.patch

+--- groonga-storage-engine-1.0.1/ha_mroonga.cc	2011-10-28 07:19:15.506715507 +0200
++++ groonga-storage-engine-1.0.1/ha_mroonga.cc	2011-11-02 11:37:03.095096227 +0100
+@@ -77,6 +77,9 @@
+ extern "C" {
+ #endif
+ 
++/* groonga's internal functions */
++const char *grn_obj_get_value_(grn_ctx *ctx, grn_obj *obj, grn_id id, uint32 *size);
++
+ /* global variables */
+ pthread_mutex_t mrn_db_mutex;
+ pthread_mutex_t mrn_log_mutex;
+@@ -109,7 +112,6 @@
+ static bool mrn_logfile_opened = false;
+ grn_log_level mrn_log_level_default = GRN_LOG_DEFAULT_LEVEL;
+ ulong mrn_log_level = (ulong) mrn_log_level_default;
+-char mrn_default_parser_name[MRN_MAX_KEY_SIZE];
+ char *mrn_default_parser;
+ 
+ static void mrn_logger_func(int level, const char *time, const char *title,
+@@ -228,13 +230,12 @@
+           "default parser changed from '%s' to '%s'",
+           old_value, new_value);
+   grn_ctx_fin(&ctx);
+-  strcpy(mrn_default_parser_name, new_value);
+-  mrn_default_parser = mrn_default_parser_name;
++  strncpy(mrn_default_parser, new_value, MRN_MAX_KEY_SIZE - 1);
+   DBUG_VOID_RETURN;
+ }
+ 
+ static MYSQL_SYSVAR_STR(default_parser, mrn_default_parser,
+-                        PLUGIN_VAR_RQCMDARG,
++                        PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_MEMALLOC,
+                         "default fulltext parser",
+                         NULL,
+                         mrn_default_parser_update,
+@@ -908,6 +909,15 @@
+                    field->charset());
+       break;
+     }
++  case MYSQL_TYPE_BLOB:
++    {
++      GRN_VOID_INIT(&buf);
++      uint32 len;
++      const char *val = grn_obj_get_value_(ctx, col, id, &len);
++      Field_blob *blob = (Field_blob *)field;
++      blob->set_ptr((uchar *)&len, (uchar *)val);
++      break;
++    }
+   default: //strings etc..
+     {
+       GRN_TEXT_INIT(&buf,0);
+@@ -1010,6 +1020,9 @@
+     goto error_allocated_open_tables_hash_init;
+   }
+ 
++  mrn_default_parser = (char *)my_malloc(MRN_MAX_KEY_SIZE, MYF(MY_WME));
++  strncpy(mrn_default_parser, MRN_PARSER_DEFAULT, MRN_MAX_KEY_SIZE - 1);
++
+   return 0;
+ 
+ error_allocated_open_tables_hash_init:
+@@ -4422,7 +4435,7 @@
+   DBUG_RETURN(error);
+ }
+ 
+-int ha_mroonga::wrapper_index_read_map(uchar * buf, const uchar * key,
++int ha_mroonga::wrapper_index_read_map(uchar *buf, const uchar *key,
+                                        key_part_map keypart_map,
+                                        enum ha_rkey_function find_flag)
+ {
+@@ -4442,7 +4455,11 @@
+     MRN_SET_WRAP_TABLE_KEY(this, table);
+     if (fulltext_searching)
+       set_pk_bitmap();
++#ifdef MRN_HANDLER_HAVE_HA_INDEX_READ_MAP
++    error = wrap_handler->ha_index_read_map(buf, key, keypart_map, find_flag);
++#else
+     error = wrap_handler->index_read_map(buf, key, keypart_map, find_flag);
++#endif
+     MRN_SET_BASE_SHARE_KEY(share, table->s);
+     MRN_SET_BASE_TABLE_KEY(this, table);
+   }
+@@ -4557,7 +4574,7 @@
+   DBUG_RETURN(error);
+ }
+ 
+-int ha_mroonga::index_read_map(uchar * buf, const uchar * key,
++int ha_mroonga::index_read_map(uchar *buf, const uchar *key,
+                                key_part_map keypart_map,
+                                enum ha_rkey_function find_flag)
+ {
+@@ -4572,6 +4589,7 @@
+   DBUG_RETURN(error);
+ }
+ 
++#ifdef MRN_HANDLER_HAVE_INDEX_READ_LAST_MAP
+ int ha_mroonga::wrapper_index_read_last_map(uchar *buf, const uchar *key,
+                                             key_part_map keypart_map)
+ {
+@@ -4658,6 +4676,7 @@
+   }
+   DBUG_RETURN(error);
+ }
++#endif
+ 
+ int ha_mroonga::wrapper_index_next(uchar *buf)
+ {
+@@ -6226,7 +6245,11 @@
+ }
+ 
+ ha_rows ha_mroonga::wrapper_multi_range_read_info(uint keyno, uint n_ranges,
+-                                                  uint keys, uint *bufsz,
++                                                  uint keys,
++#ifdef MRN_HANDLER_HAVE_MULTI_RANGE_READ_INFO_KEY_PARTS
++                                                  uint key_parts,
++#endif
++                                                  uint *bufsz,
+                                                   uint *flags, COST_VECT *cost)
+ {
+   MRN_DBUG_ENTER_METHOD();
+@@ -6236,6 +6259,9 @@
+   if (fulltext_searching)
+     set_pk_bitmap();
+   rows = wrap_handler->multi_range_read_info(keyno, n_ranges, keys,
++#ifdef MRN_HANDLER_HAVE_MULTI_RANGE_READ_INFO_KEY_PARTS
++                                             key_parts,
++#endif
+                                              bufsz, flags, cost);
+   MRN_SET_BASE_SHARE_KEY(share, table->s);
+   MRN_SET_BASE_TABLE_KEY(this, table);
+@@ -6243,16 +6269,26 @@
+ }
+ 
+ ha_rows ha_mroonga::storage_multi_range_read_info(uint keyno, uint n_ranges,
+-                                                  uint keys, uint *bufsz,
++                                                  uint keys,
++#ifdef MRN_HANDLER_HAVE_MULTI_RANGE_READ_INFO_KEY_PARTS
++                                                  uint key_parts,
++#endif
++                                                  uint *bufsz,
+                                                   uint *flags, COST_VECT *cost)
+ {
+   MRN_DBUG_ENTER_METHOD();
+   ha_rows rows = handler::multi_range_read_info(keyno, n_ranges, keys,
++#ifdef MRN_HANDLER_HAVE_MULTI_RANGE_READ_INFO_KEY_PARTS
++                                                key_parts,
++#endif
+                                                 bufsz, flags, cost);
+   DBUG_RETURN(rows);
+ }
+ 
+ ha_rows ha_mroonga::multi_range_read_info(uint keyno, uint n_ranges, uint keys,
++#ifdef MRN_HANDLER_HAVE_MULTI_RANGE_READ_INFO_KEY_PARTS
++                                          uint key_parts,
++#endif
+                                           uint *bufsz, uint *flags,
+                                           COST_VECT *cost)
+ {
+@@ -6261,9 +6297,15 @@
+   if (share->wrapper_mode)
+   {
+     rows = wrapper_multi_range_read_info(keyno, n_ranges, keys,
++#ifdef MRN_HANDLER_HAVE_MULTI_RANGE_READ_INFO_KEY_PARTS
++                                         key_parts,
++#endif
+                                          bufsz, flags, cost);
+   } else {
+     rows = storage_multi_range_read_info(keyno, n_ranges, keys,
++#ifdef MRN_HANDLER_HAVE_MULTI_RANGE_READ_INFO_KEY_PARTS
++                                         key_parts,
++#endif
+                                          bufsz, flags, cost);
+   }
+   DBUG_RETURN(rows);
+@@ -6315,7 +6357,7 @@
+   DBUG_RETURN(error);
+ }
+ 
+-int ha_mroonga::wrapper_multi_range_read_next(char **range_info)
++int ha_mroonga::wrapper_multi_range_read_next(range_id_t *range_info)
+ {
+   MRN_DBUG_ENTER_METHOD();
+   int error = 0;
+@@ -6329,14 +6371,14 @@
+   DBUG_RETURN(error);
+ }
+ 
+-int ha_mroonga::storage_multi_range_read_next(char **range_info)
++int ha_mroonga::storage_multi_range_read_next(range_id_t *range_info)
+ {
+   MRN_DBUG_ENTER_METHOD();
+   int error = handler::multi_range_read_next(range_info);
+   DBUG_RETURN(error);
+ }
+ 
+-int ha_mroonga::multi_range_read_next(char **range_info)
++int ha_mroonga::multi_range_read_next(range_id_t *range_info)
+ {
+   MRN_DBUG_ENTER_METHOD();
+   int error = 0;
+--- groonga-storage-engine-1.0.1/ha_mroonga.h	2011-10-27 12:31:36.859277054 +0200
++++ groonga-storage-engine-1.0.1/ha_mroonga.h	2011-11-02 11:37:03.095096227 +0100
+@@ -47,18 +47,22 @@
+ #  define MRN_HANDLER_HAVE_ADD_INDEX 1
+ #endif
+ 
+-#if (MYSQL_VERSION_ID >= 50600) || \
+-    (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50302)
+-#  define MRN_HANDLER_HAVE_HA_CLOSE 1
++#if (MYSQL_VERSION_ID >= 50603) || \
++    (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50209)
+ #  define MRN_HANDLER_HAVE_HA_RND_NEXT 1
+ #  define MRN_HANDLER_HAVE_HA_RND_POS 1
++#  define MRN_HANDLER_HAVE_HA_INDEX_READ_MAP 1
+ #  define MRN_HANDLER_HAVE_HA_INDEX_READ_IDX_MAP 1
+ #  define MRN_HANDLER_HAVE_HA_INDEX_NEXT 1
+ #  define MRN_HANDLER_HAVE_HA_INDEX_PREV 1
+ #  define MRN_HANDLER_HAVE_HA_INDEX_FIRST 1
+ #  define MRN_HANDLER_HAVE_HA_INDEX_LAST 1
+ #  define MRN_HANDLER_HAVE_HA_INDEX_NEXT_SAME 1
++#endif
+ 
++#if (MYSQL_VERSION_ID >= 50603) || \
++    (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50302)
++#  define MRN_HANDLER_HAVE_HA_CLOSE 1
+ #  define MRN_HANDLER_HAVE_MULTI_RANGE_READ 1
+ #endif
+ 
+@@ -66,6 +70,14 @@
+ #  define MRN_HANDLER_HAVE_HA_INPLACE_INDEX_CHANGE
+ #endif
+ 
++#ifndef MRN_MARIADB_P
++#  define MRN_HANDLER_HAVE_INDEX_READ_LAST_MAP
++#endif
++
++#if (defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 50302)
++#  define MRN_HANDLER_HAVE_MULTI_RANGE_READ_INFO_KEY_PARTS
++#endif
++
+ #if MYSQL_VERSION_ID < 50600
+   typedef Item COND;
+ #endif
+@@ -74,6 +86,10 @@
+   typedef MYSQL_ERROR Sql_condition;
+ #endif
+ 
++#ifndef MRN_MARIADB_P
++  typedef char *range_id_t;
++#endif
++
+ class ha_mroonga;
+ 
+ /* structs */
+@@ -213,11 +229,15 @@
+   ha_rows records_in_range(uint inx, key_range *min_key, key_range *max_key);
+   int index_init(uint idx, bool sorted);
+   int index_end();
++#ifndef MRN_HANDLER_HAVE_HA_INDEX_READ_MAP
+   int index_read_map(uchar * buf, const uchar * key,
+                      key_part_map keypart_map,
+                      enum ha_rkey_function find_flag);
++#endif
++#ifdef MRN_HANDLER_HAVE_INDEX_READ_LAST_MAP
+   int index_read_last_map(uchar *buf, const uchar *key,
+                           key_part_map keypart_map);
++#endif
+ #ifndef MRN_HANDLER_HAVE_HA_INDEX_NEXT
+   int index_next(uchar *buf);
+ #endif
+@@ -261,11 +281,14 @@
+                                       uint n_ranges, uint *bufsz,
+                                       uint *flags, COST_VECT *cost);
+   ha_rows multi_range_read_info(uint keyno, uint n_ranges, uint keys,
++#ifdef MRN_HANDLER_HAVE_MULTI_RANGE_READ_INFO_KEY_PARTS
++                                uint key_parts,
++#endif
+                                 uint *bufsz, uint *flags, COST_VECT *cost);
+   int multi_range_read_init(RANGE_SEQ_IF *seq, void *seq_init_param,
+                             uint n_ranges, uint mode,
+                             HANDLER_BUFFER *buf);
+-  int multi_range_read_next(char **range_info);
++  int multi_range_read_next(range_id_t *range_info);
+ #else // MRN_HANDLER_HAVE_MULTI_RANGE_READ
+   int read_multi_range_first(KEY_MULTI_RANGE **found_range_p,
+                              KEY_MULTI_RANGE *ranges,
+@@ -321,6 +344,11 @@
+ #ifdef MRN_HANDLER_HAVE_HA_RND_POS
+   int rnd_pos(uchar *buf, uchar *pos);
+ #endif
++#ifdef MRN_HANDLER_HAVE_HA_INDEX_READ_MAP
++  int index_read_map(uchar *buf, const uchar *key,
++                     key_part_map keypart_map,
++                     enum ha_rkey_function find_flag);
++#endif
+ #ifdef MRN_HANDLER_HAVE_HA_INDEX_NEXT
+   int index_next(uchar *buf);
+ #endif
+@@ -469,10 +497,12 @@
+   int storage_index_read_map(uchar *buf, const uchar *key,
+                              key_part_map keypart_map,
+                              enum ha_rkey_function find_flag);
++#ifdef MRN_HANDLER_HAVE_INDEX_READ_LAST_MAP
+   int wrapper_index_read_last_map(uchar *buf, const uchar *key,
+                                   key_part_map keypart_map);
+   int storage_index_read_last_map(uchar *buf, const uchar *key,
+                                   key_part_map keypart_map);
++#endif
+   int wrapper_index_next(uchar *buf);
+   int storage_index_next(uchar *buf);
+   int wrapper_index_prev(uchar *buf);
+@@ -533,9 +563,15 @@
+                                               uint *flags,
+                                               COST_VECT *cost);
+   ha_rows wrapper_multi_range_read_info(uint keyno, uint n_ranges, uint keys,
++#ifdef MRN_HANDLER_HAVE_MULTI_RANGE_READ_INFO_KEY_PARTS
++                                        uint key_parts,
++#endif
+                                         uint *bufsz, uint *flags,
+                                         COST_VECT *cost);
+   ha_rows storage_multi_range_read_info(uint keyno, uint n_ranges, uint keys,
++#ifdef MRN_HANDLER_HAVE_MULTI_RANGE_READ_INFO_KEY_PARTS
++                                        uint key_parts,
++#endif
+                                         uint *bufsz, uint *flags,
+                                         COST_VECT *cost);
+   int wrapper_multi_range_read_init(RANGE_SEQ_IF *seq, void *seq_init_param,
+@@ -544,8 +580,8 @@
+   int storage_multi_range_read_init(RANGE_SEQ_IF *seq, void *seq_init_param,
+                                     uint n_ranges, uint mode,
+                                     HANDLER_BUFFER *buf);
+-  int wrapper_multi_range_read_next(char **range_info);
+-  int storage_multi_range_read_next(char **range_info);
++  int wrapper_multi_range_read_next(range_id_t *range_info);
++  int storage_multi_range_read_next(range_id_t *range_info);
+ #else // MRN_HANDLER_HAVE_MULTI_RANGE_READ
+   int wrapper_read_multi_range_first(KEY_MULTI_RANGE **found_range_p,
+                                      KEY_MULTI_RANGE *ranges,
+--- groonga-storage-engine-1.0.1/test/run-sql-test.sh	2011-09-27 10:43:29.093290682 +0200
++++ groonga-storage-engine-1.0.1/test/run-sql-test.sh	2011-11-02 11:37:03.099096256 +0100
+@@ -24,12 +24,20 @@
+ source_test_suites_dir="${source_mysql_test_dir}/suite"
+ build_test_suites_dir="${build_mysql_test_dir}/suite"
+ case "${MYSQL_VERSION}" in
+-    5.1)
++    5.1.*)
+ 	plugins_dir="${MYSQL_BUILD}/lib/mysql/plugin"
+ 	if ! test -d "${build_test_suites_dir}"; then
+ 	    mkdir -p "${build_test_suites_dir}"
+ 	fi
+ 	;;
++    *-MariaDB*)
++	if ! test -d "${build_test_suites_dir}"; then
++	    ln -s "${source_test_suites_dir}" "${build_test_suites_dir}"
++	fi
++	if ! test -d "${MYSQL_BUILD}/plugin/mroonga"; then
++	    ln -s "${top_dir}" "${MYSQL_BUILD}/plugin/mroonga"
++	fi
++	;;
+     *)
+ 	if ! test -d "${build_test_suites_dir}"; then
+ 	    ln -s "${source_test_suites_dir}" "${build_test_suites_dir}"
+@@ -47,10 +55,14 @@
+     fi
+ done
+ 
+-make -C ${top_dir} \
+-    install-pluginLTLIBRARIES \
+-    plugindir=${plugins_dir} > /dev/null || \
+-    exit 1
++if test -n "${plugins_dir}"; then
++    make -C ${top_dir} \
++	install-pluginLTLIBRARIES \
++	plugindir=${plugins_dir} > /dev/null || \
++	exit 1
++else
++    make -C ${top_dir} > /dev/null || exit 1
++fi
+ 
+ (cd "$build_mysql_test_dir" && \
+     ./mysql-test-run.pl \

component/mariadb/mysql_create_system_tables__no_test.patch

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

component/membase/buildout.cfg

+[buildout]
+extends =
+  ../curl/buildout.cfg
+  ../libevent/buildout.cfg
+  ../erlang/buildout.cfg
+
+parts =
+  membase-source
+  membase-memcached
+  membase-libmemcached
+  membase-libconflate
+  membase-libvbucket
+  membase-moxi
+  membase-bucket_engine
+  membase-ep-engine
+  membase-membase-cli
+  membase-memcachetest
+  membase-ns_server
+  membase-vbucketmigrator
+
+[membase]
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[membase-source]
+<= membase-1.7.0-source
+
+[membase-1.7.0-source]
+<= membase-source-common
+url = http://files.couchbase.com/source/membase-server_src-1.7.0.tar.gz
+md5sum = c933fffea299d00e43b002cb65738663
+
+[membase-source-common]
+recipe = hexagonit.recipe.download
+strip-top-level-dir = true
+
+[membase-component-common]
+recipe = hexagonit.recipe.cmmi
+path = ${membase-source:location}/${:component}
+prefix = ${membase:location}
+configure-options =
+  --prefix=${:prefix}
+  ${:component-configure-options}
+
+[membase-libmemcached]
+<= membase-component-common
+component = libmemcached
+component-configure-options =
+  --disable-static
+  --enable-shared
+  --disable-dtrace
+  --without-docs
+  --disable-sasl
+  --with-memcached=${membase:location}/bin/memcached
+
+[membase-memcached]
+<= membase-component-common
+component = memcached
+patches =
+configure-command =
+  ./configure
+component-configure-options =
+  --enable-isasl
+
+[membase-libconflate]
+<= membase-component-common
+component = libconflate
+component-configure-options =
+  --disable-static
+  --enable-shared
+  --without-check
+  --with-libcurl-prefix=${curl:location}
+
+[membase-libvbucket]
+<= membase-component-common
+component = libvbucket
+component-configure-options =
+  --disable-static
+  --enable-shared
+  --without-docs
+  --with-libhashkit-prefix=${membase:location}
+
+[membase-moxi]
+<= membase-component-common
+component = moxi
+component-configure-options =
+  --enable-moxi-libvbucket
+  --enable-moxi-libmemcached
+  --without-check
+  --with-libevent-prefix=${libevent:location}
+  --with-libmemcached-prefix=${membase:location}
+  --with-memcached=${membase:location}/bin/memcached
+  --with-libhashkit-prefix=${membase:location}
+  --with-libconflate-prefix=${membase:location}
+  --with-libvbucket-prefix=${membase:location}
+
+[membase-bucket_engine]
+<= membase-component-common
+component = bucket_engine
+component-configure-options =
+  --with-memcached=${membase-source:location}/memcached
+
+[membase-ep-engine]
+<= membase-component-common
+component = ep-engine
+component-configure-options =
+  --with-memcached=${membase-source:location}/memcached
+
+[membase-membase-cli]
+<= membase-component-common
+component = membase-cli
+patches =
+configure-command =
+  ./configure
+component-configure-options =
+
+[membase-memcachetest]
+<= membase-component-common
+component = memcachetest
+component-configure-options =
+  --with-memcached=${membase:location}/bin/memcached
+
+[membase-ns_server]
+<= membase-component-common
+component = ns_server
+patches =
+configure-command =
+  ./configure
+component-configure-options =
+environment =
+  PATH=${erlang:location}/bin:%(PATH)s
+
+[membase-vbucketmigrator]
+<= membase-component-common
+component = vbucketmigrator
+component-configure-options =
+  --without-sasl
+  --with-isasl
+

component/memcached/buildout.cfg

 [buildout]
 parts = memcached
-extends = ../libevent/buildout.cfg
-
-[memcached-strict-aliasing-patch]
-# on some platforms original memcached refuses to build:
-#  * http://code.google.com/p/memcached/issues/detail?id=60
-#  * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565033
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = c03b3bfc237b77667b0e90442b0980e8
-download-only = true
-filename = memcached-fix-strict-aliasing.patch
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../libevent/buildout.cfg
 
 [memcached-fix-array-subscript-is-above-array-bounds]
 recipe = hexagonit.recipe.download
@@ -19,45 +12,30 @@ filename = memcached-1.4-fix-array-subscript-is-above-array-bounds.patch
 download-only = true
 md5sum = 472508b9a4b6c0b9f5d6f2abce3444e3
 
-[memcached-gcc4.6.patch]
+[memcached-gcc-4.4.patch]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
-filename = memcached-gcc4.6.patch
+filename = memcached-gcc-4.4.patch
 download-only = true
-md5sum = 3418477f64500cd2a8dce046f5d72fec
+md5sum = fd98d0cbfc4d3a25ac9808472fbe62f8
 
 [memcached]
-<= memcached-1.4.6
-
-[memcached-1.4.6]
-<= memcached-common
-url = http://memcached.googlecode.com/files/memcached-1.4.6.tar.gz
-md5sum = 243e5d82de27e6e45caf0ebfd400e41a
-patches =
-  ${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename}
-
-[memcached-1.4.5]
-<= memcached-common
-url = http://memcached.googlecode.com/files/memcached-1.4.5.tar.gz
-md5sum = 583441a25f937360624024f2881e5ea8
-patches =
-  ${memcached-strict-aliasing-patch:location}/${memcached-strict-aliasing-patch:filename}
-  ${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename}
-  ${memcached-gcc4.6.patch:location}/${memcached-gcc4.6.patch:filename}
-
-[memcached-1.4.4]
-<= memcached-common
-url = http://memcached.googlecode.com/files/memcached-1.4.4.tar.gz
-md5sum = 5ca5b24de347e97ac1f48f3785b4178a
-patches =
-  ${memcached-strict-aliasing-patch:location}/${memcached-strict-aliasing-patch:filename}
-  ${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename}
-  ${memcached-gcc4.6.patch:location}/${memcached-gcc4.6.patch:filename}
-
-[memcached-common]
 recipe = hexagonit.recipe.cmmi
+url = http://memcached.googlecode.com/files/memcached-1.4.8.tar.gz
+md5sum = b7104e269511621c2777367d6d6315fe
+patches =
+  ${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename} ${memcached-gcc-4.4.patch:location}/${memcached-gcc-4.4.patch:filename}
+patch-options = -p1
+configure-command =
+  aclocal-1.11
+  autoheader
+  automake-1.11 --foreign
+  autoconf
+  ./configure
 configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-libevent=${libevent:location}
-patch-options = -p1
+  --disable-docs
 environment =
-    LDFLAGS =-Wl,-rpath=${libevent:location}/lib
+  PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:%(PATH)s
+  LDFLAGS =-Wl,-rpath=${libevent:location}/lib

component/memcached/memcached-fix-strict-aliasing.patch

-diff -rdBu memcached-1.4.0-rc1/memcached.h memcached-1.4.0-my/memcached.h
---- memcached-1.4.0-rc1/memcached.h	2009-05-29 00:51:56.000000000 +0400
-+++ memcached-1.4.0-my/memcached.h	2009-06-07 22:32:52.000000000 +0400
-@@ -75,21 +75,21 @@
- 
- /* warning: don't use these macros with a function, as it evals its arg twice */
- #define ITEM_get_cas(i) ((uint64_t)(((i)->it_flags & ITEM_CAS) ? \
--                                    *(uint64_t*)&((i)->end[0]) : 0x0))
-+                                    *(uint64_t*)((char*)(i) + sizeof(*i)) : 0x0))
- #define ITEM_set_cas(i,v) { if ((i)->it_flags & ITEM_CAS) { \
--                          *(uint64_t*)&((i)->end[0]) = v; } }
-+                          *(uint64_t*)((char*)(i) + sizeof(*i)) = v; } }
- 
--#define ITEM_key(item) (((char*)&((item)->end[0])) \
-+#define ITEM_key(item) ((char*)(item) + sizeof(*item) \
-          + (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
- 
--#define ITEM_suffix(item) ((char*) &((item)->end[0]) + (item)->nkey + 1 \
-+#define ITEM_suffix(item) ((char*)(item) + sizeof(*item) + (item)->nkey + 1 \
-          + (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
- 
--#define ITEM_data(item) ((char*) &((item)->end[0]) + (item)->nkey + 1 \
-+#define ITEM_data(item) ((char*)(item) + sizeof(*item) + (item)->nkey + 1 \
-          + (item)->nsuffix \
-          + (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
- 
--#define ITEM_ntotal(item) (sizeof(struct _stritem) + (item)->nkey + 1 \
-+#define ITEM_ntotal(item) (sizeof(*item) + (item)->nkey + 1 \
-          + (item)->nsuffix + (item)->nbytes \
-          + (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
- 
-@@ -285,7 +285,6 @@
-     uint8_t         it_flags;   /* ITEM_* above */
-     uint8_t         slabs_clsid;/* which slab class we're in */
-     uint8_t         nkey;       /* key length, w/terminating null and padding */
--    void * end[];
-     /* if it_flags & ITEM_CAS we have 8 bytes CAS */
-     /* then null-terminated key */
-     /* then " flags length\r\n" (no terminating null) */
-

component/memcached/memcached-gcc-4.4.patch

+# In OpenSuse 11.2, 'gcc -dumpversion' returns '4.4', not '4.4.*'.
+--- memcached-1.4.8/configure.ac.orig
++++ memcached-1.4.8/configure.ac
+@@ -502,7 +502,7 @@
+   GCC_VERSION=`$CC -dumpversion`
+   CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
+   case $GCC_VERSION in
+-    4.4.*)
++    4.4 | 4.4.*)
+     CFLAGS="$CFLAGS -fno-strict-aliasing"
+     ;;
+   esac

component/memcached/memcached-gcc4.6.patch

-diff --git a/items.c b/items.c
-index e7f01ea..9fc6704 100644
---- a/items.c
-+++ b/items.c
-@@ -450,9 +450,7 @@ void do_item_stats_sizes(ADD_STAT add_stats, void *c) {
-         for (i = 0; i < num_buckets; i++) {
-             if (histogram[i] != 0) {
-                 char key[8];
--                int klen = 0;
--                klen = snprintf(key, sizeof(key), "%d", i * 32);
--                assert(klen < sizeof(key));
-+                assert(snprintf(key, sizeof(key), "%d", i * 32) < sizeof(key));
-                 APPEND_STAT(key, "%u", histogram[i]);
-             }
-         }
-diff --git a/memcached.c b/memcached.c
-index 750c8b3..0913b77 100644
---- a/memcached.c
-+++ b/memcached.c
-@@ -4627,8 +4627,6 @@ int main (int argc, char **argv) {
- 
-     /* create the listening socket, bind it, and init */
-     if (settings.socketpath == NULL) {
--        int udp_port;
--
-         const char *portnumber_filename = getenv("MEMCACHED_PORT_FILENAME");
-         char temp_portnumber_filename[PATH_MAX];
-         FILE *portnumber_file = NULL;
-@@ -4658,7 +4656,6 @@ int main (int argc, char **argv) {
-          * then daemonise if needed, then init libevent (in some cases
-          * descriptors created by libevent wouldn't survive forking).
-          */
--        udp_port = settings.udpport ? settings.udpport : settings.port;
- 
-         /* create the UDP listening socket and bind it */
-         errno = 0;

component/memstrike/buildout.cfg

+[buildout]
+extends =
+  ../libmemcached/buildout.cfg
+  ../git/buildout.cfg
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+
+parts =
+  memstrike
+
+[memstrike]
+recipe = hexagonit.recipe.cmmi
+path = ${memstrikesource:location}
+configure-command =
+  ./bootstrap
+  ./configure
+configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --with-libmemcached=${libmemcached:location}
+environment =
+  PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:%(PATH)s
+  LDFLAGS =-Wl,-rpath=${libmemcached:location}/lib
+
+[memstrikesource]
+recipe=plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_} 
+stop-on-error = true
+revision = 39d7a99e8bb7eea6df8b
+command =
+  rm -rf ${:location} &&
+  ${git:location}/bin/git clone --quiet git://github.com/frsyuki/memstrike.git ${:location} &&
+  cd ${:location} &&
+  ${git:location}/bin/git checkout --quiet ${:revision}

component/mysql-5.1/buildout.cfg

@@ -21,6 +21,13 @@ md5sum = eefcd08c400c58d3e89542ab482a8429
 filename = mysql-5.1-sphinx-2.0.1-beta.diff
 download-only = true
 
+[mysql-5.1-no_test-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 22b0ef8baec5efc182e10d233c6f14ca
+filename = mysql_create_system_tables__no_test.patch
+download-only = true
+
 [mysql-5.1]
 recipe = hexagonit.recipe.cmmi
 version = 5.1.58
@@ -60,6 +67,7 @@ make-options =
 patch-options = -p0
 patches =
   ${mysql-5.1-sphinx-patch:location}/${mysql-5.1-sphinx-patch:filename}
+  ${mysql-5.1-no_test-patch:location}/${mysql-5.1-no_test-patch:filename}
 environment =
   PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
   CPPFLAGS =-I${ncurses:location}/include -I${readline:location}/include
@@ -67,8 +75,8 @@ environment =
 
 [groonga-storage-engine-mysql-5.1]
 recipe = hexagonit.recipe.cmmi
-url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-0.9.tar.gz
-md5sum = 78fe07122dc376796a5aede476f50cfd
+url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-1.0.0.tar.gz
+md5sum = 289b8b7919e790599ea79b6fe9270e04
 configure-options =
   --with-mysql-source=${mysql-5.1:location}__compile__/mysql-${mysql-5.1:version}
   --with-mysql-config=${mysql-5.1:location}/bin/mysql_config

component/mysql-5.1/mysql_create_system_tables__no_test.patch

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

component/mysql-5.5/buildout.cfg

+[buildout]
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../bison/buildout.cfg
+  ../cmake/buildout.cfg
+  ../groonga/buildout.cfg
+  ../libaio/buildout.cfg
+  ../libtool/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../zlib/buildout.cfg
+
+parts =
+    mysql-5.5
+
+[mysql-5.5-sphinx-patch]
+# this patch comes from sphinx-2.0.1-beta including changes for
+# MySQL-5.5 in
+# http://code.google.com/p/sphinxsearch/source/detail?r=2921
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 04549822ebfa91b5f84025ff49ef24c2
+filename = mysql-5.5-sphinx-2.0.1-beta.diff
+download-only = true
+
+[mysql-5.5-no_test-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = bb7ee34b9a98da1f913566c63ffbc6f5
+filename = mysql_create_system_tables__no_test.patch
+download-only = true
+
+[mysql-5.5]
+recipe = hexagonit.recipe.cmmi
+version = 5.5.16
+url = http://mysql.he.net/Downloads/MySQL-5.5/mysql-${:version}.tar.gz
+md5sum = 462ab3752dd666ec06ca32f92673b59e
+# compile directory is required to build mysql plugins.
+keep-compile-dir = true
+patch-options = -p0
+patches =
+  ${mysql-5.5-sphinx-patch:location}/${mysql-5.5-sphinx-patch:filename}
+  ${mysql-5.5-no_test-patch:location}/${mysql-5.5-no_test-patch:filename}
+configure-command = ${cmake:location}/bin/cmake
+# we use embeded yassl instead of openssl to avoid compilation errors on sphinx search engine.
+configure-options =
+  -DCMAKE_INSTALL_PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+  -DBUILD_CONFIG=mysql_release
+  -DDEFAULT_CHARSET=utf8
+  -DDEFAULT_COLLATION=utf8_unicode_ci
+  -DWITH_SSL=bundled
+  -DWITH_ZLIB=system
+  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
+  -DWITHOUT_DAEMON_EXAMPLE=1
+  -DWITH_SPHINX_STORAGE_ENGINE=1
+  -DCMAKE_C_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${zlib:location}/include"
+  -DCMAKE_INSTALL_RPATH=${libaio:location}/lib:${ncurses:location}/lib:${zlib:location}/lib
+environment =
+  CMAKE_PROGRAM_PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:${cmake:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin
+  CMAKE_INCLUDE_PATH=${libaio:location}/include:${ncurses:location}/include:${zlib:location}/include
+  CMAKE_LIBRARY_PATH=${libaio:location}/lib:${ncurses:location}/lib:${zlib:location}/lib
+  LDFLAGS=-L${libaio:location}/lib
+
+[groonga-storage-engine-mysql-5.5]
+recipe = hexagonit.recipe.cmmi
+url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-1.0.0.tar.gz
+md5sum = 289b8b7919e790599ea79b6fe9270e04
+configure-options =
+  --with-mysql-source=${mysql-5.5:location}__compile__/mysql-${mysql-5.5:version}
+  --with-mysql-config=${mysql-5.5:location}/bin/mysql_config
+environment =
+  PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  CPPFLAGS=-I${groonga:location}/include/groonga
+  LDFLAGS=-L${groonga:location}/lib
+  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig

component/mysql-5.5/mysql_create_system_tables__no_test.patch

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

component/ncurses/buildout.cfg

@@ -15,10 +15,9 @@ configure-options =
   --enable-rpath
 # tricky way to rerun with --enable-widec
 make-targets =
-  install && (for i in curses unctrl eti form menu panel term; do ln -sf ncurses/$i.h ${buildout:parts-directory}/${:_buildout_section_name_}/include/$i.h; done) && ./configure ${:configure-options} --enable-widec && make install
+  install && (for i in curses unctrl eti form menu panel term; do ln -sf ncurses/$i.h ${buildout:parts-directory}/${:_buildout_section_name_}/include/$i.h; done; ln -sf libncurses.so ${buildout:parts-directory}/${:_buildout_section_name_}/lib/libcurses.so) && ./configure ${:configure-options} --enable-widec && make ${:make-options} install
 # pass dummy LDCONFIG to skip needless calling of ldconfig by non-root user
 environment =
-  LDFLAGS =-Wl,--as-needed
   LDCONFIG=/bin/echo
 make-options =
   -j1

component/nspr/buildout.cfg

+[buildout]
+parts = nspr
+
+[nspr-pkgconfig-patch-download]
+recipe = hexagonit.recipe.download
+filename = nspr-4.8.6-pkgconfig-1.patch
+url = http://www.linuxfromscratch.org/patches/blfs/svn/${:filename}
+md5sum = 7c00beff0475314f59214842509e407f
+download-only = true
+
+[nspr]
+recipe = hexagonit.recipe.cmmi
+url = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.7/src/nspr-4.8.7.tar.gz 
+md5sum = 97e30989a56ab813453b71261849c200 
+patches = ${nspr-pkgconfig-patch-download:location}/${nspr-pkgconfig-patch-download:filename}
+patch-options = -p1
+configure-command =
+  cd mozilla/nsprpub
+  ./configure
+configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --with-mozilla
+  --enable-64bit
+make-options =
+  -C mozilla/nsprpub

component/nss/buildout.cfg

+[buildout]
+extends =
+  https://svn.erp5.org/repos/public/erp5/trunk/buildout/software-profiles/zlib.cfg
+  nspr.cfg
+  sed.cfg
+parts =
+  nss
+
+[nss-patch]
+recipe = hexagonit.recipe.download
+filename = nss-3.12.9-with-nspr-4.8.7-1.patch
+url = http://www.linuxfromscratch.org/patches/blfs/svn/nss-3.12.8-standalone-1.patch
+md5sum = ee7b5966961bef16ca896435e78652d3
+download-only = true
+
+[nss-download]
+recipe = hexagonit.recipe.download
+url = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_9_RTM/src/nss-3.12.9.tar.gz
+md5sum = bd32f183ca28440c1744650be31a9ccc
+strip-top-level-dir = true
+
+[nss]
+recipe = plone.recipe.command
+source = ${nss-download:location}
+destination = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+compile-location = ${buildout:parts-directory}/${:_buildout_section_name_}_compile_
+stop-on-error = true
+command =
+  rm -rf ${:destination} &&
+  mkdir -p ${:destination} &&
+  rm -rf ${:compile-location} &&
+  cp -R ${:source} ${:compile-location} &&
+  cd ${:compile-location} &&
+  patch -Np1 -i ${nss-patch:location}/${nss-patch:filename} &&
+  ${sed:location}/bin/sed -i "s/ZLIB_LIBS = -lz//g" ${:compile-location}/mozilla/security/coreconf/Linux.mk &&
+  ${sed:location}/bin/sed -i "s/# INCLUDES += -I\/usr\/include -Y\/usr\/include\/linux/INCLUDES += \$(ZLIB_INCLUDE_DIR)/g" ${:compile-location}/mozilla/security/coreconf/Linux.mk &&
+  gmake -C mozilla/security/nss \
+        USE_64=1 \
+        BUILD_OPT=1 \
+        ZLIB_INCLUDE_DIR=-I${zlib:location}/include \
+        ZLIB_LIBS="-lz -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib" \
+        NSPR_INCLUDE_DIR=${nspr:location}/include/nspr \
+        NSPR_LIB_DIR="${nspr:location}/lib -Wl,-rpath=${nspr:location}/lib" \
+        NSSUTIL_LIB_DIR="${:location}/lib -Wl,-rpath=${:location}/lib" \
+        nss_build_all &&
+  mkdir -p ${:destination}/bin &&
+  mkdir -p ${:destination}/include/nss3 &&
+  mkdir -p ${:destination}/lib/pkgconfig &&
+  install -v -m755 ${:compile-location}/mozilla/dist/*.OBJ/lib/*.so ${:destination}/lib &&
+  install -v -m644 ${:compile-location}/mozilla/dist/*.OBJ/lib/{*.chk,libcrmf.a} ${:destination}/lib &&
+  install -v -m755 -d ${:destination}/include/nss &&
+  install -v -m755 ${:compile-location}/mozilla/dist/*.OBJ/bin/{certutil,nss-config,pk12util} ${:destination}/bin &&
+  install -v -m644 ${:compile-location}/mozilla/dist/*.OBJ/lib/pkgconfig/nss.pc ${:destination}/lib/pkgconfig &&
+  cp -v -RL ${:compile-location}/mozilla/dist/{public,private}/nss/* ${:destination}/include/nss &&
+  chmod 644 ${:destination}/include/nss/* &&
+  cd ${buildout:parts-directory} &&
+  rm -rf ${:compile-location}
+
+[nss-cmmi]
+recipe = hexagonit.recipe.cmmi
+path = ${nss-download:location}/mozilla/security/nss
+configure-command = echo "No need to configure"
+make-binary = gmake
+make-options = USE_64=1
+make-targets = nss_build_all
+

component/openldap/buildout.cfg

@@ -7,8 +7,8 @@ extends =
 
 [openldap]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.25.tgz
-md5sum = ec63f9c2add59f323a0459128846905b
+url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.26.tgz
+md5sum = f36f3086031dd56ae94f722ffae8df5e
 configure-options =
   --disable-static
   --disable-slapd

component/pcre/buildout.cfg

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

component/maatkit/buildout.cfg → component/percona-toolkit/buildout.cfg

@@ -2,17 +2,15 @@
 extends =
   ../perl/buildout.cfg
   ../perl-DBI/buildout.cfg
-  ../perl-DBD-MySQL/buildout.cfg
+  ../perl-DBD-mariadb/buildout.cfg
 parts =
-  maatkit
+  percona-toolkit
 
-[maatkit]
+[percona-toolkit]
 recipe = hexagonit.recipe.cmmi
 depends =
   ${perl:version}
-  ${perl-DBI:version}
-  ${perl-DBD-MySQL:version}
-url = http://maatkit.googlecode.com/files/maatkit-7540.tar.gz
-md5sum = 55457f98500b096a6bf549356d3445fe
+url = http://www.percona.com/redir/downloads/percona-toolkit/percona-toolkit-1.0.1.tar.gz
+md5sum = 1d843b1b3ebd2eacfa3bf95ef2a00557
 configure-command =
   ${perl:location}/bin/perl Makefile.PL

component/perl-DBD-MySQL/buildout.cfg

 [buildout]
 extends =
-  ../perl/buildout.cfg
-  ../perl-DBI/buildout.cfg
   ../mysql-tritonn-5.0/buildout.cfg
-  ../zlib/buildout.cfg
-  ../openssl/buildout.cfg
+  ../perl-DBD-common/buildout.cfg
+
 parts =
   perl-DBD-MySQL
 
-[perl-DBD-MySQL-patch]
-recipe = hexagonit.recipe.download
-md5sum = e12e9233f20b0370cfcf5228ea767fbc
-url = ${:_profile_base_location_}/${:filename}
-filename = DBD-mysql-4.019.rpathsupport.patch
-download-only = true
-
 [perl-DBD-MySQL]
 recipe = hexagonit.recipe.cmmi
 version = 4.019

component/perl-DBD-common/buildout.cfg

+# Please use perl-DBD-MySQL or perl-DBD-mariadb
+[buildout]
+extends =
+  ../perl/buildout.cfg
+  ../perl-DBI/buildout.cfg
+  ../zlib/buildout.cfg
+  ../openssl/buildout.cfg
+
+[perl-DBD-MySQL-patch]
+recipe = hexagonit.recipe.download
+md5sum = e12e9233f20b0370cfcf5228ea767fbc
+url = ${:_profile_base_location_}/${:filename}
+filename = DBD-mysql-4.019.rpathsupport.patch
+download-only = true
+
+

component/perl-DBD-mariadb/buildout.cfg

+[buildout]
+extends =
+  ../mariadb/buildout.cfg
+  ../perl-DBD-common/buildout.cfg
+
+parts =
+  perl-DBD-mariadb
+
+[perl-DBD-mariadb]
+recipe = hexagonit.recipe.cmmi
+version = 4.019
+depends =
+  ${perl:version}
+  ${perl-DBI:version}
+url = http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.019.tar.gz
+md5sum = 566d98ab8ffac9626a31f6f6d455558e
+patches =
+  ${perl-DBD-MySQL-patch:location}/${perl-DBD-MySQL-patch:filename}
+patch-options = -p1
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL --mysql_config=${mariadb:location}/bin/mysql_config
+environment =
+  OTHERLDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib/mysql -Wl,-rpath=${openssl:location}/lib
\ No newline at end of file

component/perl/buildout.cfg

@@ -14,9 +14,11 @@ filename = ${:_buildout_section_name_}
 
 [perl]
 recipe = hexagonit.recipe.cmmi
-version = 5.14.1
+depends =
+  ${gdbm:version}
+version = 5.14.2
 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
-md5sum = 97cd306a2c22929cc141a09568f43bb0
+md5sum = 04a4c5d3c1f9f19d77daff8e8cd19a26
 siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
 patch-options = -p1
 patches =

component/python-2.6/buildout.cfg

@@ -24,6 +24,8 @@ filename = python-2.6.6-no_system_inc_dirs.patch
 
 [python2.6]
 recipe = hexagonit.recipe.cmmi
+depends =
+  ${gdbm:version}
 # This is actually the default setting for prefix, but we can't use it in
 # other settings in this part if we don't set it explicitly here.
 prefix = ${buildout:parts-directory}/${:_buildout_section_name_}

component/python-2.7/buildout.cfg

@@ -38,6 +38,8 @@ python = python2.7
 
 [python2.7common]
 recipe = hexagonit.recipe.cmmi
+depends =
+  ${gdbm:version}
 # This is actually the default setting for prefix, but we can't use it in
 # other settings in this part if we don't set it explicitly here.
 prefix = ${buildout:parts-directory}/${:_buildout_section_name_}

component/rdiff-backup/buildout.cfg

@@ -13,7 +13,7 @@ library-dirs =
   ${librsync:location}/lib/
 rpath =
   ${librsync:location}/lib/
-find-links = http://download.savannah.nongnu.org/releases/rdiff-backup/rdiff-backup-1.0.5.tar.gz
+find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1.0.5.tar.gz/fa2a165fa07a94be52c52e3545bc7758/rdiff-backup-1.0.5.tar.gz
 
 [rdiff-backup]
 # Scripts only generation part for rdiff-backup

component/readline/buildout.cfg

 [buildout]
 parts =
+  readline5
   readline
 extends =
   ../ncurses/buildout.cfg
 
+# readline-5.x is still used for GPL2 only softwares.
+[readline5]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz
+md5sum = e39331f32ad14009b9ff49cc10c5e751
+configure-options =
+  --enable-multibyte
+  --disable-static
+  --with-ncurses=${ncurses:location}
+environment =
+    LDFLAGS =-Wl,-rpath=${ncurses:location}/lib
+
 [readline]
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz

component/sed/buildout.cfg

@@ -6,7 +6,5 @@ parts =
 recipe = hexagonit.recipe.cmmi
 url = ftp://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz
 md5sum = f0fd4d7da574d4707e442285fd2d3b86
-configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
 environment =
   LDFLAGS =-Wl,--as-needed

component/sheepstrike/buildout.cfg

+[buildout]
+parts = sheepstrike
+
+[sheepstrike]
+recipe = hexagonit.recipe.cmmi
+url = https://gitorious.org/sheepstrike/sheepstrike/archive-tarball/0.1
+md5sum = 2c5009eb7c32d7ba5d270d0b88d7e5ab
+prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
+configure-options = --prefix=${:prefix}
+configure-command =
+  ./bootstrap
+  ./configure

component/sphinx/buildout.cfg

@@ -18,8 +18,8 @@ filename = sphinx-1.10-beta-snowball.patch
 
 [sphinx]
 recipe = hexagonit.recipe.cmmi
-url = http://sphinxsearch.com/files/sphinx-2.0.1-beta.tar.gz
-md5sum = 95c217d81d0b7a4ff73d5297318c3481
+url = http://sphinxsearch.com/files/sphinx-2.0.2-beta.tar.gz
+md5sum = fafe0f1a71d0ded32404c067eba7d0b3
 configure-options =
   --with-mysql
   --with-mysql-includes=${mariadb:location}/include/mysql

component/sqlite3/buildout.cfg

@@ -5,8 +5,8 @@ parts =
 
 [sqlite3]
 recipe = hexagonit.recipe.cmmi
-url = http://www.sqlite.org/sqlite-autoconf-3070800.tar.gz
-md5sum = 6bfb46d73caaa1bbbcd2b52184b6c542
+url = http://www.sqlite.org/sqlite-autoconf-3070900.tar.gz
+md5sum = dce303524736fe89a76b8ed29d566352
 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.46.tar.gz
-md5sum = 978030ff42f087ec26eb8a095ab69994
+url = http://mirror.bit.nl/stunnel/stunnel-4.52.tar.gz
+md5sum = f5e713dda0e8efa659f372832ecd0c2c
 pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook
 configure-options =
   --enable-ipv6

component/xtrabackup/buildout.cfg

@@ -18,7 +18,7 @@ parts =
 [xtrabackup-build-patch-download]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
-md5sum = 95b2c2ef625f88d85bf8876269a19372
+md5sum = b1536fe65e32592e4a0a14bf3b159885
 download-only = true
 filename = xtrabackup-1.6.2_build.patch
 
@@ -29,17 +29,33 @@ md5sum = d642ea7b30d1322a516fbece4ee100e0
 download-only = true
 filename = ${:_buildout_section_name_}
 
+[mysql-5.1-download]
+recipe = hexagonit.recipe.download
+version = 5.1.56
+url = http://s3.amazonaws.com/percona.com/downloads/community/mysql-${:version}.tar.gz
+md5sum = 15161d67f4830aad3a8a89e083749d49
+download-only = true
+filename = mysql-${:version}.tar.gz
+
+[libtar-download]
+recipe = hexagonit.recipe.download
+version = 1.2.11
+url = http://s3.amazonaws.com/percona.com/downloads/community/libtar-${:version}.tar.gz
+md5sum = 604238e8734ce6e25347a58c4f1a1d7e
+download-only = true
+filename = libtar-${:version}.tar.gz
+
 [xtrabackup]
 recipe = hexagonit.recipe.cmmi
-url = http://www.percona.com/redir/downloads/XtraBackup/xtrabackup-1.6.2/source/xtrabackup-1.6.2.tar.gz
-md5sum = 933243ae362156c98f1211eb87b3b4ea
+url = http://www.percona.com/downloads/XtraBackup/XtraBackup-1.6.3/source/xtrabackup-1.6.3.tar.gz
+md5sum = d0b827fd18cd76416101eb7b7c56a311
 make-binary = true
 patches =
   ${xtrabackup-build-patch-download:location}/${xtrabackup-build-patch-download:filename}
   ${allow_force_ibbackup.patch:location}/${allow_force_ibbackup.patch:filename}
 patch-options = -p1
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-configure-command = utils/build.sh innodb51_builtin ${:location} ${libtool:location}
+configure-command = ln -sf ${mysql-5.1-download:location}/${mysql-5.1-download:filename} ${libtar-download:location}/${libtar-download:filename} . && utils/build.sh innodb51_builtin ${:location} ${libtool:location}
 environment =
   CPPFLAGS =-I${zlib:location}/include -I${ncurses:location}/include -I${readline:location}/include
   LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib

component/xtrabackup/xtrabackup-1.6.2_build.patch

@@ -27,17 +27,16 @@ diff -ur xtrabackup-1.6.2.orig/utils/build.sh xtrabackup-1.6.2/utils/build.sh
      exit -1
  }
  
-@@ -79,7 +81,12 @@
+@@ -79,7 +81,11 @@
  {
      echo "Configuring the server"
      cd $server_dir
 -    BUILD/autorun.sh
-+    libtoolize -c -f
-+    aclocal -I $libtool_location/share/aclocal -I config/ac-macros
-+    autoheader
-+    automake -c -a -f
-+    autoconf
-+    touch sql/sql_yacc.yy
++    aclocal -I $libtool_location/share/aclocal -I config/ac-macros || die "Can't execute aclocal"
++    autoheader || die "Can't execute autoheader"
++    libtoolize --automake --force --copy || die "Can't execute libtoolize"
++    automake --add-missing --force  --copy || die "Can't execute automake"
++    autoconf || die "Can't execute autoconf"
      eval $configure_cmd
  
      echo "Building the server"
@@ -141,12 +140,3 @@ diff -ur xtrabackup-1.6.2.orig/utils/build.sh xtrabackup-1.6.2/utils/build.sh
  	;;
  
  "innodb55" | "5.5")
-@@ -230,7 +279,7 @@
- 
- 	build_server
- 
--	build_xtrabackup
-+	build_xtrabackup 
- 
- 	build_tar4ibd
- 	;;

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.36'
+version = '0.39-dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
@@ -46,6 +46,7 @@ setup(name=name,
           'davstorage = slapos.recipe.davstorage:Recipe',
           'duplicity = slapos.recipe.duplicity:Recipe',
           'erp5 = slapos.recipe.erp5:Recipe',
+          'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe',
           'erp5testnode = slapos.recipe.erp5testnode:Recipe',
           'helloworld = slapos.recipe.helloworld:Recipe',
           'java = slapos.recipe.java:Recipe',
@@ -77,5 +78,9 @@ setup(name=name,
           'vifib = slapos.recipe.vifib:Recipe',
           'xwiki = slapos.recipe.xwiki:Recipe',
           'zabbixagent = slapos.recipe.zabbixagent:Recipe',
-      ]},
+        ],
+        'slapos.recipe.nosqltestbed.plugin': [
+          'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',
+        ],
+      },
     )

slapos/recipe/erp5/__init__.py

@@ -668,7 +668,15 @@ SSLCARevocationPath %(ca_crl)s"""
     # maxconn should be set as the maximum thread we have per zope, like this
     #      haproxy will manage the queue of request with the possibility to
     #      move a request to another node if the initially selected one is dead
-    server_template = """  server %(name)s %(address)s cookie %(name)s check inter 3s rise 1 fall 2 maxconn %(cluster_zope_thread_amount)s"""
+    # maxqueue is the number of waiting request in the queue of every zope client.
+    #      It allows to make sure that there is not a zope client handling all
+    #      the work while other clients are doing nothing. This was happening
+    #      even thoug we have round robin distribution because when a node dies
+    #      some seconds, all request are dispatched to other nodes, and then users
+    #      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
+    server_template = """  server %(name)s %(address)s cookie %(name)s check inter 3s rise 1 fall 2 maxqueue 5 maxconn %(cluster_zope_thread_amount)s"""
     config = dict(name=name, ip=ip, port=port,
         server_check_path=server_check_path,)
     i = 1
@@ -781,7 +789,12 @@ SSLCARevocationPath %(ca_crl)s"""
       kumo_conf = {}
     # XXX Conversion server and memcache server coordinates are not relevant
     # for pure site creation.
-    mysql_connection_string = "%(mysql_database)s@%(ip)s:%(tcp_port)s %(mysql_user)s %(mysql_password)s" % mysql_conf
+    assert mysql_conf['mysql_user'] and mysql_conf['mysql_password'], \
+        "ZMySQLDA requires a user and a password for socket connections"
+    # XXX Use socket access to prevent unwanted connections to original MySQL
+    #     server when cloning an existing ERP5 instance.
+    #     TCP will be required if MySQL is in a different partition/server.
+    mysql_connection_string = "%(mysql_database)s %(mysql_user)s %(mysql_password)s %(socket)s" % mysql_conf
 
     bt5_list = self.parameter_dict.get("bt5_list", "").split() or default_bt5_list
     bt5_repository_list = self.parameter_dict.get("bt5_repository_list", "").split() \
@@ -1185,6 +1198,8 @@ SSLCARevocationPath %(ca_crl)s"""
           mysql_conf))
 
     mysql_script_list = []
+    mysql_script_list.append(pkg_resources.resource_string(__name__,
+                   'template/mysql-init-function.sql.in'))
     for x_database, x_user, x_password in \
           [(mysql_conf['mysql_database'],
             mysql_conf['mysql_user'],
@@ -1194,7 +1209,7 @@ SSLCARevocationPath %(ca_crl)s"""
             mysql_conf['mysql_test_password']),
           ] + mysql_conf['mysql_parallel_test_dict']:
       mysql_script_list.append(pkg_resources.resource_string(__name__,
-                     'template/initmysql.sql.in') % {
+                     'template/mysql-init-database.sql.in') % {
                         'mysql_database': x_database,
                         'mysql_user': x_user,
                         'mysql_password': x_password})

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

@@ -22,12 +22,12 @@ defaults
   timeout connect 5s
   # As requested in haproxy doc, make this "at least equal to timeout server".
   timeout client 305s
-  # Use "option httpclose" to not preserve client & server persistent connections
+  # Use "option forceclose" to not preserve client & server persistent connections
   # while handling every incoming request individually, dispatching them one after
   # another to servers, in HTTP close mode. This is really needed when haproxy
   # is configured with maxconn to 1, without this options browser are unable
   # to render a page
-  option httpclose
+  option forceclose
 
 listen %(name)s %(ip)s:%(port)s
   cookie  SERVERID insert

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

@@ -15,12 +15,17 @@ socket = %(socket)s
 datadir = %(data_directory)s
 pid-file = %(pid_file)s
 log-error = %(error_log)s
-log-slow-file = %(slow_query_log)s
+slow_query_log
+slow_query_log_file = %(slow_query_log)s
 long_query_time = 5
 max_allowed_packet = 128M
 query_cache_size = 32M
 
-plugin-load = ha_innodb_plugin.so
+plugin-load = ha_groonga.so;ha_sphinx.so
+
+# By default only 100 connections are allowed, when using zeo
+# we may have much more connections
+# max_connections = 1000
 
 # The following are important to configure and depend a lot on to the size of
 # your database and the available resources.

slapos/recipe/erp5/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_groonga.so';
+DROP FUNCTION IF EXISTS sphinx_snippets;
+CREATE FUNCTION sphinx_snippets RETURNS STRING SONAME 'sphinx.so';

slapos/recipe/erp5scalabilitytestbed/__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.
+#
+##############################################################################
+
+import os
+import pkg_resources
+from slapos.recipe.librecipe import BaseSlapRecipe
+
+class Recipe(BaseSlapRecipe):
+  def _install(self):
+    self.parameter_dict = self.computer_partition.getInstanceParameterDict()
+    software_type = self.parameter_dict.get('slap_software_type', 'default')
+    if software_type is None or software_type == 'RootSoftwareInstance':
+      software_type = 'erp5_scalability_cloud'
+    if "run_%s" % software_type in dir(self) and \
+       callable(getattr(self, "run_%s" % software_type)):
+      return getattr(self, "run_%s" % software_type)()
+    else:
+      raise NotImplementedError("Do not support %s" % software_type)
+
+  def run_erp5_scalability_cloud(self):
+    config = {}
+    config.update(self.options)
+    config.update(self.parameter_dict)
+
+    config['address'] = self.getGlobalIPv6Address()
+    config['report_path'] = self.log_directory
+    config.setdefault('user_range_increment', 1)
+    config['software_release_url'] = self.software_release_url
+    config['server_url'] = self.server_url
+    config['key_file'] = self.key_file
+    config['cert_file'] = self.cert_file
+    config['computer_id'] = self.computer_id
+    config['computer_partition_id'] = self.computer_partition_id
+    config['plugin_name'] = 'erp5'
+
+    if ',' in config['nb_users']:
+      config['nb_tester_init'] = config['nb_users'].split(',')[0]
+      config['nb_tester_max'] = config['nb_users'].split(',')[1]
+    else:
+      config['nb_tester_init'] = config['nb_users']
+      config['nb_tester_max'] = config['nb_users']
+
+    connection = {}
+    connection['url'] = 'http://['+config['address']+']:5000/'
+    connection['erp5_url'] = config['erp5_url']
+    connection['repeat'] = config['repeat']
+    connection['nb_users'] = config['nb_users']
+    connection['benchmark_suites'] = config['benchmark_suites']
+    connection['erp5_publish_url'] = config.get('erp5_publish_url', '')
+    connection['erp5_publish_project'] = config.get('erp5_publish_project', '')
+
+    self.computer_partition.setConnectionDict(connection)
+
+    nosqltester_manager_wrapper_template_location = pkg_resources.resource_filename(
+      __name__, os.path.join('template', 'erp5tester_manager_run.in'))
+
+    nosqltester_manager_runner_path = self.createRunningWrapper("erp5tester_manager",
+          self.substituteTemplate(nosqltester_manager_wrapper_template_location, config))
+
+    return [nosqltester_manager_runner_path]
+
+  def run_erp5_tester(self):
+    tester_config = {}
+    tester_config.update(self.options)
+    tester_config.update(self.parameter_dict)
+
+    tester_config['tester_address'] = self.getGlobalIPv6Address()
+    tester_config['report_path'] = self.log_directory
+    tester_config['filename_prefix'] = '%s-%s' % (self.computer_id,
+                                                  self.computer_partition_id)
+
+    tester_connection = {'url': 'http://[%s]:5000/' % \
+                           tester_config['tester_address']}
+
+    self.computer_partition.setConnectionDict(tester_connection)
+
+    tester_wrapper_template_location = pkg_resources.resource_filename(
+      __name__, os.path.join('template', 'nosqltester_run.in'))
+
+    tester_runner_path = self.createRunningWrapper("nosqltester",
+          self.substituteTemplate(tester_wrapper_template_location, tester_config))
+
+    return [tester_runner_path]

slapos/recipe/erp5scalabilitytestbed/template/erp5tester_manager_run.in

+#!/bin/sh
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+exec %(scalability_tester_manager_binary)s %(plugin_name)s -a %(address)s \
+  -r %(report_path)s -m %(nb_tester_init)s -t %(nb_tester_max)s \
+  -i %(user_range_increment)s --erp5-publish-url "%(erp5_publish_url)s" \
+  --erp5-publish-project "%(erp5_publish_project)s" %(software_release_url)s \
+  %(server_url)s "%(key_file)s" "%(cert_file)s" %(computer_id)s \
+  %(computer_partition_id)s

slapos/recipe/erp5scalabilitytestbed/template/nosqltester_run.in

+#!/bin/sh
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+cd %(benchmark_suite_path)s && \
+exec %(scalability_tester_binary)s -m %(host_address)s -a %(tester_address)s \
+    -r %(report_path)s -l %(report_path)s --filename-prefix %(filename_prefix)s \
+    --repeat %(repeat)s %(erp5_url)s 1 %(benchmark_suites)s

slapos/recipe/kvm/certificate_authority.py

@@ -2,6 +2,7 @@ import os
 import subprocess
 import time
 import ConfigParser
+import uuid
 
 
 def popenCommunicate(command_list, input=None):
@@ -42,9 +43,10 @@ class CertificateAuthority:
     try:
       # no CA, let us create new one
       popenCommunicate([self.openssl_binary, 'req', '-nodes', '-config',
-          self.openssl_configuration, '-new', '-x509', '-extensions',
-          'v3_ca', '-keyout', self.key, '-out', self.certificate,
-          '-days', '10950'], 'Automatic Certificate Authority\n')
+          self.openssl_configuration, '-new', '-x509', '-extensions', 'v3_ca',
+          '-keyout', self.key, '-out', self.certificate, '-days', '10950'],
+          # Authority name will be random, so no instance has the same issuer
+          'Certificate Authority %s\n' % uuid.uuid1())
     except:
       try:
         for f in file_list:

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

@@ -15,12 +15,13 @@ socket = %(socket)s
 datadir = %(data_directory)s
 pid-file = %(pid_file)s
 log-error = %(error_log)s
-log-slow-file = %(slow_query_log)s
+slow_query_log
+slow_query_log_file = %(slow_query_log)s
 long_query_time = 5
 max_allowed_packet = 128M
 query_cache_size = 32M
 
-plugin-load = ha_innodb_plugin.so
+plugin-load = ha_groonga.so;ha_sphinx.so
 
 # The following are important to configure and depend a lot on to the size of
 # your database and the available resources.

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

@@ -15,12 +15,13 @@ socket = %(socket)s
 datadir = %(data_directory)s
 pid-file = %(pid_file)s
 log-error = %(error_log)s
-#log-slow-file = %(slow_query_log)s
+slow_query_log
+slow_query_log_file = %(slow_query_log)s
 long_query_time = 5
 max_allowed_packet = 128M
 query_cache_size = 32M
 
-plugin-load = ha_innodb_plugin.so
+plugin-load = ha_groonga.so;ha_sphinx.so
 
 # The following are important to configure and depend a lot on to the size of
 # your database and the available resources.

slapos/recipe/nosqltestbed/__init__.py

@@ -25,202 +25,31 @@
 #
 ##############################################################################
 
-import os
-import urllib
-import urllib2
+import sys
 import pkg_resources
+from logging import Formatter
 from slapos.recipe.librecipe import BaseSlapRecipe
 
 class NoSQLTestBed(BaseSlapRecipe):
 
   def _install(self):
     self.parameter_dict = self.computer_partition.getInstanceParameterDict()
+    try:
+      entry_point = pkg_resources.iter_entry_points(group='slapos.recipe.nosqltestbed.plugin',
+                                                    name=self.parameter_dict.get('plugin', 'kumo')).next()
+      plugin_class = entry_point.load()
+
+      testbed = plugin_class()
+    except:
+      print Formatter().formatException(sys.exc_info())
+      return None
+
     software_type = self.parameter_dict.get('slap_software_type', 'default')
     if software_type is None or software_type == 'RootSoftwareInstance':
-      software_type = 'kumo_cloud'
-    if "run_%s" % software_type in dir(self) and \
-       callable(getattr(self, "run_%s" % software_type)):
-      return getattr(self, "run_%s" % software_type)()
+      software_type = 'default'
+    if "run_%s" % software_type in dir(testbed) and \
+       callable(getattr(testbed, "run_%s" % software_type)):
+      return getattr(testbed, "run_%s" % software_type)(self)
     else:
       raise NotImplementedError("Do not support %s" % software_type)
 
-  def run_kumo_cloud(self):
-    """ Deploy kumofs systeom on a cloud. """
-
-    kumo_cloud_config = {}
-    kumo_cloud_config.update(self.options)
-    kumo_cloud_config.update(self.parameter_dict)
-
-    kumo_cloud_config['address'] = self.getGlobalIPv6Address()
-    kumo_cloud_config['report_path'] = self.log_directory
-    
-    if 'nb_server_max' not in kumo_cloud_config:
-      kumo_cloud_config['nb_server_max'] = 3
-    
-    if 'nb_tester_max' not in kumo_cloud_config:
-      kumo_cloud_config['nb_tester_max'] = 3
-    
-    if 'nb_thread' not in kumo_cloud_config:
-      kumo_cloud_config['nb_thread'] = 1
-    
-    if 'nb_request' not in kumo_cloud_config:
-      kumo_cloud_config['nb_request'] = 1000
-    
-    kumo_cloud_config['software_release_url'] = self.software_release_url
-    kumo_cloud_config['server_url'] = self.server_url
-    kumo_cloud_config['key_file'] = self.key_file
-    kumo_cloud_config['cert_file'] = self.cert_file
-    kumo_cloud_config['computer_id'] = self.computer_id
-    kumo_cloud_config['computer_partition_id'] = self.computer_partition_id
-    kumo_cloud_config['plugin_name'] = 'kumo'
-
-    kumo_cloud_connection = {}
-    kumo_cloud_connection['url'] = "http://["+kumo_cloud_config['address']+"]:5000/"
-    self.computer_partition.setConnectionDict(kumo_cloud_connection)
-
-    nosqltester_manager_wrapper_template_location = pkg_resources.resource_filename(
-                                             __name__, os.path.join(
-                                             'template', 'kumotester_manager_run.in'))
-    nosqltester_manager_runner_path = self.createRunningWrapper("kumotester_manager",
-          self.substituteTemplate(nosqltester_manager_wrapper_template_location, kumo_cloud_config))
-
-    return [nosqltester_manager_runner_path]
-
-  def run_all(self):
-    """ Runs all services on one machine. """
-    all_config = {}
-    all_config.update(self.options)
-
-    ipaddress = "[%s]" % self.getGlobalIPv6Address()
-
-    all_config['manager_address'] = ipaddress
-    all_config['manager_port'] = 19700
-    all_config['server_address'] = ipaddress
-    all_config['server_port'] = 19800
-    all_config['server_listen_port'] = 19900
-    all_config['server_storage'] = os.path.join(self.data_root_directory, "kumodb.tch")
-    all_config['gateway_address'] = ipaddress
-    all_config['gateway_port'] = 11411
-    all_config['manager_log'] = os.path.join(self.log_directory, "kumo-manager.log")
-    all_config['server_log'] = os.path.join(self.log_directory, "kumo-server.log")
-    all_config['gateway_log'] = os.path.join(self.log_directory, "kumo-gateway.log")
-
-    manager_wrapper_template_location = pkg_resources.resource_filename(
-                                             __name__, os.path.join(
-                                             'template', 'kumo_manager_run.in'))
-    manager_runner_path = self.createRunningWrapper("kumo-manager",
-          self.substituteTemplate(manager_wrapper_template_location, all_config))
-    server_wrapper_template_location = pkg_resources.resource_filename(
-                                             __name__, os.path.join(
-                                             'template', 'kumo_server_run.in'))
-    server_runner_path = self.createRunningWrapper("kumo-server",
-          self.substituteTemplate(server_wrapper_template_location, all_config))
-    gateway_wrapper_template_location = pkg_resources.resource_filename(
-                                             __name__, os.path.join(
-                                             'template', 'kumo_gateway_run.in'))
-    gateway_runner_path = self.createRunningWrapper("kumo-gateway",
-          self.substituteTemplate(gateway_wrapper_template_location, all_config))
-
-    return [manager_runner_path, server_runner_path, gateway_runner_path]
-
-  def run_kumo_manager(self, ipaddress=None):
-    """ Runs the kumofs manager. """
-    manager_config = {}
-    manager_config.update(self.options)
-
-    if ipaddress is None:
-      manager_config['manager_address'] = "[%s]" % self.getGlobalIPv6Address()
-    else:
-      manager_config['manager_address'] = ipaddress
-    
-    manager_config['manager_port'] = 19700
-    manager_config['manager_log'] = os.path.join(self.log_directory, "kumo-manager.log")
-
-    manager_connection = {}
-    manager_connection['address'] = manager_config['manager_address']
-    manager_connection['port'] = manager_config['manager_port']
-    self.computer_partition.setConnectionDict(manager_connection)
-
-    manager_wrapper_template_location = pkg_resources.resource_filename(
-                                             __name__, os.path.join(
-                                             'template', 'kumo_manager_run.in'))
-    manager_runner_path = self.createRunningWrapper("kumo-manager",
-          self.substituteTemplate(manager_wrapper_template_location, manager_config))
-
-    return [manager_runner_path]
-
-  def run_kumo_server(self):
-    """ Runs the kumofs server. """
-    server_config = {}
-    server_config.update(self.options)
-    server_config.update(self.parameter_dict)
-
-    server_config['server_address'] = "[%s]" % self.getGlobalIPv6Address()
-    server_config['server_port'] = 19800
-    server_config['server_listen_port'] = 19900
-    server_config['server_storage'] = os.path.join(self.var_directory,"kumodb.tch")
-    server_config['server_log'] = os.path.join(self.log_directory, "kumo-server.log")
-
-    server_connection = {}
-    server_connection['address'] = server_config['server_address']
-    self.computer_partition.setConnectionDict(server_connection)
-
-    server_wrapper_template_location = pkg_resources.resource_filename(
-                                             __name__, os.path.join(
-                                             'template', 'kumo_server_run.in'))
-    server_runner_path = self.createRunningWrapper("kumo-server",
-          self.substituteTemplate(server_wrapper_template_location, server_config))
-
-    return [server_runner_path]
-
-  def run_kumo_gateway(self):
-    """ Runs the kumofs gateway. """
-    gateway_config = {}
-    gateway_config.update(self.options)
-    gateway_config.update(self.parameter_dict)
-
-    gateway_config['gateway_address'] = "[%s]" % self.getGlobalIPv6Address()
-    gateway_config['gateway_port'] = 11411
-    gateway_config['gateway_log'] = os.path.join(self.log_directory, "kumo-gateway.log")
-
-    gateway_connection = {}
-    gateway_connection['address'] = gateway_config['gateway_address']
-    gateway_connection['port'] = gateway_config['gateway_port']
-    self.computer_partition.setConnectionDict(gateway_connection)
-
-    gateway_wrapper_template_location = pkg_resources.resource_filename(
-                                             __name__, os.path.join(
-                                             'template', 'kumo_gateway_run.in'))
-    gateway_runner_path = self.createRunningWrapper("kumo-gateway",
-          self.substituteTemplate(gateway_wrapper_template_location, gateway_config))
-
-    return [gateway_runner_path]
-
-  def run_kumo_tester(self):
-    """ Runs the kumofs tester. """
-    tester_config = {}
-    tester_config.update(self.options)
-    tester_config.update(self.parameter_dict)
-
-    tester_config['tester_address'] = self.getGlobalIPv6Address()
-    # tester_config['url'] = "http://%s:5000/" % tester_config['tester_address']
-    # tester_config['start_url'] = "http://%s:5000/start" % tester_config['tester_address']
-    tester_config['report_path'] = self.log_directory
-    tester_config['binary'] = tester_config['memstrike_binary'] + " -l " + \
-                              tester_config['gateway_address'].strip("[]") + " -p " + \
-                              tester_config['gateway_port'] + " -t " + \
-                              tester_config['nb_thread'] + " " + \
-                              tester_config['nb_request'] #" 1000" " -t 32 1024000"
-
-    tester_connection = {}
-    tester_connection['start_url'] = "http://%s:5000/start" % tester_config['tester_address']
-    self.computer_partition.setConnectionDict(tester_connection)
-
-    tester_wrapper_template_location = pkg_resources.resource_filename(
-                                             __name__, os.path.join(
-                                             'template', 'nosqltester_run.in'))
-    tester_runner_path = self.createRunningWrapper("nosqltester",
-          self.substituteTemplate(tester_wrapper_template_location, tester_config))
-
-    return [tester_runner_path]
-

slapos/recipe/nosqltestbed/kumo/__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.
+#
+##############################################################################
+
+import os
+import pkg_resources
+from logging import Formatter
+
+class KumoTestBed(object):
+
+  def run_default(self, recipe):
+    run_kumo_cloud(recipe)
+
+  def run_kumo_cloud(self, recipe):
+    """ Deploy kumofs system on a cloud. """
+
+    kumo_cloud_config = {}
+    kumo_cloud_config.update(recipe.options)
+    kumo_cloud_config.update(recipe.parameter_dict)
+
+    kumo_cloud_config['address'] = recipe.getGlobalIPv6Address()
+    kumo_cloud_config['report_path'] = recipe.log_directory
+    
+    kumo_cloud_config.setdefault('max_server', 4)
+    kumo_cloud_config.setdefault('max_tester', 5)
+    kumo_cloud_config.setdefault('nb_thread', 32)
+    kumo_cloud_config.setdefault('nb_request', 1024000)
+    kumo_cloud_config.setdefault('erp5_publish_url', '')
+    kumo_cloud_config.setdefault('erp5_publish_project', '')
+    
+    computer_guid_list = []
+    computer_guid_list.append("COMP-23") # manager
+    computer_guid_list.append("COMP-13") # server 1
+    computer_guid_list.append("COMP-14") # server 2
+    computer_guid_list.append("COMP-20") # server 3
+    computer_guid_list.append("COMP-19") # server 4
+    computer_guid_list.append("COMP-23") # tester 1
+    computer_guid_list.append("COMP-22") # tester 2
+    computer_guid_list.append("COMP-14") # tester 3
+    computer_guid_list.append("COMP-20") # tester 4
+    computer_guid_list.append("COMP-19") # tester 5
+    
+    kumo_cloud_config.setdefault('computer_guid_list', ":".join(computer_guid_list))
+    
+    kumo_cloud_config['software_release_url'] = recipe.software_release_url
+    kumo_cloud_config['server_url'] = recipe.server_url
+    kumo_cloud_config['key_file'] = recipe.key_file
+    kumo_cloud_config['cert_file'] = recipe.cert_file
+    kumo_cloud_config['computer_id'] = recipe.computer_id
+    kumo_cloud_config['computer_partition_id'] = recipe.computer_partition_id
+    kumo_cloud_config['plugin_name'] = 'kumo'
+
+    kumo_cloud_connection = {}
+    kumo_cloud_connection['url'] = "http://["+kumo_cloud_config['address']+"]:5000/"
+    kumo_cloud_connection['computer_guid_list'] = kumo_cloud_config['computer_guid_list']
+    recipe.computer_partition.setConnectionDict(kumo_cloud_connection)
+
+    nosqltester_manager_wrapper_template_location = pkg_resources.resource_filename(
+                                             __name__, os.path.join(
+                                             'template', 'kumotester_manager_run.in'))
+    nosqltester_manager_runner_path = recipe.createRunningWrapper("kumotester_manager",
+          recipe.substituteTemplate(nosqltester_manager_wrapper_template_location, kumo_cloud_config))
+
+    return [nosqltester_manager_runner_path]
+
+  def run_all(self, recipe):
+    """ Run all services on one machine. """
+    all_config = {}
+    all_config.update(recipe.options)
+
+    ipaddress = "[%s]" % recipe.getGlobalIPv6Address()
+
+    all_config['manager_address'] = ipaddress
+    all_config['manager_port'] = 19700
+    all_config['server_address'] = ipaddress
+    all_config['server_port'] = 19800
+    all_config['server_listen_port'] = 19900
+    all_config['server_storage'] = os.path.join(recipe.data_root_directory, "kumodb.tch")
+    all_config['gateway_address'] = ipaddress
+    all_config['gateway_port'] = 11411
+    all_config['manager_log'] = os.path.join(recipe.log_directory, "kumo-manager.log")
+    all_config['server_log'] = os.path.join(recipe.log_directory, "kumo-server.log")
+    all_config['gateway_log'] = os.path.join(recipe.log_directory, "kumo-gateway.log")
+
+    manager_wrapper_template_location = pkg_resources.resource_filename(
+                                             __name__, os.path.join(
+                                             'template', 'kumo_manager_run.in'))
+    manager_runner_path = recipe.createRunningWrapper("kumo-manager",
+          recipe.substituteTemplate(manager_wrapper_template_location, all_config))
+    server_wrapper_template_location = pkg_resources.resource_filename(
+                                             __name__, os.path.join(
+                                             'template', 'kumo_server_run.in'))
+    server_runner_path = recipe.createRunningWrapper("kumo-server",
+          recipe.substituteTemplate(server_wrapper_template_location, all_config))
+    gateway_wrapper_template_location = pkg_resources.resource_filename(
+                                             __name__, os.path.join(
+                                             'template', 'kumo_gateway_run.in'))
+    gateway_runner_path = recipe.createRunningWrapper("kumo-gateway",
+          recipe.substituteTemplate(gateway_wrapper_template_location, all_config))
+
+    return [manager_runner_path, server_runner_path, gateway_runner_path]
+
+  def run_kumo_manager(self, recipe):
+    """ Run the kumofs manager. """
+    manager_config = {}
+    manager_config.update(recipe.options)
+
+    manager_config['manager_address'] = "[%s]" % recipe.getGlobalIPv6Address()
+    manager_config['manager_port'] = 19700
+    manager_config['manager_log'] = os.path.join(recipe.log_directory, "kumo-manager.log")
+
+    manager_connection = {}
+    manager_connection['address'] = manager_config['manager_address']
+    manager_connection['port'] = manager_config['manager_port']
+    recipe.computer_partition.setConnectionDict(manager_connection)
+
+    manager_wrapper_template_location = pkg_resources.resource_filename(
+                                             __name__, os.path.join(
+                                             'template', 'kumo_manager_run.in'))
+    manager_runner_path = recipe.createRunningWrapper("kumo-manager",
+          recipe.substituteTemplate(manager_wrapper_template_location, manager_config))
+
+    return [manager_runner_path]
+
+  def run_kumo_server(self, recipe):
+    """ Run the kumofs server. """
+    server_config = {}
+    server_config.update(recipe.options)
+    server_config.update(recipe.parameter_dict)
+
+    server_config['server_address'] = "[%s]" % recipe.getGlobalIPv6Address()
+    server_config['server_port'] = 19800
+    server_config['server_listen_port'] = 19900
+    server_config['server_storage'] = os.path.join(recipe.var_directory,"kumodb.tch")
+    server_config['server_log'] = os.path.join(recipe.log_directory, "kumo-server.log")
+
+    server_connection = {}
+    server_connection['address'] = server_config['server_address']
+    recipe.computer_partition.setConnectionDict(server_connection)
+
+    server_wrapper_template_location = pkg_resources.resource_filename(
+                                             __name__, os.path.join(
+                                             'template', 'kumo_server_run.in'))
+    server_runner_path = recipe.createRunningWrapper("kumo-server",
+          recipe.substituteTemplate(server_wrapper_template_location, server_config))
+
+    return [server_runner_path]
+
+  def run_kumo_gateway(self, recipe):
+    """ Run the kumofs gateway. """
+    gateway_config = {}
+    gateway_config.update(recipe.options)
+    gateway_config.update(recipe.parameter_dict)
+
+    gateway_config['gateway_address'] = "[%s]" % recipe.getGlobalIPv6Address()
+    gateway_config['gateway_port'] = 11411
+    gateway_config['gateway_log'] = os.path.join(recipe.log_directory, "kumo-gateway.log")
+
+    gateway_connection = {}
+    gateway_connection['address'] = gateway_config['gateway_address']
+    gateway_connection['port'] = gateway_config['gateway_port']
+    recipe.computer_partition.setConnectionDict(gateway_connection)
+
+    gateway_wrapper_template_location = pkg_resources.resource_filename(
+                                             __name__, os.path.join(
+                                             'template', 'kumo_gateway_run.in'))
+    gateway_runner_path = recipe.createRunningWrapper("kumo-gateway",
+          recipe.substituteTemplate(gateway_wrapper_template_location, gateway_config))
+
+    return [gateway_runner_path]
+
+  def run_kumo_tester(self, recipe):
+    """ Run the kumofs tester. """
+    tester_config = {}
+    tester_config.update(recipe.options)
+    tester_config.update(recipe.parameter_dict)
+
+    tester_config['tester_address'] = recipe.getGlobalIPv6Address()
+    # tester_config['url'] = "http://%s:5000/" % tester_config['tester_address']
+    # tester_config['start_url'] = "http://%s:5000/start" % tester_config['tester_address']
+    tester_config['report_path'] = recipe.log_directory
+    config_dict['binary'] = "%s -g -l %s -p %s -t %s %s" % (config_dict['memstrike_binary'],
+                                                            config_dict['gateway_address'].strip("[]"),
+                                                            str(config_dict['gateway_port']),
+                                                            str(config_dict['nb_thread']),
+                                                            str(config_dict['nb_request']))
+    tester_config['log_directory'] = recipe.log_directory
+    tester_config['compress_method'] = "bz2"
+
+    tester_connection = {}
+    tester_connection['url'] = "http://%s:5000/" % tester_config['tester_address']
+    recipe.computer_partition.setConnectionDict(tester_connection)
+
+    tester_wrapper_template_location = pkg_resources.resource_filename(
+                                             'slapos.recipe.nosqltestbed', os.path.join(
+                                             'template', 'nosqltester_run.in'))
+    tester_runner_path = recipe.createRunningWrapper("nosqltester",
+          recipe.substituteTemplate(tester_wrapper_template_location, tester_config))
+
+    return [tester_runner_path]
+
+  def run_kumo_tester_and_gateway(self, recipe):
+    """ Run the kumofs tester and gateway on the same partition. """
+    address = recipe.getGlobalIPv6Address()
+
+    config_dict = {}
+    config_dict.update(recipe.options)
+    config_dict.update(recipe.parameter_dict)
+
+    # Gateway part
+    config_dict['gateway_address'] = "[%s]" % address
+    config_dict['gateway_port'] = 11411
+    config_dict['gateway_log'] = os.path.join(recipe.log_directory, "kumo-gateway.log")
+
+    # Tester part
+    config_dict['tester_address'] = address
+    config_dict['report_path'] = recipe.log_directory
+    config_dict['binary'] = "%s -g -l %s -p %s -t %s %s" % (config_dict['memstrike_binary'],
+                                                            config_dict['gateway_address'].strip("[]"),
+                                                            str(config_dict['gateway_port']),
+                                                            str(config_dict['nb_thread']),
+                                                            str(config_dict['nb_request']))
+    config_dict['log_directory'] = recipe.log_directory
+    config_dict['compress_method'] = "bz2"
+
+    connection_dict = {}
+    # connection_dict['address'] = config_dict['gateway_address']
+    # connection_dict['port'] = config_dict['gateway_port']
+    connection_dict['url'] = "http://%s:5000/" % config_dict['tester_address']
+    recipe.computer_partition.setConnectionDict(connection_dict)
+
+    gateway_wrapper_template_location = pkg_resources.resource_filename(
+                                             __name__, os.path.join(
+                                             'template', 'kumo_gateway_run.in'))
+    gateway_runner_path = recipe.createRunningWrapper("kumo-gateway",
+          recipe.substituteTemplate(gateway_wrapper_template_location, config_dict))
+
+    tester_wrapper_template_location = pkg_resources.resource_filename(
+                                             'slapos.recipe.nosqltestbed', os.path.join(
+                                             'template', 'nosqltester_run.in'))
+    tester_runner_path = recipe.createRunningWrapper("nosqltester",
+          recipe.substituteTemplate(tester_wrapper_template_location, config_dict))
+
+    return [gateway_runner_path, tester_runner_path]
+
+  def run_memstrike_set(self, recipe):
+    """ Run memstrike in set mode. """
+    memstrike_config = {}
+    memstrike_config.update(recipe.options)
+    memstrike_config.update(recipe.parameter_dict)
+
+    memstrike_config['gateway_address'] = memstrike_config['gateway_address'].strip("[]")
+
+    memstrike_connection = {}
+    memstrike_connection['status'] = "OK"
+    recipe.computer_partition.setConnectionDict(memstrike_connection)
+
+    memstrike_wrapper_template_location = pkg_resources.resource_filename(
+                                             __name__, os.path.join(
+                                             'template', 'memstrike_run.in'))
+    memstrike_runner_path = recipe.createRunningWrapper("memstrike_set",
+          recipe.substituteTemplate(memstrike_wrapper_template_location, memstrike_config))
+
+    return [memstrike_runner_path]
+

slapos/recipe/nosqltestbed/template/kumo_gateway_run.in → slapos/recipe/nosqltestbed/kumo/template/kumo_gateway_run.in

 #!/bin/sh
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
-exec %(gateway_binary)s -F -E -m %(manager_address)s:%(manager_port)s -t %(gateway_address)s:%(gateway_port)s --verbose -o %(gateway_log)s
+exec %(gateway_binary)s -F -E -m %(manager_address)s:%(manager_port)s \
+  -t %(gateway_address)s:%(gateway_port)s --verbose -o %(gateway_log)s

slapos/recipe/nosqltestbed/template/kumo_manager_run.in → slapos/recipe/nosqltestbed/kumo/template/kumo_manager_run.in

 #!/bin/sh
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
-exec %(manager_binary)s -a -l %(manager_address)s:%(manager_port)s --verbose -o %(manager_log)s
+exec %(manager_binary)s -a -l %(manager_address)s:%(manager_port)s \
+  --verbose -o %(manager_log)s

slapos/recipe/nosqltestbed/kumo/template/kumo_server_run.in

+#!/bin/sh
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+exec %(server_binary)s -l %(server_address)s:%(server_port)s \
+  -L %(server_listen_port)s -m %(manager_address)s:%(manager_port)s \
+  -s %(server_storage)s  --verbose -o %(server_log)s

slapos/recipe/nosqltestbed/kumo/template/kumotester_manager_run.in

+#!/bin/sh
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+exec %(nosqltester_manager_binary)s %(plugin_name)s -a %(address)s \
+  -r %(report_path)s -s %(max_server)s -t %(max_tester)s \
+  --erp5-publish-url "%(erp5_publish_url)s" --erp5-publish-project "%(erp5_publish_project)s" \
+  %(software_release_url)s %(server_url)s "%(key_file)s" "%(cert_file)s" %(computer_id)s %(computer_partition_id)s \
+  %(nb_thread)s %(nb_request)s

slapos/recipe/nosqltestbed/template/kumo_server_run.in → slapos/recipe/nosqltestbed/kumo/template/memstrike_run.in

 #!/bin/sh
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
-exec %(server_binary)s -l %(server_address)s:%(server_port)s -L %(server_listen_port)s -m %(manager_address)s:%(manager_port)s -s %(server_storage)s  --verbose -o %(server_log)s
+exec %(memstrike_binary)s -s -l %(gateway_address)s -p %(gateway_port)s -t %(nb_thread)s %(nb_request)s

slapos/recipe/nosqltestbed/template/kumotester_manager_run.in

-#!/bin/sh
-# BEWARE: This file is operated by slapgrid
-# BEWARE: It will be overwritten automatically
-exec %(nosqltester_manager_binary)s -a %(address)s -r %(report_path)s -s %(nb_server_max)s -t %(nb_tester_max)s %(software_release_url)s %(server_url)s "%(key_file)s" "%(cert_file)s" %(computer_id)s %(computer_partition_id)s %(plugin_name)s %(nb_thread)s %(nb_request)s

slapos/recipe/nosqltestbed/template/nosqltester_manager_run.in

 #!/bin/sh
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
-exec %(nosqltester_manager_binary)s -a %(address)s -r %(report_path)s -s %(nb_server_max)s -t %(nb_tester_max)s %(software_release_url)s %(server_url)s "%(key_file)s" "%(cert_file)s" %(computer_id)s %(computer_partition_id)s %(plugin_name)s
+exec %(nosqltester_manager_binary)s %(plugin_name)s -a %(address)s \
+  -r %(report_path)s -s %(max_server)s -t %(max_tester)s \
+  --erp5-publish-url "%(erp5_publish_url)s" --erp5-publish-project "%(erp5_publish_project)s" \
+  %(software_release_url)s %(server_url)s "%(key_file)s" "%(cert_file)s" %(computer_id)s %(computer_partition_id)s

slapos/recipe/nosqltestbed/template/nosqltester_run.in

 #!/bin/sh
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
-exec %(nosqltester_binary)s -h %(host_address)s -a %(tester_address)s -r %(report_path)s -b "%(binary)s"
+exec %(nosqltester_binary)s -m %(host_address)s -a %(tester_address)s \
+  -r %(report_path)s -b "%(binary)s" -l %(log_directory)s \
+  -c "%(compress_method)s"

slapos/recipe/pulse2/__init__.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import BaseSlapRecipe
+import hashlib
+import os
+import pkg_resources
+import sys
+import zc.buildout
+import ConfigParser
+
+class Recipe(BaseSlapRecipe):
+  def getTemplateFilename(self, template_name):
+    return pkg_resources.resource_filename(__name__,
+        'template/%s' % template_name)
+
+  def _install(self):
+    # Apache
+    # TODO add in apache conf location of mmc.ini
+    document_root = self.createDataDirectory('htdocs')
+    self.createHtdocs(self.options['source'].strip(), document_root)
+    url = self.installApache(document_root)
+    
+    # MySQL
+    mysql_conf = self.installMysqlServer(self.getLocalIPv4Address(), 45678)
+    
+    # LDAP
+    ldap_port = dict()
+    
+    # Pulse
+    mmc_core_conf = self.installPulse2(ip=self.getLocalIPv4Address(),
+        port=11000, ldap_host=ldap_conf['host'], ldap_port=ldap_conf['port'])
+        
+    ca_conf = self.installCertificateAuthority()
+    key, certificate = self.requestCertificate('Pulse')
+
+    stunnel_conf = self.installStunnel(self.getGlobalIPv6Address(),
+        self.getLocalIPv4Address(), 12345, pulse_conf['inventory_port'],
+        certificate, key, ca_conf['ca_crl'],
+        ca_conf['certificate_authority_path'])
+    
+    self.linkBinary()
+    self.setConnectionDict(dict(
+      stunnel_inventory_ip = stunnel_conf['public_ip'],
+      stunnel_inventory_port = stunnel_conf['public_port'],
+      url=url,
+      **mysql_conf
+    ))
+    return self.path_list
+
+  def linkBinary(self):
+    """Links binaries to instance's bin directory for easier exposal"""
+    for linkline in self.options.get('link_binary_list', '').splitlines():
+      if not linkline:
+        continue
+      target = linkline.split()
+      if len(target) == 1:
+        target = target[0]
+        path, linkname = os.path.split(target)
+      else:
+        linkname = target[1]
+        target = target[0]
+      link = os.path.join(self.bin_directory, linkname)
+      if os.path.lexists(link):
+        if not os.path.islink(link):
+          raise zc.buildout.UserError(
+              'Target link already %r exists but it is not link' % link)
+        os.unlink(link)
+      os.symlink(target, link)
+      self.logger.debug('Created link %r -> %r' % (link, target))
+      self.path_list.append(link)
+  
+  def installCrond(self):
+    timestamps = self.createDataDirectory('cronstamps')
+    cron_output = os.path.join(self.log_directory, 'cron-output')
+    self._createDirectory(cron_output)
+    catcher = zc.buildout.easy_install.scripts([('catchcron',
+      __name__ + '.catdatefile', 'catdatefile')], self.ws, sys.executable,
+      self.bin_directory, arguments=[cron_output])[0]
+    self.path_list.append(catcher)
+    cron_d = os.path.join(self.etc_directory, 'cron.d')
+    crontabs = os.path.join(self.etc_directory, 'crontabs')
+    self._createDirectory(cron_d)
+    self._createDirectory(crontabs)
+    # Use execute from erp5.
+    wrapper = zc.buildout.easy_install.scripts([('crond',
+      'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
+      self.wrapper_directory, arguments=[
+        self.options['dcrond_binary'].strip(), '-s', cron_d, '-c', crontabs,
+        '-t', timestamps, '-f', '-l', '5', '-M', catcher]
+      )[0]
+    self.path_list.append(wrapper)
+    return cron_d
+  
+  def installLogrotate(self):
+    """Installs logortate main configuration file and registers its to cron"""
+    logrotate_d = os.path.abspath(os.path.join(self.etc_directory,
+      'logrotate.d'))
+    self._createDirectory(logrotate_d)
+    logrotate_backup = self.createBackupDirectory('logrotate')
+    logrotate_conf = self.createConfigurationFile("logrotate.conf",
+        "include %s" % logrotate_d)
+    logrotate_cron = os.path.join(self.cron_d, 'logrotate')
+    state_file = os.path.join(self.data_root_directory, 'logrotate.status')
+    open(logrotate_cron, 'w').write('0 0 * * * %s -s %s %s' %
+        (self.options['logrotate_binary'], state_file, logrotate_conf))
+    self.path_list.extend([logrotate_d, logrotate_conf, logrotate_cron])
+    return logrotate_d, logrotate_backup
+
+  def registerLogRotation(self, name, log_file_list, postrotate_script):
+    """Register new log rotation requirement"""
+    open(os.path.join(self.logrotate_d, name), 'w').write(
+        self.substituteTemplate(self.getTemplateFilename(
+          'logrotate_entry.in'),
+          dict(file_list=' '.join(['"'+q+'"' for q in log_file_list]),
+            postrotate=postrotate_script, olddir=self.logrotate_backup)))
+
+  def installCertificateAuthority(self, ca_country_code='XX',
+      ca_email='xx@example.com', ca_state='State', ca_city='City',
+      ca_company='Company'):
+    backup_path = self.createBackupDirectory('ca')
+    self.ca_dir = os.path.join(self.data_root_directory, 'ca')
+    self._createDirectory(self.ca_dir)
+    self.ca_request_dir = os.path.join(self.ca_dir, 'requests')
+    self._createDirectory(self.ca_request_dir)
+    config = dict(ca_dir=self.ca_dir, request_dir=self.ca_request_dir)
+    self.ca_private = os.path.join(self.ca_dir, 'private')
+    self.ca_certs = os.path.join(self.ca_dir, 'certs')
+    self.ca_crl = os.path.join(self.ca_dir, 'crl')
+    self.ca_newcerts = os.path.join(self.ca_dir, 'newcerts')
+    self.ca_key_ext = '.key'
+    self.ca_crt_ext = '.crt'
+    for d in [self.ca_private, self.ca_crl, self.ca_newcerts, self.ca_certs]:
+      self._createDirectory(d)
+    for f in ['crlnumber', 'serial']:
+      if not os.path.exists(os.path.join(self.ca_dir, f)):
+        open(os.path.join(self.ca_dir, f), 'w').write('01')
+    if not os.path.exists(os.path.join(self.ca_dir, 'index.txt')):
+      open(os.path.join(self.ca_dir, 'index.txt'), 'w').write('')
+    openssl_configuration = os.path.join(self.ca_dir, 'openssl.cnf')
+    config.update(
+        working_directory=self.ca_dir,
+        country_code=ca_country_code,
+        state=ca_state,
+        city=ca_city,
+        company=ca_company,
+        email_address=ca_email,
+    )
+    self._writeFile(openssl_configuration, pkg_resources.resource_string(
+      __name__, 'template/openssl.cnf.ca.in') % config)
+    self.path_list.extend(zc.buildout.easy_install.scripts([
+      ('certificate_authority',
+        __name__ + '.certificate_authority', 'runCertificateAuthority')],
+        self.ws, sys.executable, self.wrapper_directory, arguments=[dict(
+          openssl_configuration=openssl_configuration,
+          openssl_binary=self.options['openssl_binary'],
+          certificate=os.path.join(self.ca_dir, 'cacert.pem'),
+          key=os.path.join(self.ca_private, 'cakey.pem'),
+          crl=os.path.join(self.ca_crl),
+          request_dir=self.ca_request_dir
+          )]))
+    # configure backup
+    backup_cron = os.path.join(self.cron_d, 'ca_rdiff_backup')
+    open(backup_cron, 'w').write(
+        '''0 0 * * * %(rdiff_backup)s %(source)s %(destination)s'''%dict(
+          rdiff_backup=self.options['rdiff_backup_binary'],
+          source=self.ca_dir,
+          destination=backup_path))
+    self.path_list.append(backup_cron)
+
+    return dict(
+      ca_certificate=os.path.join(config['ca_dir'], 'cacert.pem'),
+      ca_crl=os.path.join(config['ca_dir'], 'crl'),
+      certificate_authority_path=config['ca_dir']
+    )
+
+  def requestCertificate(self, name):
+    hash = hashlib.sha512(name).hexdigest()
+    key = os.path.join(self.ca_private, hash + self.ca_key_ext)
+    certificate = os.path.join(self.ca_certs, hash + self.ca_crt_ext)
+    parser = ConfigParser.RawConfigParser()
+    parser.add_section('certificate')
+    parser.set('certificate', 'name', name)
+    parser.set('certificate', 'key_file', key)
+    parser.set('certificate', 'certificate_file', certificate)
+    parser.write(open(os.path.join(self.ca_request_dir, hash), 'w'))
+    return key, certificate
+
+  def installStunnel(self, public_ip, private_ip, public_port, private_port,
+      ca_certificate, key, ca_crl, ca_path):
+    """Installs stunnel"""
+    template_filename = self.getTemplateFilename('stunnel.conf.in')
+    log = os.path.join(self.log_directory, 'stunnel.log')
+    pid_file = os.path.join(self.run_directory, 'stunnel.pid')
+    stunnel_conf = dict(
+        public_ip=public_ip,
+        private_ip=private_ip,
+        public_port=public_port,
+        pid_file=pid_file,
+        log=log,
+        cert = ca_certificate,
+        key = key,
+        ca_crl = ca_crl,
+        ca_path = ca_path,
+        private_port = private_port,
+    )
+    stunnel_conf_path = self.createConfigurationFile("stunnel.conf",
+        self.substituteTemplate(template_filename,
+          stunnel_conf))
+    wrapper = zc.buildout.easy_install.scripts([('stunnel',
+      'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
+      self.wrapper_directory, arguments=[
+        self.options['stunnel_binary'].strip(), stunnel_conf_path]
+      )[0]
+    self.path_list.append(wrapper)
+    return stunnel_conf
+
+  def installPulse2(self, ip, port, ldap_host, ldap_port):
+    """Installs both mmc_core and pulse2"""
+    config = dict(
+        ldap_host=ldap_host,
+        ldap_port=ldap_port,
+        memcached_port=port,
+        ldap_logfile_path= os.path.join(self.log_directory, 'ldap.log'),
+        mmc_core_binary=self.options['mmc_core_binary']
+    )
+    
+    #TODO write function that takes all templates in subdir and creates conf 
+    # files, keeping same dir structure.
+    mmc_conf_path = self.createConfigurationFile(os.path.join("mmc",
+        "agent", "config.ini"), self.substituteTemplate(
+        self.getTemplateFilename(os.path.join("mmc_conf",
+        "agent", "config.ini.in")), config))
+    config['mmc_core_config_file'] = mysql_conf_path
+    
+    self.path_list.append(self.createRunningWrapper('mmc-core',
+      self.substituteTemplate(self.getTemplateFilename('mmc-core.in'),
+        config)))
+
+
+    
+    return dict(memcached_url='%s:%s' %
+        (config['memcached_ip'], config['memcached_port']),
+        memcached_ip=config['memcached_ip'],
+        memcached_port=config['memcached_port'])
+  
+    def createHtdocs(self, source, document_root):
+    source = self.options['source'].strip()
+    document_root = self.createDataDirectory('htdocs')
+    for p in os.listdir(document_root):
+      path = os.path.join(document_root, p)
+      if os.path.isdir(path):
+        shutil.rmtree(path)
+      else:
+        os.unlink(path)
+    for p in os.listdir(source):
+      path = os.path.join(source, p)
+      if os.path.isdir(path):
+        shutil.copytree(path, os.path.join(document_root, p))
+      else:
+        shutil.copy2(path, os.path.join(document_root, p))
+  
+  def installApache(self, document_root, ip=None, port=None):
+    if ip is None:
+      ip=self.getGlobalIPv6Address()
+    if port is None:
+      port = '9080'
+    apache_config = dict(
+        pid_file=os.path.join(self.run_directory, 'httpd.pid'),
+        lock_file=os.path.join(self.run_directory, 'httpd.lock'),
+        ip=ip,
+        port=port,
+        error_log=os.path.join(self.log_directory, 'httpd-error.log'),
+        access_log=os.path.join(self.log_directory, 'httpd-access.log'),
+        document_root=document_root,
+        php_ini_dir=self.etc_directory
+    )
+    config_file = self.createConfigurationFile('httpd.conf',
+        self.substituteTemplate(pkg_resources.resource_filename(__name__,
+          'template/apache.in'), apache_config))
+    self.path_list.append(config_file)
+    self.path_list.append(self.createConfigurationFile('php.ini',
+        self.substituteTemplate(pkg_resources.resource_filename(__name__,
+          'template/php.ini.in'), {})))
+    self.path_list.extend(zc.buildout.easy_install.scripts([(
+      'httpd',
+        __name__ + '.apache', 'runApache')], self.ws,
+          sys.executable, self.wrapper_directory, arguments=[
+            dict(
+              required_path_list=[],
+              binary=self.options['httpd_binary'],
+              config=config_file
+            )
+          ]))
+    return 'http://[%s]:%s' % (ip, port)
+
+  def installMysqlServer(self, ip, port, database='erp5', user='user',
+      test_database='test_erp5', test_user='test_user', template_filename=None,
+      parallel_test_database_amount=100, mysql_conf=None):
+    if mysql_conf is None:
+      mysql_conf = {}
+    backup_directory = self.createBackupDirectory('mysql')
+    if template_filename is None:
+      template_filename = self.getTemplateFilename('my.cnf.in')
+    error_log = os.path.join(self.log_directory, 'mysqld.log')
+    slow_query_log = os.path.join(self.log_directory, 'mysql-slow.log')
+    mysql_conf.update(
+        ip=ip,
+        data_directory=os.path.join(self.data_root_directory,
+          'mysql'),
+        tcp_port=port,
+        pid_file=os.path.join(self.run_directory, 'mysqld.pid'),
+        socket=os.path.join(self.run_directory, 'mysqld.sock'),
+        error_log=error_log,
+        slow_query_log=slow_query_log,
+        mysql_database=database,
+        mysql_user=user,
+        mysql_password=self.generatePassword(),
+        mysql_test_password=self.generatePassword(),
+        mysql_test_database=test_database,
+        mysql_test_user=test_user,
+        mysql_parallel_test_dict=[
+            ('test_%i' % x,)*2 + (self.generatePassword(),) \
+                 for x in xrange(0,parallel_test_database_amount)],
+    )
+    self.registerLogRotation('mysql', [error_log, slow_query_log],
+        '%(mysql_binary)s --no-defaults -B --user=root '
+        '--socket=%(mysql_socket)s -e "FLUSH LOGS"' % dict(
+          mysql_binary=self.options['mysql_binary'],
+          mysql_socket=mysql_conf['socket']))
+    self._createDirectory(mysql_conf['data_directory'])
+
+    mysql_conf_path = self.createConfigurationFile("my.cnf",
+        self.substituteTemplate(template_filename,
+          mysql_conf))
+
+    mysql_script_list = []
+    for x_database, x_user, x_password in \
+          [(mysql_conf['mysql_database'],
+            mysql_conf['mysql_user'],
+            mysql_conf['mysql_password']),
+           (mysql_conf['mysql_test_database'],
+            mysql_conf['mysql_test_user'],
+            mysql_conf['mysql_test_password']),
+          ] + mysql_conf['mysql_parallel_test_dict']:
+      mysql_script_list.append(pkg_resources.resource_string(__name__,
+                     'template/initmysql.sql.in') % {
+                        'mysql_database': x_database,
+                        'mysql_user': x_user,
+                        'mysql_password': x_password})
+    mysql_script_list.append('EXIT')
+    mysql_script = '\n'.join(mysql_script_list)
+    self.path_list.extend(zc.buildout.easy_install.scripts([('mysql_update',
+      __name__ + '.mysql', 'updateMysql')], self.ws,
+      sys.executable, self.wrapper_directory, arguments=[dict(
+        mysql_script=mysql_script,
+        mysql_binary=self.options['mysql_binary'].strip(),
+        mysql_upgrade_binary=self.options['mysql_upgrade_binary'].strip(),
+        socket=mysql_conf['socket'],
+        )]))
+    self.path_list.extend(zc.buildout.easy_install.scripts([('mysqld',
+      __name__ + '.mysql', 'runMysql')], self.ws,
+        sys.executable, self.wrapper_directory, arguments=[dict(
+        mysql_install_binary=self.options['mysql_install_binary'].strip(),
+        mysqld_binary=self.options['mysqld_binary'].strip(),
+        data_directory=mysql_conf['data_directory'].strip(),
+        mysql_binary=self.options['mysql_binary'].strip(),
+        socket=mysql_conf['socket'].strip(),
+        configuration_file=mysql_conf_path,
+       )]))
+    self.path_list.extend([mysql_conf_path])
+
+    # backup configuration
+    backup_directory = self.createBackupDirectory('mysql')
+    full_backup = os.path.join(backup_directory, 'full')
+    incremental_backup = os.path.join(backup_directory, 'incremental')
+    self._createDirectory(full_backup)
+    self._createDirectory(incremental_backup)
+    innobackupex_argument_list = [self.options['perl_binary'],
+        self.options['innobackupex_binary'],
+        '--defaults-file=%s' % mysql_conf_path,
+        '--socket=%s' %mysql_conf['socket'].strip(), '--user=root',
+        '--ibbackup=%s'% self.options['xtrabackup_binary']]
+    environment = dict(PATH='%s' % self.bin_directory)
+    innobackupex_incremental = zc.buildout.easy_install.scripts([(
+      'innobackupex_incremental','slapos.recipe.librecipe.execute', 'executee')],
+      self.ws, sys.executable, self.bin_directory, arguments=[
+        innobackupex_argument_list + ['--incremental'],
+        environment])[0]
+    self.path_list.append(innobackupex_incremental)
+    innobackupex_full = zc.buildout.easy_install.scripts([('innobackupex_full',
+     'slapos.recipe.librecipe.execute', 'executee')], self.ws,
+      sys.executable, self.bin_directory, arguments=[
+        innobackupex_argument_list,
+        environment])[0]
+    self.path_list.append(innobackupex_full)
+    backup_controller = zc.buildout.easy_install.scripts([
+      ('innobackupex_controller', __name__ + '.innobackupex', 'controller')],
+      self.ws, sys.executable, self.bin_directory,
+      arguments=[innobackupex_incremental, innobackupex_full, full_backup,
+        incremental_backup])[0]
+    self.path_list.append(backup_controller)
+    mysql_backup_cron = os.path.join(self.cron_d, 'mysql_backup')
+    open(mysql_backup_cron, 'w').write('0 0 * * * ' + backup_controller)
+    self.path_list.append(mysql_backup_cron)
+    # The return could be more explicit database, user ...
+    return mysql_conf
+

slapos/recipe/pulse2/apache.py

+import os
+import sys
+import time
+
+
+def runApache(args):
+  sleep = 60
+  conf = args[0]
+  while True:
+    ready = True
+    for f in conf.get('required_path_list', []):
+      if not os.path.exists(f):
+        print 'File %r does not exists, sleeping for %s' % (f, sleep)
+        ready = False
+    if ready:
+      break
+    time.sleep(sleep)
+  apache_wrapper_list = [conf['binary'], '-f', conf['config'], '-DFOREGROUND']
+  apache_wrapper_list.extend(sys.argv[1:])
+  sys.stdout.flush()
+  sys.stderr.flush()
+  os.execl(apache_wrapper_list[0], *apache_wrapper_list)

slapos/recipe/pulse2/certificate_authority.py

+import os
+import subprocess
+import time
+import ConfigParser
+
+
+def popenCommunicate(command_list, input=None):
+  subprocess_kw = dict(stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+  if input is not None:
+    subprocess_kw.update(stdin=subprocess.PIPE)
+  popen = subprocess.Popen(command_list, **subprocess_kw)
+  result = popen.communicate(input)[0]
+  if popen.returncode is None:
+    popen.kill()
+  if popen.returncode != 0:
+    raise ValueError('Issue during calling %r, result was:\n%s' % (
+      command_list, result))
+  return result
+
+
+class CertificateAuthority:
+  def __init__(self, key, certificate, openssl_binary,
+      openssl_configuration, request_dir):
+    self.key = key
+    self.certificate = certificate
+    self.openssl_binary = openssl_binary
+    self.openssl_configuration = openssl_configuration
+    self.request_dir = request_dir
+
+  def checkAuthority(self):
+    file_list = [ self.key, self.certificate ]
+    ca_ready = True
+    for f in file_list:
+      if not os.path.exists(f):
+        ca_ready = False
+        break
+    if ca_ready:
+      return
+    for f in file_list:
+      if os.path.exists(f):
+        os.unlink(f)
+    try:
+      # no CA, let us create new one
+      popenCommunicate([self.openssl_binary, 'req', '-nodes', '-config',
+          self.openssl_configuration, '-new', '-x509', '-extensions',
+          'v3_ca', '-keyout', self.key, '-out', self.certificate,
+          '-days', '10950'], 'Automatic Certificate Authority\n')
+    except:
+      try:
+        for f in file_list:
+          if os.path.exists(f):
+            os.unlink(f)
+      except:
+        # do not raise during cleanup
+        pass
+      raise
+
+  def _checkCertificate(self, common_name, key, certificate):
+    file_list = [key, certificate]
+    ready = True
+    for f in file_list:
+      if not os.path.exists(f):
+        ready = False
+        break
+    if ready:
+      return False
+    for f in file_list:
+      if os.path.exists(f):
+        os.unlink(f)
+    csr = certificate + '.csr'
+    try:
+      popenCommunicate([self.openssl_binary, 'req', '-config',
+        self.openssl_configuration, '-nodes', '-new', '-keyout',
+        key, '-out', csr, '-days', '3650'],
+        common_name + '\n')
+      try:
+        popenCommunicate([self.openssl_binary, 'ca', '-batch', '-config',
+          self.openssl_configuration, '-out', certificate,
+          '-infiles', csr])
+      finally:
+        if os.path.exists(csr):
+          os.unlink(csr)
+    except:
+      try:
+        for f in file_list:
+          if os.path.exists(f):
+            os.unlink(f)
+      except:
+        # do not raise during cleanup
+        pass
+      raise
+    else:
+      return True
+
+  def checkRequestDir(self):
+    for request_file in os.listdir(self.request_dir):
+      parser = ConfigParser.RawConfigParser()
+      parser.readfp(open(os.path.join(self.request_dir, request_file), 'r'))
+      if self._checkCertificate(parser.get('certificate', 'name'),
+          parser.get('certificate', 'key_file'), parser.get('certificate',
+            'certificate_file')):
+        print 'Created certificate %r' % parser.get('certificate', 'name')
+
+def runCertificateAuthority(args):
+  ca_conf = args[0]
+  ca = CertificateAuthority(ca_conf['key'], ca_conf['certificate'],
+      ca_conf['openssl_binary'], ca_conf['openssl_configuration'],
+      ca_conf['request_dir'])
+  while True:
+    ca.checkAuthority()
+    ca.checkRequestDir()
+    time.sleep(60)

slapos/recipe/pulse2/innobackupex.py

+import os
+import glob
+def controller(args):
+  """Creates full or incremental backup
+
+  If no full backup is done, it is created
+
+  If full backup exists incremental backup is done starting with base
+
+  base is the newest (according to date) full or incremental backup
+  """
+  innobackupex_incremental, innobackupex_full, full_backup, incremental_backup \
+      = args
+  if len(os.listdir(full_backup)) == 0:
+    print 'Doing full backup in %r' % full_backup
+    os.execv(innobackupex_full, [innobackupex_full, full_backup])
+  else:
+    backup_list = filter(os.path.isdir, glob.glob(full_backup + "/*") +
+      glob.glob(incremental_backup + "/*"))
+    backup_list.sort(key=lambda x: os.path.getmtime(x), reverse=True)
+    base = backup_list[0]
+    print 'Doing incremental backup in %r using %r as a base' % (
+        incremental_backup, base)
+    os.execv(innobackupex_incremental, [innobackupex_incremental,
+      '--incremental-basedir=%s'%base, incremental_backup])

slapos/recipe/pulse2/mysql.py

+import os
+import subprocess
+import time
+import sys
+
+
+def runMysql(args):
+  sleep = 60
+  conf = args[0]
+  mysqld_wrapper_list = [conf['mysqld_binary'], '--defaults-file=%s' %
+      conf['configuration_file']]
+  # we trust mysql_install that if mysql directory is available mysql was
+  # correctly initalised
+  if not os.path.isdir(os.path.join(conf['data_directory'], 'mysql')):
+    while True:
+      # XXX: Protect with proper root password
+      # XXX: Follow http://dev.mysql.com/doc/refman/5.0/en/default-privileges.html
+      popen = subprocess.Popen([conf['mysql_install_binary'],
+        '--skip-name-resolve', '--no-defaults', '--datadir=%s' %
+        conf['data_directory']],
+        stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+      result = popen.communicate()[0]
+      if popen.returncode is None or popen.returncode != 0:
+        print "Failed to initialise server.\nThe error was: %s" % result
+        print "Waiting for %ss and retrying" % sleep
+        time.sleep(sleep)
+      else:
+        print "Mysql properly initialised"
+        break
+  else:
+    print "MySQL already initialised"
+  print "Starting %r" % mysqld_wrapper_list[0]
+  sys.stdout.flush()
+  sys.stderr.flush()
+  os.execl(mysqld_wrapper_list[0], *mysqld_wrapper_list)
+
+
+def updateMysql(args):
+  conf = args[0]
+  sleep = 30
+  is_succeed = False
+  while True:
+    if not is_succeed:
+      mysql_upgrade_list = [conf['mysql_upgrade_binary'], '--no-defaults', '--user=root', '--socket=%s' % conf['socket']]
+      mysql_upgrade = subprocess.Popen(mysql_upgrade_list, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+      result = mysql_upgrade.communicate()[0]
+      if mysql_upgrade.returncode is None:
+        mysql_upgrade.kill()
+      if mysql_upgrade.returncode != 0 and not 'is already upgraded' in result:
+        print "Command %r failed with result:\n%s" % (mysql_upgrade_list, result)
+        print 'Sleeping for %ss and retrying' % sleep
+      else:
+        if mysql_upgrade.returncode == 0:
+          print "MySQL database upgraded with result:\n%s" % result
+        else:
+          print "No need to upgrade MySQL database"
+        mysql_list = [conf['mysql_binary'].strip(), '--no-defaults', '-B', '--user=root', '--socket=%s' % conf['socket']]
+        mysql = subprocess.Popen(mysql_list, stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        result = mysql.communicate(conf['mysql_script'])[0]
+        if mysql.returncode is None:
+          mysql.kill()
+        if mysql.returncode != 0:
+          print 'Command %r failed with:\n%s' % (mysql_list, result)
+          print 'Sleeping for %ss and retrying' % sleep
+        else:
+          is_succeed = True
+          print 'SlapOS initialisation script succesfully applied on database.'
+    sys.stdout.flush()
+    sys.stderr.flush()
+    time.sleep(sleep)

slapos/recipe/pulse2/template/apache.in.in

+# Apache static configuration
+# Automatically generated
+
+# Basic server configuration
+PidFile "%(pid_file)s"
+LockFile "%(lock_file)s"
+Listen %(ip)s:%(port)s
+PHPINIDir %(php_ini_dir)s
+ServerAdmin someone@email
+DefaultType text/plain
+TypesConfig conf/mime.types
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+AddType application/x-httpd-php .php .phtml .php5 .php4
+AddType application/x-httpd-php-source .phps
+
+# Log configuration
+ErrorLog "%(error_log)s"
+LogLevel warn
+LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
+LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common
+CustomLog "%(access_log)s" common
+
+# Directory protection
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+</Directory>
+
+Alias /mmc %(document_root)s
+### Allow access to lmc web directory to everyone 
+<Directory %(document_root)s>
+  AllowOverride None
+  Order allow,deny
+  allow from all
+  php_flag short_open_tag on
+  php_flag magic_quotes_gpc on
+</Directory>
+DocumentRoot %(document_root)s
+DirectoryIndex index.html index.php
+
+# List of modules
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule dav_module modules/mod_dav.so
+LoadModule dav_fs_module modules/mod_dav_fs.so
+LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule php5_module modules/libphp5.so

slapos/recipe/pulse2/template/logrotate_entry.in

+%(file_list)s {
+  daily
+  dateext
+  rotate 30
+  compress
+  notifempty
+  sharedscripts
+  create
+  postrotate
+    %(postrotate)s
+  endscript
+  olddir %(olddir)s
+}

slapos/recipe/pulse2/template/memcached.in

+#!/bin/sh
+exec %(memcached_binary)s -p %(memcached_port)s -U %(memcached_port)s -l %(memcached_ip)s

slapos/recipe/pulse2/template/mmc-core.in

+#!/bin/sh
+exec %(mmc_core_binary)s -f %(mmc_core_config_file)s

slapos/recipe/pulse2/template/mmc_conf/agent/config.ini

+[main]
+host = %(mmc_host)s
+port = %(mmc_port)s
+# Credentials for HTTP basic authentication
+login = mmc
+password = s3cr3t
+# RPC Session timeout in seconds.
+# If unset default to Twisted hardcoded 900 seconds.
+#sessiontimeout = 900
+# Multi-threading support (enabled by default)
+#multithreading = 1
+#maxthreads = 20
+# SSL support
+enablessl = 1
+localcert = %(ssl_localcert)s
+cacert = %(ssl_cacert)s
+# Certificate check
+# verifypeer = 0
+# Path to the file containing the Certificate Authority (PEM format)
+# cacert =
+# Path to the file containing the local key and certificate (PEM format)
+# localcert =
+
+[daemon]
+user = %(daemon_user)s
+group = %(daemon_user)s
+umask = 0077
+pidfile= %(daemon_pidfile)s
+# user = mmc
+# group = mmc
+# umask = 0007
+# pidfile= /var/run/mmc-agent.pid
+
+[loggers]
+keys=root
+
+[handlers]
+keys=hand01,hand02
+
+[formatters]
+keys=form01
+
+[logger_root]
+level=NOTSET
+handlers=hand01
+
+[handler_hand01]
+class=FileHandler
+level=INFO
+formatter=form01
+args=("%s" % %(mmc_log)s,)
+
+[handler_hand02]
+class=StreamHandler
+level=DEBUG
+args=(sys.stderr,)
+
+[formatter_form01]
+format=%(asctime)s #%(thread)d %(levelname)s %(message)s

slapos/recipe/pulse2/template/mmc_conf/agent/config.ini.in

+[main]
+host = %(mmc_host)s
+port = %(mmc_port)s
+# Credentials for HTTP basic authentication
+login = mmc
+password = s3cr3t
+# RPC Session timeout in seconds.
+# If unset default to Twisted hardcoded 900 seconds.
+#sessiontimeout = 900
+# Multi-threading support (enabled by default)
+#multithreading = 1
+#maxthreads = 20
+# SSL support
+enablessl = 1
+localcert = %(ssl_localcert)s
+cacert = %(ssl_cacert)s
+# Certificate check
+# verifypeer = 0
+# Path to the file containing the Certificate Authority (PEM format)
+# cacert =
+# Path to the file containing the local key and certificate (PEM format)
+# localcert =
+
+[daemon]
+user = %(daemon_user)s
+group = %(daemon_user)s
+umask = 0077
+pidfile= %(daemon_pidfile)s
+# user = mmc
+# group = mmc
+# umask = 0007
+# pidfile= /var/run/mmc-agent.pid
+
+[loggers]
+keys=root
+
+[handlers]
+keys=hand01,hand02
+
+[formatters]
+keys=form01
+
+[logger_root]
+level=NOTSET
+handlers=hand01
+
+[handler_hand01]
+class=FileHandler
+level=INFO
+formatter=form01
+args=("%s" % %(mmc_log)s,)
+
+[handler_hand02]
+class=StreamHandler
+level=DEBUG
+args=(sys.stderr,)
+
+[formatter_form01]
+format=%(asctime)s #%(thread)d %(levelname)s %(message)s

slapos/recipe/pulse2/template/mmc_conf/mmc.ini.in

+[global]
+; RPC backend to use
+backend = xmlrpc
+
+; HTTP basic authentication credentials to use for XMLRPC communication
+login = mmc
+password = s3cr3t
+
+; Root URL where the MMC web pages are installed
+; root= /mmc/ for http://127.0.0.1/mmc/
+root = /mmc/
+
+; Filesystem path where the MMC web modules are installed
+rootfsmodules = %(mmc_location)s/modules/
+
+; Available pagination steps
+pagination = 10 20 50 100
+
+; Number of items to display in lists
+maxperpage = 10
+
+; Declare if this installation is a community version or not
+; community can be yes or no
+community = yes
+
+; Debug section
+[debug]
+; 0 : no information
+; 1 : XMLRPC calls and results are displayed by the web interface
+level = 0
+
+; Login page title
+; UTF-8 strings must be used
+[logintitle]
+; Default page title for English and non-translated languages
+C =
+; French title
+fr_FR =
+; Spanish title
+es_ES =
+
+[server_01]
+description = localhost
+url = https://127.0.0.1:7080
+; Timeout in seconds for all socket I/O operations
+; Beware that timeout on a SSL socket only works with PHP >= 5.2.1
+; timeout = 300
+; SSL certificate check support
+; verifypeer = 0
+; Path to the file containing the Certificate Authority (PEM format)
+; cacert =
+; Path to the file containing the local key and certificate (PEM format)
+; localcert =

slapos/recipe/pulse2/template/mmc_conf/plugins/base.ini

+[ldap]
+# LDAP we are connected to
+# If ldapurl starts with "ldaps://", use LDAP over SSL on the LDAPS port.
+# LDAPS is deprecated, and you should use StartTLS.
+# If ldapverifypeer = demand, always use the server hostname instead of its IP
+# address in the LDAP URL. This hostname must match the CN field of the server
+# certificate.
+ldapurl = ldap://%(ldap_host)s:%(ldap_port)s
+# Network timeout in seconds for LDAP operations. No default timeout set.
+#network_timeout =
+# TLS connection parameters when LDAPS is not used:
+#  off - never use TLS (default value)
+#  start_tls - Use the LDAPv3 StartTLS extended operation (better)
+#start_tls = off
+# If start_tls != off or LDAPS, specify check to perform on server certificate:
+#  never - don't ask certificate
+#  demand - request certificate. If none or bad certificate provided, stop the
+#           connection (recommended)
+#ldapverifypeer = demand
+# Client certicates to use (default are empty) for LDAPS or TLS connections:
+# For example: /etc/ssl/certs
+#cacertdir =
+# For example: /etc/mmc/certs/demoCA/cacert.pem
+#cacert =
+# For example: /etc/mmc/certs/client.cert
+#localcert =
+# For example: /etc/mmc/certs/client.key
+#localkey =
+# Accepted ciphers
+# Use this for more security: TLSv1+SHA1+AES+DH:CAMELLIA:!NULL:!ADH
+#ciphersuites = TLSv1:!NULL
+# LDAP debug level - set this to 255 to debug LDAP connection problems
+#ldapdebuglevel = 0
+# LDAP base DN
+baseDN = dc=mandriva, dc=com
+# Users location in the LDAP
+baseUsersDN = ou=Users, %%(basedn)s
+# Groups location in the LDAP
+baseGroupsDN = ou=Groups, %%(basedn)s
+# LDAP manager
+rootName = cn=admin, %%(basedn)s
+password = secret
+# If enabled, the MMC will create/move/delete the home of the users
+# Else will do nothing, but only write user informations into LDAP
+userHomeAction = 1
+# Skeleton directory to populate a new home directory
+skelDir = /etc/skel
+# If set, all new users will belong to this group when created
+defaultUserGroup = Domain Users
+# Default home directory for users
+defaultHomeDir = /home
+# user uid number start
+uidStart = 10000
+# group gid number start
+gidStart = 10000
+# LDAP log file path
+logfile = %(ldap_logfile_path)s
+# FDS log file path
+# logfile = /opt/fedora-ds/slapd-hostname/logs/access
+
+# you can specify here where you can authorized creation of your homedir
+# default is your defaultHomeDir
+# example:
+# authorizedHomeDir = /home, /home2, /mnt/depot/newhome
+
+# LDAP user password scheme to use
+# Possible values are "ssha", "crypt" and "passmod"
+# "passmod" uses the LDAP Password Modify Extended Operations to change
+# password. The password encryption is done by the LDAP server.
+passwordscheme = passmod
+
+#[backup-tools]
+## Path of the backup tools
+#path = /usr/lib/mmc/backup-tools
+## Where are put the archives
+#destpath = /home/archives
+
+# Computer inventory plugin to use (Pulse 2 related option)
+# [computers]
+# method = glpi
+# method = inventory
+
+# Audit system configuration
+# If commented, the audit module will be disabled
+# [audit]
+# method = database
+# dbhost = localhost
+# MySQL and PostgreSQL backends are available
+# dbdriver = postgres
+# dbport = 5432
+# dbdriver = mysql
+# dbport = 3306
+# dbuser = audit
+# dbpassword = audit
+# dbname = audit
+
+# User authentication configuration
+#[authentication]
+# Authenticators chain
+#method = baseldap externalldap
+
+# baseldap authenticator configuration
+#[authentication_baseldap]
+# Set a list of login that will only be authentified using this authenticator
+#authonly = root
+
+# Externalldap authenticator configuration
+#[authentication_externalldap]
+# Login list that won't be authenticated with this authenticator.
+#exclude =
+# If set, only the speficied logins will be authenticated with this
+# authenticator.
+#authonly =
+# Set whether this authenticator is mandatory. If it is mandatory and can't be
+# validated during the mmc-agent activation phase, the mmc-agent exits with an
+# error.
+#mandatory = True
+# LDAP server URLs. The LDAP server are selected in the given order when
+# authenticating a user.
+#ldapurl = ldap://192.168.0.1:389 ldap://192.168.0.2:389
+# LDAP connection timeout in seconds. If the LDAP connection failed after this
+# timeout, we try the next LDAP server in the list or give up if it the last.
+#network_timeout =
+# LDAP suffix where to search for user
+#suffix = cn=Users,dc=mandriva,dc=com
+# How to bind to the LDAP. Empty if anonymous
+#bindname = cn=account, cn=Users, dc=linboxad, dc=com
+#bindpasswd = s3cr3t
+#bindname =
+#bindpasswd =
+# User filter
+#filter = objectClass=*
+# User attribute containing her/his login
+#attr = cn
+
+# User provisioning configuration
+#[provisioning]
+#method = externalldap
+
+# externalldap provisioner configuration
+#[provisioning_externalldap]
+# Login list that won't be provisioned with this provisioner
+#exclude = root
+# These attributes are mandatory to create a user
+#ldap_uid = cn
+#ldap_givenName = sn
+#ldap_sn = sn
+# Other attributes to fill in
+#ldap_mail = mail
+#...
+# We are able to fill the ACL fields the user logs in according to the value of
+# an attribute from the external LDAP.
+# What is the field name ?
+#profile_attr =
+# Here we define two profiles: profile1 and profile2
+# profile1 allows the user to log in and change her/his password in the web
+# interface
+#profile_acl_profile1= :base#users#passwd/
+# profile2 disallows the user to do anything (no ACL defined)
+#profile_acl_profile2 =
+# ... You can define as much profile_acl_* options as you need
+# For each profile, we can create a group of user, and put users with a given
+# profile in the corresponding group automatically when they log in.
+# Set the next line to True to activate profile to group mapping
+#profile_group_mapping = False
+# A prefix for the created group can be set
+#profile_group_prefix =
+
+# Example userdefault settings to support Kerberos
+# [userdefault]
+# objectClass = +krb5KDCEntry,krb5Principal
+# krb5KeyVersionNumber = 1
+# krb5KDCFlags = 126
+# krb5PrincipalName = %uid%@DOMAIN
+
+# Subscription informations
+# [subscription]
+# product_name = MDS
+# vendor_name = Mandriva
+# vendor_mail = sales@mandriva.com
+# customer_name =
+# customer_mail =
+# comment =
+# users = 0
+# computers = 0
+# # Support informations
+# support_mail = customer@customercare.mandriva.com
+# support_phone = 0810 LINBOX
+# support_comment =
+

slapos/recipe/pulse2/template/mmc_conf/plugins/base.ini.in

+[ldap]
+# LDAP we are connected to
+# If ldapurl starts with "ldaps://", use LDAP over SSL on the LDAPS port.
+# LDAPS is deprecated, and you should use StartTLS.
+# If ldapverifypeer = demand, always use the server hostname instead of its IP
+# address in the LDAP URL. This hostname must match the CN field of the server
+# certificate.
+ldapurl = ldap://%(ldap_host)s:%(ldap_port)s
+# Network timeout in seconds for LDAP operations. No default timeout set.
+#network_timeout =
+# TLS connection parameters when LDAPS is not used:
+#  off - never use TLS (default value)
+#  start_tls - Use the LDAPv3 StartTLS extended operation (better)
+#start_tls = off
+# If start_tls != off or LDAPS, specify check to perform on server certificate:
+#  never - don't ask certificate
+#  demand - request certificate. If none or bad certificate provided, stop the
+#           connection (recommended)
+#ldapverifypeer = demand
+# Client certicates to use (default are empty) for LDAPS or TLS connections:
+# For example: /etc/ssl/certs
+#cacertdir =
+# For example: /etc/mmc/certs/demoCA/cacert.pem
+#cacert =
+# For example: /etc/mmc/certs/client.cert
+#localcert =
+# For example: /etc/mmc/certs/client.key
+#localkey =
+# Accepted ciphers
+# Use this for more security: TLSv1+SHA1+AES+DH:CAMELLIA:!NULL:!ADH
+#ciphersuites = TLSv1:!NULL
+# LDAP debug level - set this to 255 to debug LDAP connection problems
+#ldapdebuglevel = 0
+# LDAP base DN
+baseDN = dc=mandriva, dc=com
+# Users location in the LDAP
+baseUsersDN = ou=Users, %%(basedn)s
+# Groups location in the LDAP
+baseGroupsDN = ou=Groups, %%(basedn)s
+# LDAP manager
+rootName = cn=admin, %%(basedn)s
+password = secret
+# If enabled, the MMC will create/move/delete the home of the users
+# Else will do nothing, but only write user informations into LDAP
+userHomeAction = 1
+# Skeleton directory to populate a new home directory
+skelDir = /etc/skel
+# If set, all new users will belong to this group when created
+defaultUserGroup = Domain Users
+# Default home directory for users
+defaultHomeDir = /home
+# user uid number start
+uidStart = 10000
+# group gid number start
+gidStart = 10000
+# LDAP log file path
+logfile = %(ldap_logfile_path)s
+# FDS log file path
+# logfile = /opt/fedora-ds/slapd-hostname/logs/access
+
+# you can specify here where you can authorized creation of your homedir
+# default is your defaultHomeDir
+# example:
+# authorizedHomeDir = /home, /home2, /mnt/depot/newhome
+
+# LDAP user password scheme to use
+# Possible values are "ssha", "crypt" and "passmod"
+# "passmod" uses the LDAP Password Modify Extended Operations to change
+# password. The password encryption is done by the LDAP server.
+passwordscheme = passmod
+
+#[backup-tools]
+## Path of the backup tools
+#path = /usr/lib/mmc/backup-tools
+## Where are put the archives
+#destpath = /home/archives
+
+# Computer inventory plugin to use (Pulse 2 related option)
+# [computers]
+# method = glpi
+# method = inventory
+
+# Audit system configuration
+# If commented, the audit module will be disabled
+# [audit]
+# method = database
+# dbhost = localhost
+# MySQL and PostgreSQL backends are available
+# dbdriver = postgres
+# dbport = 5432
+# dbdriver = mysql
+# dbport = 3306
+# dbuser = audit
+# dbpassword = audit
+# dbname = audit
+
+# User authentication configuration
+#[authentication]
+# Authenticators chain
+#method = baseldap externalldap
+
+# baseldap authenticator configuration
+#[authentication_baseldap]
+# Set a list of login that will only be authentified using this authenticator
+#authonly = root
+
+# Externalldap authenticator configuration
+#[authentication_externalldap]
+# Login list that won't be authenticated with this authenticator.
+#exclude =
+# If set, only the speficied logins will be authenticated with this
+# authenticator.
+#authonly =
+# Set whether this authenticator is mandatory. If it is mandatory and can't be
+# validated during the mmc-agent activation phase, the mmc-agent exits with an
+# error.
+#mandatory = True
+# LDAP server URLs. The LDAP server are selected in the given order when
+# authenticating a user.
+#ldapurl = ldap://192.168.0.1:389 ldap://192.168.0.2:389
+# LDAP connection timeout in seconds. If the LDAP connection failed after this
+# timeout, we try the next LDAP server in the list or give up if it the last.
+#network_timeout =
+# LDAP suffix where to search for user
+#suffix = cn=Users,dc=mandriva,dc=com
+# How to bind to the LDAP. Empty if anonymous
+#bindname = cn=account, cn=Users, dc=linboxad, dc=com
+#bindpasswd = s3cr3t
+#bindname =
+#bindpasswd =
+# User filter
+#filter = objectClass=*
+# User attribute containing her/his login
+#attr = cn
+
+# User provisioning configuration
+#[provisioning]
+#method = externalldap
+
+# externalldap provisioner configuration
+#[provisioning_externalldap]
+# Login list that won't be provisioned with this provisioner
+#exclude = root
+# These attributes are mandatory to create a user
+#ldap_uid = cn
+#ldap_givenName = sn
+#ldap_sn = sn
+# Other attributes to fill in
+#ldap_mail = mail
+#...
+# We are able to fill the ACL fields the user logs in according to the value of
+# an attribute from the external LDAP.
+# What is the field name ?
+#profile_attr =
+# Here we define two profiles: profile1 and profile2
+# profile1 allows the user to log in and change her/his password in the web
+# interface
+#profile_acl_profile1= :base#users#passwd/
+# profile2 disallows the user to do anything (no ACL defined)
+#profile_acl_profile2 =
+# ... You can define as much profile_acl_* options as you need
+# For each profile, we can create a group of user, and put users with a given
+# profile in the corresponding group automatically when they log in.
+# Set the next line to True to activate profile to group mapping
+#profile_group_mapping = False
+# A prefix for the created group can be set
+#profile_group_prefix =
+
+# Example userdefault settings to support Kerberos
+# [userdefault]
+# objectClass = +krb5KDCEntry,krb5Principal
+# krb5KeyVersionNumber = 1
+# krb5KDCFlags = 126
+# krb5PrincipalName = %uid%@DOMAIN
+
+# Subscription informations
+# [subscription]
+# product_name = MDS
+# vendor_name = Mandriva
+# vendor_mail = sales@mandriva.com
+# customer_name =
+# customer_mail =
+# comment =
+# users = 0
+# computers = 0
+# # Support informations
+# support_mail = customer@customercare.mandriva.com
+# support_phone = 0810 LINBOX
+# support_comment =
+

slapos/recipe/pulse2/template/mmc_conf/plugins/ppolicy.ini.in

+[main]
+disable = 1
+
+[ppolicy]
+# Branch where the password policies are stored
+ppolicyDN = ou=Password Policies, %(baseDN)s
+# Name of the default password policy
+ppolicyDefault = default
+
+# This options are used only once to create the default password policy entry
+# into the LDAP
+[ppolicyattributes]
+pwdAttribute = userPassword
+pwdLockout = True
+pwdMaxFailure = 5
+pwdLockoutDuration = 900
+# Password can't be change if it not 7 days old
+pwdMinAge = 25200
+# Password expiration is 42 days
+pwdMaxAge = 3628800
+pwdMinLength = 8
+pwdInHistory = 5
+pwdMustChange = True
+# To check password quality
+pwdCheckModule = mmc-check-password.so
+pwdCheckQuality = 2

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

+# ERP5 buildout my.cnf template based on my-huge.cnf shipped with mysql
+# The MySQL server
+[mysqld]
+# ERP5 by default requires InnoDB storage. MySQL by default fallbacks to using
+# different engine, like MyISAM. Such behaviour generates problems only, when
+# tables requested as InnoDB are silently created with MyISAM engine.
+#
+# Loud fail is really required in such case.
+sql-mode="NO_ENGINE_SUBSTITUTION"
+
+skip-show-database
+port = %(tcp_port)s
+bind-address = %(ip)s
+socket = %(socket)s
+datadir = %(data_directory)s
+pid-file = %(pid_file)s
+log-error = %(error_log)s
+log-slow-file = %(slow_query_log)s
+long_query_time = 5
+max_allowed_packet = 128M
+query_cache_size = 32M
+
+plugin-load = ha_innodb_plugin.so
+
+# The following are important to configure and depend a lot on to the size of
+# your database and the available resources.
+#innodb_buffer_pool_size = 4G
+#innodb_log_file_size = 256M
+#innodb_log_buffer_size = 8M
+
+# Some dangerous settings you may want to uncomment if you only want
+# performance or less disk access. Useful for unit tests.
+#innodb_flush_log_at_trx_commit = 0
+#innodb_flush_method = nosync
+#innodb_doublewrite = 0
+#sync_frm = 0
+
+# Uncomment the following if you need binary logging, which is recommended
+# on production instances (either for replication or incremental backups).
+#log-bin=mysql-bin
+
+# Force utf8 usage
+collation_server = utf8_unicode_ci
+character_set_server = utf8
+skip-character-set-client-handshake
+
+[mysql]
+no-auto-rehash
+socket = %(socket)s
+
+[mysqlhotcopy]
+interactive-timeout

slapos/recipe/pulse2/template/mysqlinit.sql.in

+CREATE DATABASE IF NOT EXISTS %(database)s;
+GRANT ALL PRIVILEGES ON %(database)s.* TO %(user)s@localhost IDENTIFIED BY %(password)r;
+GRANT ALL PRIVILEGES ON %(database)s.* TO %(user)s@'%%' IDENTIFIED BY %(password)r;
+GRANT SHOW DATABASES ON *.* TO %(user)s@localhost IDENTIFIED BY %(password)r;
+GRANT SHOW DATABASES ON *.* TO %(user)s@'%%' IDENTIFIED BY %(password)r;
+FLUSH PRIVILEGES;
+EXIT

slapos/recipe/pulse2/template/openssl.cnf.ca.in

+#
+# OpenSSL example configuration file.
+# This is mostly being used for generation of certificate requests.
+#
+
+# This definition stops the following lines choking if HOME isn't
+# defined.
+HOME			= .
+RANDFILE		= $ENV::HOME/.rnd
+
+# Extra OBJECT IDENTIFIER info:
+#oid_file		= $ENV::HOME/.oid
+oid_section		= new_oids
+
+# To use this configuration file with the "-extfile" option of the
+# "openssl x509" utility, name here the section containing the
+# X.509v3 extensions to use:
+# extensions		= 
+# (Alternatively, use a configuration file that has only
+# X.509v3 extensions in its main [= default] section.)
+
+[ new_oids ]
+
+# We can add new OIDs in here for use by 'ca', 'req' and 'ts'.
+# Add a simple OID like this:
+# testoid1=1.2.3.4
+# Or use config file substitution like this:
+# testoid2=${testoid1}.5.6
+
+# Policies used by the TSA examples.
+tsa_policy1 = 1.2.3.4.1
+tsa_policy2 = 1.2.3.4.5.6
+tsa_policy3 = 1.2.3.4.5.7
+
+####################################################################
+[ ca ]
+default_ca	= CA_default		# The default ca section
+
+####################################################################
+[ CA_default ]
+
+dir		= %(working_directory)s		# Where everything is kept
+certs		= $dir/certs		# Where the issued certs are kept
+crl_dir		= $dir/crl		# Where the issued crl are kept
+database	= $dir/index.txt	# database index file.
+#unique_subject	= no			# Set to 'no' to allow creation of
+					# several ctificates with same subject.
+new_certs_dir	= $dir/newcerts		# default place for new certs.
+
+certificate	= $dir/cacert.pem 	# The CA certificate
+serial		= $dir/serial 		# The current serial number
+crlnumber	= $dir/crlnumber	# the current crl number
+					# must be commented out to leave a V1 CRL
+crl		= $dir/crl.pem 		# The current CRL
+private_key	= $dir/private/cakey.pem # The private key
+RANDFILE	= $dir/private/.rand	# private random number file
+
+x509_extensions	= usr_cert		# The extentions to add to the cert
+
+# Comment out the following two lines for the "traditional"
+# (and highly broken) format.
+name_opt 	= ca_default		# Subject Name options
+cert_opt 	= ca_default		# Certificate field options
+
+# Extension copying option: use with caution.
+# copy_extensions = copy
+
+# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
+# so this is commented out by default to leave a V1 CRL.
+# crlnumber must also be commented out to leave a V1 CRL.
+# crl_extensions	= crl_ext
+
+default_days	= 3650			# how long to certify for
+default_crl_days= 30			# how long before next CRL
+default_md	= default		# use public key default MD
+preserve	= no			# keep passed DN ordering
+
+# A few difference way of specifying how similar the request should look
+# For type CA, the listed attributes must be the same, and the optional
+# and supplied fields are just that :-)
+policy		= policy_match
+
+# For the CA policy
+[ policy_match ]
+countryName		= match
+stateOrProvinceName	= match
+organizationName	= match
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+
+# For the 'anything' policy
+# At this point in time, you must list all acceptable 'object'
+# types.
+[ policy_anything ]
+countryName		= optional
+stateOrProvinceName	= optional
+localityName		= optional
+organizationName	= optional
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+
+####################################################################
+[ req ]
+default_bits		= 2048
+default_md		= sha1
+default_keyfile 	= privkey.pem
+distinguished_name	= req_distinguished_name
+#attributes		= req_attributes
+x509_extensions	= v3_ca	# The extentions to add to the self signed cert
+
+# Passwords for private keys if not present they will be prompted for
+# input_password = secret
+# output_password = secret
+
+# This sets a mask for permitted string types. There are several options. 
+# default: PrintableString, T61String, BMPString.
+# pkix	 : PrintableString, BMPString (PKIX recommendation before 2004)
+# utf8only: only UTF8Strings (PKIX recommendation after 2004).
+# nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings).
+# MASK:XXXX a literal mask value.
+# WARNING: ancient versions of Netscape crash on BMPStrings or UTF8Strings.
+string_mask = utf8only
+
+# req_extensions = v3_req # The extensions to add to a certificate request
+
+[ req_distinguished_name ]
+countryName			= Country Name (2 letter code)
+countryName_value		= %(country_code)s
+countryName_min			= 2
+countryName_max			= 2
+
+stateOrProvinceName		= State or Province Name (full name)
+stateOrProvinceName_value	= %(state)s
+
+localityName			= Locality Name (eg, city)
+localityName_value		= %(city)s
+
+0.organizationName		= Organization Name (eg, company)
+0.organizationName_value	= %(company)s
+
+# we can do this but it is not needed normally :-)
+#1.organizationName		= Second Organization Name (eg, company)
+#1.organizationName_default	= World Wide Web Pty Ltd
+
+commonName			= Common Name (eg, your name or your server\'s hostname)
+commonName_max			= 64
+
+emailAddress			= Email Address
+emailAddress_value = %(email_address)s
+emailAddress_max		= 64
+
+# SET-ex3			= SET extension number 3
+
+#[ req_attributes ]
+#challengePassword		= A challenge password
+#challengePassword_min		= 4
+#challengePassword_max		= 20
+#
+#unstructuredName		= An optional company name
+
+[ usr_cert ]
+
+# These extensions are added when 'ca' signs a request.
+
+# This goes against PKIX guidelines but some CAs do it and some software
+# requires this to avoid interpreting an end user certificate as a CA.
+
+basicConstraints=CA:FALSE
+
+# Here are some examples of the usage of nsCertType. If it is omitted
+# the certificate can be used for anything *except* object signing.
+
+# This is OK for an SSL server.
+# nsCertType			= server
+
+# For an object signing certificate this would be used.
+# nsCertType = objsign
+
+# For normal client use this is typical
+# nsCertType = client, email
+
+# and for everything including object signing:
+# nsCertType = client, email, objsign
+
+# This is typical in keyUsage for a client certificate.
+# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+# This will be displayed in Netscape's comment listbox.
+nsComment			= "OpenSSL Generated Certificate"
+
+# PKIX recommendations harmless if included in all certificates.
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer
+
+# This stuff is for subjectAltName and issuerAltname.
+# Import the email address.
+# subjectAltName=email:copy
+# An alternative to produce certificates that aren't
+# deprecated according to PKIX.
+# subjectAltName=email:move
+
+# Copy subject details
+# issuerAltName=issuer:copy
+
+#nsCaRevocationUrl		= http://www.domain.dom/ca-crl.pem
+#nsBaseUrl
+#nsRevocationUrl
+#nsRenewalUrl
+#nsCaPolicyUrl
+#nsSslServerName
+
+# This is required for TSA certificates.
+# extendedKeyUsage = critical,timeStamping
+
+[ v3_req ]
+
+# Extensions to add to a certificate request
+
+basicConstraints = CA:FALSE
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+[ v3_ca ]
+
+
+# Extensions for a typical CA
+
+
+# PKIX recommendation.
+
+subjectKeyIdentifier=hash
+
+authorityKeyIdentifier=keyid:always,issuer
+
+# This is what PKIX recommends but some broken software chokes on critical
+# extensions.
+#basicConstraints = critical,CA:true
+# So we do this instead.
+basicConstraints = CA:true
+
+# Key usage: this is typical for a CA certificate. However since it will
+# prevent it being used as an test self-signed certificate it is best
+# left out by default.
+# keyUsage = cRLSign, keyCertSign
+
+# Some might want this also
+# nsCertType = sslCA, emailCA
+
+# Include email address in subject alt name: another PKIX recommendation
+# subjectAltName=email:copy
+# Copy issuer details
+# issuerAltName=issuer:copy
+
+# DER hex encoding of an extension: beware experts only!
+# obj=DER:02:03
+# Where 'obj' is a standard or added object
+# You can even override a supported extension:
+# basicConstraints= critical, DER:30:03:01:01:FF
+
+[ crl_ext ]
+
+# CRL extensions.
+# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
+
+# issuerAltName=issuer:copy
+authorityKeyIdentifier=keyid:always
+
+[ proxy_cert_ext ]
+# These extensions should be added when creating a proxy certificate
+
+# This goes against PKIX guidelines but some CAs do it and some software
+# requires this to avoid interpreting an end user certificate as a CA.
+
+basicConstraints=CA:FALSE
+
+# Here are some examples of the usage of nsCertType. If it is omitted
+# the certificate can be used for anything *except* object signing.
+
+# This is OK for an SSL server.
+# nsCertType			= server
+
+# For an object signing certificate this would be used.
+# nsCertType = objsign
+
+# For normal client use this is typical
+# nsCertType = client, email
+
+# and for everything including object signing:
+# nsCertType = client, email, objsign
+
+# This is typical in keyUsage for a client certificate.
+# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+# This will be displayed in Netscape's comment listbox.
+nsComment			= "OpenSSL Generated Certificate"
+
+# PKIX recommendations harmless if included in all certificates.
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer
+
+# This stuff is for subjectAltName and issuerAltname.
+# Import the email address.
+# subjectAltName=email:copy
+# An alternative to produce certificates that aren't
+# deprecated according to PKIX.
+# subjectAltName=email:move
+
+# Copy subject details
+# issuerAltName=issuer:copy
+
+#nsCaRevocationUrl		= http://www.domain.dom/ca-crl.pem
+#nsBaseUrl
+#nsRevocationUrl
+#nsRenewalUrl
+#nsCaPolicyUrl
+#nsSslServerName
+
+# This really needs to be in place for it to be a proxy certificate.
+proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo
+
+####################################################################
+[ tsa ]
+
+default_tsa = tsa_config1	# the default TSA section
+
+[ tsa_config1 ]
+
+# These are used by the TSA reply generation only.
+dir		= /etc/pki/tls		# TSA root directory
+serial		= $dir/tsaserial	# The current serial number (mandatory)
+crypto_device	= builtin		# OpenSSL engine to use for signing
+signer_cert	= $dir/tsacert.pem 	# The TSA signing certificate
+					# (optional)
+certs		= $dir/cacert.pem	# Certificate chain to include in reply
+					# (optional)
+signer_key	= $dir/private/tsakey.pem # The TSA private key (optional)
+
+default_policy	= tsa_policy1		# Policy if request did not specify it
+					# (optional)
+other_policies	= tsa_policy2, tsa_policy3	# acceptable policies (optional)
+digests		= md5, sha1		# Acceptable message digests (mandatory)
+accuracy	= secs:1, millisecs:500, microsecs:100	# (optional)
+clock_precision_digits  = 0	# number of digits after dot. (optional)
+ordering		= yes	# Is ordering defined for timestamps?
+				# (optional, default: no)
+tsa_name		= yes	# Must the TSA name be included in the reply?
+				# (optional, default: no)
+ess_cert_id_chain	= no	# Must the ESS cert id chain be included?
+				# (optional, default: no)

slapos/recipe/pulse2/template/php.ini.in

+[PHP]
+engine = On
+safe_mode = Off
+expose_php = On
+error_reporting = E_ALL | E_STRICT
+display_errors = On
+display_startup_errors = On
+log_errors = On
+log_errors_max_len = 1024
+ignore_repeated_errors = Off
+ignore_repeated_source = Off

slapos/recipe/pulse2/template/pulse2_conf/plugins/dyngroup.ini.in

+[main]
+# Is the plugin disable ?
+disable = 0
+# Are dynamic group enable ?
+dynamic_enable = 1
+# Are profiles enable ?
+# profiles_enable = 0
+
+# Preselected module in the dynamic group creation page
+# default_module = 
+
+# Maximum number of elements in the static group creation list
+# max_elements_for_static_list = 2000
+
+[database]
+dbdriver = mysql
+dbhost = %(mysql_host)s
+dbport = %(mysql_port)s
+dbuser = %(mysql_user)s
+dbpasswd = %(mysql_password)s
+dbname = dyngroup
+# dbsslenable = 0
+# dbsslca =
+# dbsslcert =
+# dbsslkey =
+# Database connection lifetime
+# dbpoolrecycle = 60
+# Database connection pool size
+# dbpoolsize = 5
+
+[querymanager]
+# can we query on group names ?
+activate = 0
+                                                

slapos/recipe/pulse2/template/pulse2_conf/plugins/glpi.ini.in

+[main]
+disable = 0
+dbdriver = mysql
+dbhost = %(mysql_host)s
+dbport = %(mysql_port)s
+dbuser = %(mysql_user)s
+dbpasswd = %(mysql_password)s
+dbname = glpi
+# dbsslenable = 0
+# dbsslca =
+# dbsslcert =
+# dbsslkey =
+# Database connection lifetime
+# dbpoolrecycle = 60
+# Database connection pool size
+# dbpoolsize = 5
+
+# Allow users to filter computers list using an entity selector
+localisation = True
+# Accepted GLPI profiles. A user must have her/his GLPI profile in this list
+# else she/he can't display any computers from the GLPI inventory
+# active_profiles = profile1 profile2 profile3
+# Only display computers with the specified state
+# filter_on = state=3
+
+# Give the uri to link to for a computer inventory
+# glpi_computer_uri =
+# should be something like that :
+# glpi_computer_uri = http://localhost/glpi/front/computer.form.php?ID=
+
+# Tell whether the query manager of the dyngroup plugin can use this module
+[querymanager]
+activate = True
+
+# GLPI authentication configuration
+#[authentication_glpi]
+# URL to connect to the GLPI HTTP interface ?
+#baseurl = http://glpi-server/glpi/
+
+# GLPI provisioning configuration
+#[provisioning_glpi]
+# Users that will never be provisioned
+#exclude = root
+# Before provisioning, should we perform a GLPI authentication to create or
+# update the user informations in the GLPI database ?
+#doauth = 1
+# MMC web interface ACLs definition according to the user GLPI profile
+#profile_acl_profile1 = :##:base#main#default
+#profile_acl_profile2 =
+#profile_acl_profile3 =
+# If the user belong to more than one profile, the first profile of this list
+# will be used
+#profiles_order = profile1 profile2 profile3

slapos/recipe/pulse2/template/pulse2_conf/plugins/imaging.ini.in

+[main]
+disable = 0
+
+[database]
+# dbdriver = mysql
+# dbhost = localhost
+# dbport = 3306
+# dbname = imaging
+# dbuser = mmc
+# dbpasswd = mmc
+# dbsslenable = 0
+# dbsslca = /etc/mmc/pulse2/imaging/cacert.pem
+# dbsslcert = /etc/mmc/pulse2/imaging/cert.pem
+# dbsslkey = /etc/mmc/pulse2/imaging/key.pem
+# Database connection lifetime
+# dbpoolrecycle = 60
+# Database connection pool size
+# dbpoolsize = 5
+
+# [web]
+# ##### Interface customization #####
+# user may want to override the way dates are displayed (see http://www.php.net/date for more informations)
+# web_def_date_fmt = "%Y-%m-%d %H:%M:%S"
+# web_def_default_protocol = nfs
+# Menu settings
+# web_def_default_menu_name = Menu
+# web_def_default_timeout = 60
+# web_def_default_background_uri =
+# web_def_default_message = Warning ! Your PC is being backed up or restored. Do not reboot !
+# start options
+# web_def_kernel_parameters = quiet
+# backup/restore options
+# web_def_image_parameters =
+
+

slapos/recipe/pulse2/template/pulse2_conf/plugins/inventory.ini.in

+[main]
+disable = 0
+displayLocalisationBar = 0
+# Example of software filter when querying a computer inventory.
+# All softwares containing the KB string will be excluded
+# software_filter = %KB%
+
+[inventory]
+dbdriver = mysql
+dbhost = %(mysql_host)s
+dbport = %(mysql_port)s
+dbuser = %(mysql_user)s
+dbpasswd = %(mysql_password)s
+dbname = inventory
+dbsslenable = 0
+dbsslca = %(inventory_ssl_cacert)s
+dbsslcert = %(inventory_ssl_cert)s
+dbsslkey = %(inventory_ssl_key)s
+# Database connection lifetime
+# dbpoolrecycle = 60
+# Database connection pool size
+# dbpoolsize = 5
+
+[computers]
+# display = cn::Computer Name||displayName::Description
+# content = 
+
+[expert_mode]
+Bios = BiosVersion|ChipSerial|BiosVendor|SmbManufacturer|SmbProduct|SmbVersion|SmbSerial|SmbUUID|SmbType|DateFirstSwitchOn
+Network = CardType|MIB|Bandwidth|NetworkType|SubnetMask|State
+Hardware = Build|Version|ProcessorCount|SwapSpace|User|Date|Workgroup|RegisteredName|RegisteredCompany|OSSerialNumber|Type|OsSerialKey|ProcessorFrequency|Host
+Software = ProductPath|Type|Icon|UninstallPath|ExecutableSize|Application
+Controller = ExpandedType|HardwareVersion|StandardType
+Drive = DriveType|FileCount|FileSystem
+Input = StandardDescription|ExpandedDescription|Connector
+Memory = ExtendedDescription|SlotCount
+Monitor = Stamp|Type|Serial|Manuf
+Pci =
+Port = Stamp
+Printer =
+Slot =
+Sound = Description
+Storage = ExtendedType|VolumeName|Media
+VideoCard =
+
+[graph]
+Network = Gateway
+Hardware = OperatingSystem|ProcessorType
+Memory = Size
+
+# [querymanager]
+# list = Entity/Label||Software/ProductName||Hardware/ProcessorType||Hardware/OperatingSystem||Drive/TotalSpace||Inventory/Date
+# double = Software/Products::Software/ProductName##Software/ProductVersion
+# halfstatic = Registry/Value/display name::Path##DisplayName
+# extended = Inventory/Date||Drive/TotalSpace
+
+# [provisioning_inventory]
+# Users that will never be provisioned
+# exclude = root
+# A user can be automatically linked to a list of entities according to his
+# profile.
+# What is the LDAP field name that defines its profile name ?
+# profile_attr = 
+# Here are the possible notations for profile to entities mapping:
+# A simple list of the entities names
+# profile_entity_profile1 = entityA entityB
+# The dot char is the root entity
+# profile_entity_profile2 = .
+# In this example the content of the multi-valued 'pulse2entity' LDAP attribute
+# will be used
+# profile_entity_profile3 = %pulse2entity%
+# Here the provisioning plugin 'network_to_entity' will be used
+# profile_entity_profile4 = plugin:network_to_entity

slapos/recipe/pulse2/template/pulse2_conf/plugins/msc.ini.in

+[main]
+disable = 0
+
+[msc]
+# repopath = /var/lib/pulse2/packages
+# qactionspath = /var/lib/pulse2/qactions
+# download_directory_path = /var/lib/pulse2/downloads
+# dbdriver = mysql
+# dbhost = localhost
+# dbport = 3306
+# dbname = msc
+# dbuser = mmc
+# dbpasswd = mmc
+# dbdebug = ERROR
+# Database connection lifetime
+# dbpoolrecycle = 60
+# Database connection pool size
+# dbpoolsize = 5
+# SSL support
+# dbsslenable = 0
+# dbsslca =
+# dbsslcert =
+# dbsslkey =
+# Computer's IP addresses filtering
+# ignore_non_rfc2780 = 1
+# ignore_non_rfc1918 = 0
+# Comma separated values of excluded or included IP addresses or ranges
+# For example: exclude_ipaddr = 192.168.0.1,10.0.0.0/10.255.255.255
+# Included addresses are never filtered.
+# exclude_ipaddr =
+# include_ipaddr =
+# Computer's host name filtering
+# ignore_non_fqdn = 0
+# ignore_invalid_hostname = 0
+# Space separated list regexp for rejected or accepted host name
+# Host name matching the regexp in include_hostname are always accepted
+# For example: exclude_hostname = ^computer[0-9]*$ ^server[0-9]*$
+# exclude_hostname =
+# include_hostname =
+# Computer's MAC addresses filtering
+# wol_macaddr_blacklist =
+# default scheduler used by the msc
+default_scheduler = scheduler_01
+
+[scheduler_api]
+host = %(ipv4)s
+port = 9990
+username =
+password =
+enablessl = 1
+# verifypeer = 0
+# cacert =
+# localcert =
+
+[scheduler_01]
+host = %(ipv4)s
+port = 8000
+username = username
+password = password
+enablessl = 1
+# verifypeer = 0
+# cacert =
+# localcert =
+
+[web]
+# ##### Interface customization #####
+# user may want to override the way dates are displayed (see http://www.php.net/date for more informations)
+# web_def_date_fmt = "%Y-%m-%d %H:%M:%S"
+#
+# ##### Deployment default settings #####
+# pre-check the "awake" checkbox in 'standard' deploy mode
+# web_def_awake = 1
+# pre-check the "do inventory" checkbox in 'standard' deploy mode
+# web_def_inventory = 1
+# hidden option
+# web_show_reboot = 0
+# pre-select the following mode in 'advanced' deploy mode
+
+# the two available modes are push and push_pull
+# web_def_mode = push
+# if set to False, the following setting allow the user to toggle between push and push/pull mode in advanced mode
+# web_force_mode = True
+# web_def_maxbw = 0
+# web_def_delay = 60
+# web_def_attempts = 3
+# web_def_deployment_intervals =
+# web_dlpath =
+# Max bandwidth for file download in Kbit/s
+# web_def_dlmaxbw = 0
+#
+# ##### Proxy default settings ####
+# May the local proxy system be used ?
+# web_allow_local_proxy = False
+# default proxy mode, defaut "multiple", other possible value "single"
+# web_def_local_proxy_mode = multiple
+# Max number of clients per proxy in proxy mode
+# web_def_max_clients_per_proxy = 10
+# Number of auto-selected proxy in semi-auto mode
+# web_def_proxy_number = 2
+# default mode (semi_auto / manual)
+# web_def_proxy_selection_mode = semi_auto
+#
+# ##### VNC Applet default settings ####
+# Here we may define the VNC applet behavior (in some way)
+# may the VNC applet used ? (this setting simply (en/dis)able the display of the VNC action button)
+# vnc_show_icon = True
+# allow user to interact with remote desktop ?
+# vnc_view_only = True
+# use the following VNC client pre-defined rules,
+# currently available profiles:
+# fiber: for high speed local networks (low latency, 10 Mb/s per connection)
+# lan: for 100 Mb local networks (low latency, 3 Mb/s per connection)
+# cable: for high-end broadband links (high latency, 400 kb/s per connection)
+# dsl: for low-end broadband links (high latency, 120 kb/s per connection)
+# isdn: (high latency, 75 kb/s)
+# vnc_network_connectivity = lan
+# display applet control to user
+# vnc_allow_user_control = False
+# the port to use to connect to a VNC
+# vnc_port = 5900
+
+#
+# ##### Client probing behavior ####
+# the LED which represents the client status can take four colors:
+# black => no probe done
+# red => all probe failed
+# orange => minimal probe succedeed (ping), maximal probe failed (ssh)
+# green => all probe succedeed
+# available probes are: none (field is empty), ping, ssh, ping_ssh (ie. both)
+# for networks where icmp is not allowed, ping may be disabled: probe_order=ssh
+# to speed-up display, ssh may be disabled: probe_order=ping
+# to fully disable probe: probe_order=
+# default conf: ping_ssh, in other terms: ping = orange, ssh = green
+# probe_order=ping_ssh
+
+[package_api]
+# mserver = 127.0.0.1
+# mport = 9990
+# mmountpoint = /rpc
+# enablessl = 1
+# verifypeer = 0
+# localcert =
+# cacert =

slapos/recipe/pulse2/template/pulse2_conf/plugins/pkgs.ini.in

+[main]
+disable = 0
+
+[user_package_api]
+server = localhost
+port = 9990
+mountpoint = /upaa
+username =
+password =
+enablessl = 1
+# verifypeer = 0
+# cacert =
+# localcert =
+
+

slapos/recipe/pulse2/template/pulse2_conf/plugins/pulse2.ini.in

+[main]
+disable = 0
+
+# [database]
+# dbdriver = mysql
+# dbhost = localhost
+# dbport = 3306
+# dbname = pulse2
+# dbuser = mmc
+# dbpasswd = mmc
+# dbsslenable = 0
+# dbsslca =
+# dbsslcert =
+# dbsslkey =
+
+

slapos/recipe/pulse2/template/pulse2_conf/pulse2/atftpd/pcre.conf.in

+^/tftpboot/revoboot/bin/revoboot.pxe$   bootloader/pxe_boot
+^/bootloader/pxe_boot$                  bootloader/pxe_boot
+^/bootloader/bootsplash.xpm$            bootloader/bootsplash.xpm
+^/bootmenus/default                     bootmenus/default
+^/bootmenus/([0-9A-F]{12})              bootmenus/$1
+^/bootmenus/([0-9A-F]{8})               bootmenus/$1
+^/custom/(.+)                           custom/$1
+^/diskless/kernel$                      diskless/kernel
+^/diskless/initrd$                      diskless/initrd
+^/diskless/memtest$                     diskless/memtest
+^/tools/memtest$                        diskless/memtest
+^/masters/(.+)                          masters/$1
+^/(.*)$                                 ?
+.*                                      ?

slapos/recipe/pulse2/template/pulse2_conf/pulse2/imaging-server/imaging-server.ini.in

+[main]
+# We will bind on this address ...
+# host = 0.0.0.0
+# ... and this UDP port
+# port = 1001
+# required password to record a client, not checked if empty
+# adminpass =
+
+[daemon]
+# as we are a service, we need some info to be run, such as:
+# - the identity we will run into
+# user = root
+# group = root
+# - our umask
+# umask = 0077
+# and where to record our PID
+# pidfile= /var/run/pulse2-imaging-server.pid
+
+[package-server]
+# here are described how to talk to our referent package server
+#
+# host = 127.0.0.1
+# port = 9990
+# mount_point = /imaging_api
+# enablessl = True
+# username = username
+# password = password
+# cacert = /etc/mmc/pulse2/imaging-server/keys/cacert.pem
+# localcert = /etc/mmc/pulse2/imaging-server/keys/privkey.pem
+# verifypeer = False
+
+[hooks]
+# hooks_dir = /usr/lib/pulse2/imaging-server/hooks
+#
+# 0xAD => "I'm new" action : menu creation request, triggered by the bootloader
+# arg[1] = source MAC (short)
+# arg[2] = given ID (short)
+# arg[3] = given PASSWORD (optionnal)
+# exit 0 on success
+# create_client_path = create_client
+#
+# 0xAA => "I just booted" action : menu update request + inventory processing request, triggered by the bootloader
+# arg[1] = source MAC (short)
+# boot_client_path = boot_client
+# arg[1] = source MAC (short)
+# arg[2] = where the inventory is temporaly stored
+# process_inventory_path = process_inventory
+#
+# 0xEC => "I just started a backup" : start a backup request, triggered by revoinc
+# arg[1] = source MAC (short)
+# arg[2] = kind of backup (L = image, B = Master)
+# exit 0 on success
+# start_image_path = start_image
+#
+# 0xED => "I just finished a backup" : end a backup request, triggered by revodoneimage
+# end_image_path = end_image
+#
+# 0xCD => "Change my default menu" => change default menu request, triggered by revodefault
+# arg[1] = source MAC (short)
+# arg[2] = item to use
+# exit 0 on success
+# change_default_path = change_default
+#
+# 0x4C => log stuff
+# arg[1] = source MAC (short)
+# arg[2] = action :
+#          0 => booted
+#          1 => took item arg[3]
+#          2 => starting restoration (more info in arg[3])
+#          3 => finished restoration (more info in arg[3])
+#          4 => starting backup (more info in arg[3])
+#          5 => finished backup (more info in arg[3])
+#          6 => started postinst
+#          7 => finished postinst
+#          8 => critical error
+# arg[3] = optional, see upper
+# exit 0 on success
+# log_action_path = log_action
+#
+# 0x1A => asks for its UUID
+# arg[1] = source MAC (short)
+# exit 0 on success, UUID is the last line on stdout
+# get_uuid_path = get_uuid
+#
+# 0x1B => asks for its Hostname
+# arg[1] = source MAC (short)
+# exit 0 on success, hostname is the last line on stdout
+# get_hostname_path = get_hostname
+#
+# 0x54 => ask for time sync (for mtftp)
+# arg[1] = source MAC (short)
+# arg[2] = computed sync
+# exit 0 on success
+# mtftp_sync_path = mtftp_sync
+
+[loggers]
+keys = root
+
+[handlers]
+keys = hand01
+
+[formatters]
+keys = form01
+
+[logger_root]
+level = NOTSET
+handlers = hand01
+
+[handler_hand01]
+class = FileHandler
+level = INFO
+formatter = form01
+args = ("/var/log/mmc/pulse2-imaging-server.log",)
+
+[formatter_form01]
+format = %(asctime)s %(levelname)s %(message)s

slapos/recipe/pulse2/template/pulse2_conf/pulse2/inventory-server/inventory-server.ini.in

+[main]
+# host =
+# port = 9999
+# ocsmapping = /etc/mmc/pulse2/inventory-server/OcsNGMap.xml
+# enablessl = False
+# verifypeer = False
+# cacert = /etc/mmc/pulse2/inventory-server/keys/cacert.pem
+# localcert = /etc/mmc/pulse2/inventory-server/keys/privkey.pem
+# to put the data from the registry as hostname
+# hostname = Hardware/Host # by default
+# default_entity = .
+# entities_rules_file =
+
+[database]
+# dbdriver = mysql
+# dbhost = localhost
+# dbport = 3306
+# dbname = inventory
+# dbuser = mmc
+# dbpasswd = mmc
+# dbpoolrecycle = 60
+# dbsslenable = 0
+# dbsslca = /etc/mmc/pulse2/inventory/cacert.pem
+# dbsslcert = /etc/mmc/pulse2/inventory/cert.pem
+# dbsslkey = /etc/mmc/pulse2/inventory/key.pem
+
+[daemon]
+# pidfile = /var/run/pulse2-inventory-server.pid
+# user = root
+# group = root
+# umask = 0077
+# Example of non-root execution settings:
+# user = mmc
+# group = mmc
+# umask = 0007
+
+# [option_01]
+# NAME = REGISTRY
+# PARAM_01 = NAME::srvcomment||REGKEY::SYSTEM\CurrentControlSet\Services\lanmanserver\parameters||REGTREE::2##srvcomment
+# PARAM_02 = NAME::DisplayName||REGKEY::SYSTEM\CurrentControlSet\Services\lanmanserver||REGTREE::2##DisplayName
+
+[loggers]
+keys=root
+
+[handlers]
+keys=hand01,hand02
+
+[formatters]
+keys=form01
+
+[logger_root]
+level=NOTSET
+handlers=hand01
+
+[handler_hand01]
+class=FileHandler
+level=INFO
+formatter=form01
+args=("/var/log/mmc/pulse2-inventory-server.log",)
+
+[handler_hand02]
+class=StreamHandler
+level=DEBUG
+args=(sys.stderr,)
+
+[formatter_form01]
+format=%(asctime)s %(levelname)s %(message)s
+

slapos/recipe/pulse2/template/pulse2_conf/pulse2/launchers/launchers.ini.in

+[launchers]
+# Pulse2 Launcher path
+# launcher_path = /usr/sbin/pulse2-launcher
+
+## Misc locations ##
+# Source directory for push mode
+# source_path = /var/lib/pulse2/packages
+
+## Workflow-related commands ##
+# global ping command
+# ping_path = /usr/sbin/pulse2-ping
+# global inventory command
+# inventory_command = export P2SRV=`echo $SSH_CONNECTION | cut -f1 -d\ `; export P2PORT=9999; export http_proxy=""; export ftp_proxy=""; ( [ -x /cygdrive/c/Program\ Files/OCS\ Inventory\ Agent/OCSInventory.exe ] && /cygdrive/c/Program\ Files/OCS\ Inventory\ Agent/OCSInventory.exe /np /server:$P2SRV /pnum:$P2PORT ) || ( [ -x /usr/bin/ocsinventory-agent ] && /usr/bin/ocsinventory-agent --server=http://$P2SRV:$P2PORT ) || ( [ -x /usr/sbin/ocsinventory-agent ] && /usr/sbin/ocsinventory-agent --server=http://$P2SRV:$P2PORT ) || ( [ -x /usr/local/sbin/ocs_mac_agent.php ] && /usr/local/sbin/ocs_mac_agent.php )
+# global reboot command
+# reboot_command = /bin/shutdown.exe -f -r 1 || shutdown -r now
+# global halt command
+# halt_command = /bin/shutdown.exe -f -s 1 || shutdown -h now
+
+## Target on client ##
+# target directory on client
+# target_path = /tmp
+# temp folder name prefix on client
+# temp_folder_prefix = MDVPLS
+
+## Foll-proofing ##
+# Above this amount of seconds the command will automatically be killed.
+# max_command_age = 86400
+# Above this amount of seconds a computer will be considered as
+# unreachable.
+# max_ping_time = 4
+# Above this amount of seconds a computer will be considered as without
+# ssh installed
+# max_probe_time = 20
+
+[daemon]
+# the place were we put the daemons's PID files
+# pidfile = /var/run/pulse2
+# user = root
+# group = root
+# umask = 0077
+# Example of non-root execution settings:
+# user = mmc
+# group = mmc
+# umask = 0007
+
+[wrapper]
+# wrapper path
+# path = /usr/sbin/pulse2-output-wrapper
+# cap the amount of logs a wrapper can generate (in bytes)
+# max_log_size = 512000
+# wrapper will quit it process takes longer to complete (in seconds)
+# max_exec_time = 21600
+
+[ssh]
+# defaultkey is the name of the default SSH key
+# default_key = default
+# openssl binaries path
+# scp_path = /usr/bin/scp
+# ssh_path = /usr/bin/ssh
+# ssh_agent_path = /usr/bin/ssh-agent
+# sshkey_default = /root/.ssh/id_dsa
+# sshkey_mysecondkey = /somewhere/my_second_key
+# options passed to SSH via "-o"
+# ssh_options = LogLevel=ERROR UserKnownHostsFile=/dev/null StrictHostKeyChecking=no Batchmode=yes PasswordAuthentication=no ServerAliveInterval=10 CheckHostIP=no ConnectTimeout=10
+# ssh's keyforwarding control: never, always, or let (aka 'let the scheduler decide')
+# forward_key = let
+
+[wget]
+# wget binary path (on client)
+# wget_path = /usr/bin/wget
+# wget_options =
+# check_certs = False
+# resume = True
+
+[rsync]
+# rsync_path = /usr/bin/rsync
+# resume = True
+# set_executable can be yes, no or keep
+# set_executable = yes
+# set_access can be private, restricted or public
+# set_access = private
+
+[wol]
+# Pulse2 WOL Path
+# wol_path = /usr/sbin/pulse2-wol
+# wol_port = 40000
+# wol_bcast = 255.255.255.255
+
+[tcp_sproxy]
+# Pulse2 SSH Proxy path
+# tcp_sproxy_path = /usr/sbin/pulse2-tcp-sproxy
+# The "external" VNC IP adress
+# tcp_sproxy_host =
+# The TCP range to attribue to the proxy
+# tcp_sproxy_port_range = 8100-8200
+# the initial ssh connection to the client timeout
+# tcp_sproxy_establish_delay = 20
+# the initial VNC connection to the proxy timeout
+# tcp_sproxy_connect_delay = 60
+# the number of seconds a connection will stay open after the initial handshake
+# tcp_sproxy_session_lenght = 3600
+
+[smart_cleaner]
+# Pulse2 Smart Cleaner path (on the target); if empty we do not use it
+# smart_cleaner_path = /usr/bin/pulse2-smart-cleaner.sh
+# cleaner options, space separated, see doc
+# smart_cleaner_options =
+
+[scheduler_01]
+# host = 127.0.0.1
+# port = 8000
+# enablessl = True
+# username = username
+# password = password
+# periodicaly talk to our referent scheduler
+# awake_time = 600
+# add some randomness in our wake-ups
+# awake_incertitude_factor = .2
+# if set to yes, do no send results directly after a command completion
+# defer_results = no
+
+# Launchers sections, one per launcher
+[launcher_01]
+# bind = 127.0.0.1
+port = 8001
+# slots = 300
+# username = username
+# password = password
+# scheduler = scheduler_01
+enablessl = True
+cacert = /etc/mmc/pulse2/launchers/keys/cacert.pem
+localcert = /etc/mmc/pulse2/launchers/keys/privkey.pem
+verifypeer = False
+# You can override the logger configuration of this launcher with the
+# loggconffile option, else the logger configuration from the current file will
+# be used.
+# logconffile = /etc/mmc/pulse2/launchers/log_launcher_01.ini
+
+[loggers]
+keys = root
+
+[handlers]
+keys = hand01
+
+[formatters]
+keys = form01
+
+[logger_root]
+level = NOTSET
+handlers = hand01
+
+[handler_hand01]
+class = FileHandler
+level = INFO
+formatter = form01
+args = ("/var/log/mmc/pulse2-launchers.log",)
+
+[formatter_form01]
+format = %(asctime)s %(levelname)s %(message)s
+

slapos/recipe/pulse2/template/pulse2_conf/pulse2/launchers/log_launcher_01.ini.in

+[loggers]
+keys = root
+
+[handlers]
+keys = hand01
+
+[formatters]
+keys = form01
+
+[logger_root]
+level = NOTSET
+handlers = hand01
+
+[handler_hand01]
+class = FileHandler
+level = INFO
+formatter = form01
+args = ("/var/log/mmc/pulse2-launcher-01.log",)
+
+[formatter_form01]
+format = %(asctime)s %(levelname)s %(message)s

slapos/recipe/pulse2/template/pulse2_conf/pulse2/p2ipc-windows.ini.in

+[main]
+server =
+port = 9999
+command_name = C:\Program Files\OCS Inventory Agent\OCSInventory.exe
+command_attr = /SERVER:127.0.0.1 /PNUM:9999
+enablessl = True
+verifypeer = False
+cacert = cacert.pem
+localcert = privkey.pem
+
+# [polling]
+# activate = 0
+# type = reg
+# time = 600
+# path = HKEY_LOCAL_MACHINE\Software\Mandriva\Inventory\Client\do_inventory
+
+[loggers]
+keys = root
+
+[handlers]
+keys = hand01
+
+[formatters]
+keys = form01
+
+[logger_root]
+level = NOTSET
+handlers = hand01
+
+[handler_hand01]
+class = handlers.NTEventLogHandler
+level = INFO
+formatter = form01
+args = ("Pulse 2 Proxy SSL",)
+
+# [handler_hand01]
+# class = handlers.RotatingFileHandler
+# level = DEBUG
+# formatter = form01
+# args = ("C:\\Program Files\\Mandriva\\Pulse2 Inventory SSL Proxy\\log.txt", "a", 100*1024, 5)
+
+[formatter_form01]
+format = %(asctime)s %(levelname)s %(message)s
+
+# Xml update add extra information to OCS XML output
+[xmlupdate]
+# execute the update
+enable = False
+# keep a local copy of the updated XML
+keepxmlupdate = False
+# notify software updates
+updatedetection = False
+# add software icons to XML output
+addicon = False
+
+# add OCS execution debug to OCS XML output
+[ocsdebug]
+enable = False
\ No newline at end of file

slapos/recipe/pulse2/template/pulse2_conf/pulse2/p2ipc.ini.in

+[main]
+# server = 
+# port = 9999
+# path = /
+# tmpdirname = /tmp/Pulse2InventoryProxy
+# command_name = /usr/local/bin/ocsinventory-agent
+# command_attr = -l /tmp/Pulse2InventoryProxy
+# enablessl = True
+# key_file = conf/key/privkey.pem
+# cert_file = conf/key/cacert.pem
+                                

slapos/recipe/pulse2/template/pulse2_conf/pulse2/package-server/package-server.ini.in

+[main]
+# ----------
+# NETWORKING
+# ----------
+# port = 9990
+# host =
+# The public IP send when a client agent is wondering how to reach this package server, set to the "host" parameter value if not defined
+# public_ip =
+#
+# --------
+# PACKAGES
+# --------
+# Is package autodetection activated ?
+# package_detect_activate = 0
+# Time between two loops of detection
+# package_detect_loop = 60
+# methods in none, last_time_modification, check_size
+# for more than 1 method, separate with ","
+# package_detect_smart_method = none
+# package_detect_smart_time = 60
+# Package api can synhronise package data to others servers
+# package_mirror_loop = 5
+# package synchronisation targets
+# package_mirror_target =
+# package synchronisation state file. used only if package_mirror_target is defined
+# File where pending sync are written so that they can be finished on package server restart.
+# package_mirror_status_file = /var/data/mmc/status
+# package synchronisation command to use
+# package_mirror_command = /usr/bin/rsync
+# package synchronisation command options
+# package_mirror_command_options = -ar --delete
+# package synchronisation command on only one level options
+# package_mirror_level0_command_options = -d --delete
+# options passed to SSH via "-o" if specified --rsh is automatically added to package_mirror_command_options
+# package_mirror_command_options_ssh_options =
+# for example
+# package_mirror_command_options_ssh_options = IdentityFile=/root/.ssh/id_dsa StrictHostKeyChecking=no Batchmode=yes PasswordAuthentication=no ServerAliveInterval=10 CheckHostIP=no ConnectTimeout=10
+# loop for the sync of the whole package directory
+# can only be activated when package_mirror_target is given
+# package_global_mirror_activate = 1
+# package_global_mirror_loop = 3600
+# package_global_mirror_command_options = -ar --delete
+# real package deletion
+# real_package_deletion = 0
+#
+# ----------
+# MISC STUFF
+# ----------
+# machine/mirror assign algo
+# mm_assign_algo = default
+# user/packageput assign algo
+# up_assign_algo = default
+# tmp_input_dir = /tmp/packages/default
+
+[daemon]
+# the place were we put the daemons's PID files
+# pidfile = /var/run/pulse2-package-server.pid
+# user = root
+# group = root
+# umask = 0022
+# Example of non-root execution settings:
+# user = mmc
+# group = mmc
+# umask = 0002
+
+[ssl]
+# enablessl = 1
+# username =
+# password =
+# certfile = /etc/mmc/pulse2/package-server/keys/cacert.pem
+# privkey = /etc/mmc/pulse2/package-server/keys/privkey.pem
+# verifypeer = 0
+
+[mmc_agent]
+# We sometimes need to talk to our referent agent
+# here are some key to speak with it
+# host = 127.0.0.1
+# port = 7080
+# username = mmc
+# password = s3cr3t
+# enablessl = True
+# verifypeer = False
+# cacert = /etc/mmc/pulse2/package-server/keys/cacert.pem
+# localcert = /etc/mmc/pulse2/package-server/keys/privkey.pem
+
+[mirror_api]
+# mount_point = /rpc
+
+[user_packageapi_api]
+# mount_point = /upaa
+
+[scheduler_api]
+# mount_point = /scheduler_api
+# schedulers = scheduler_01
+
+# [imaging_api]
+# mount_point = /imaging_api
+# uuid = PLEASE_PUT_A_UUID_FOR_THAT_SERVER
+##################
+# Some locations #
+##################
+### main tree
+# base_folder = /var/lib/pulse2/imaging
+### Bootloaders
+# Where bootloader (and bootsplash) is stored, relative to "base_folder"
+# bootloader_folder = bootloader   # Where bootloader (and bootsplash) is stored, relative to "base_folder"
+# pxe_bootloader = pxe_boot        # the network bootloader
+# cd_bootloader = cd_boot          # the cdrom bootloader
+# bootsplash_file = bootsplash.xpm # the bootloader splashscreen
+### Bootmenus
+# Where boot menus are generated / being served, relative to "base_folder"
+# bootmenus_folder = bootmenus
+### Diskless
+# Where kernel, initrd and other official diskless tools are stored, relative to "base_folder"
+# diskless_folder = diskless # Where kernel, initrd and other official diskless tools are stored, relative to "base_folder"
+# diskless_kernel = kernel     # Name of the diskless kernel to run
+# diskless_initrd = initrd     # Name of the diskless initrd to boot (core)
+# diskless_initrdcd = initrdcd # Name of the diskless initrd to boot (addon to boot on CD)
+# diskless_memtest = memtest   # diskless memtest tool
+### Inventories
+# Where inventories are stored / retrieved, relative to "base_folder"
+# inventories_folder = inventories
+### NFS
+# Where additionnal material (hdmap, exclude) are stored / retrieved, relative to "base_folder"
+# (a.k.a. /revoinfo client side)
+# computers_folder = computers
+# Where images are stored, relative to "base_folder"
+# (a.k.a. /revoinfo client side)
+# masters_folder = masters
+# Where postinst tools are stored, relative to "base_folder"
+# (a.k.a. /opt client side)
+# postinst_folder = postinst
+# will contain archived computer imaging data
+# archives_folder = archives
+### ISO images generation
+# isos_folder = /var/lib/pulse2/imaging/isos # will contain generated ISO images
+# isogen_tool = /usr/bin/mkisofs             # tool used to generate ISO file
+### RPC offline mode
+# RPC replay file name, relative to "base_folder"
+# rpc_replay_file = rpc-replay.pck
+# RPC replay loop timer in seconds
+# rpc_loop_timer = 60
+# RPC to replay at each loop
+# rpc_count = 10
+# Interval in seconds between two RPCs
+# rpc_interval = 2
+# Our UUID cache *inside* base_folder
+# uuid_cache_file = uuid-cache.txt
+# Our UUID cache lifetime
+# uuid_cache_lifetime = 300
+
+[mirror:01]
+mount_point = /mirror1
+src = /var/lib/pulse2/packages
+
+[package_api_put:01]
+mount_point = /package_api_get1
+src = /var/lib/pulse2/packages
+tmp_input_dir = /tmp/package_tmp/put1
+
+# Logger configuration
+
+[loggers]
+keys = root,imaging
+
+[handlers]
+keys = hand01,hand_imaging
+
+[formatters]
+keys = form01,form_imaging
+
+[logger_root]
+level = NOTSET
+handlers = hand01
+
+[handler_hand01]
+class = FileHandler
+level = INFO
+formatter = form01
+args = ("%s" % %(pulse2_log_file_package_server)s,)
+
+[formatter_form01]
+format = %%(asctime)s %%(levelname)s %%(message)s
+
+# Imaging API logger configuration
+
+[logger_imaging]
+level = NOTSET
+handlers = hand_imaging
+propagate = 0
+qualname = imaging
+
+[handler_hand_imaging]
+class = FileHandler
+level = INFO
+formatter = form_imaging
+args = ("%s" % %(pulse2_log_file_package_server)s,)
+
+[formatter_form_imaging]
+format = %%(asctime)s %%(levelname)s Imaging: %%(message)s

slapos/recipe/pulse2/template/pulse2_conf/pulse2/package-server/plugin_terminal_type.ini.in

+#[main]
+#dbdriver = mysql 
+#dbhost = localhost
+#dbname = inventory
+#dbuser = mmc
+#dbpasswd = mmc
+#dbpoolrecycle = 
+#dbport = 
+#dbsslenable = 0
+#dbsslca = 
+#dbsslcert =
+#dbsslkey =
+
+#[associations:XX]
+# the mirror url you want to declare
+#mirror = MIRROR_URL
+# the type of terminal (SAGEM or )
+#terminal_types = TERMINAL_TYPE
+# the type of api it is (package_api or mirror)
+#kind = KIND
+

slapos/recipe/pulse2/template/pulse2_conf/pulse2/scheduler/scheduler.ini.in

+[scheduler]
+# This scheduler name
+id = scheduler_01
+
+## MANAGING ##
+# scheduler_path = /usr/sbin/pulse2-scheduler
+
+## NETWORK ##
+# port = 8000
+# host = 127.0.0.1
+# username = username
+# password = password
+# enablessl = True
+# If verifypeer is set, the scheduler will also connect to all the launchers
+# using the following certificates.
+# verifypeer = False
+# cacert = /etc/mmc/pulse2/scheduler/keys/cacert.pem
+# localcert = /etc/mmc/pulse2/scheduler/keys/privkey.pem
+
+## SCHEDULING ##
+# for some functions below, we add this factor, to prevent load peaks
+# incertitude_factor = .2
+#
+# initial wait time, in seconds, to make stuff stabilize
+# initial_wait = 2
+#
+# attempt to start (and stop) commands every n seconds
+# awake_time = 600
+#
+# preemption settings : preempting every N second, run M commands
+# preempt_amount = 50
+# preempt_period = 1
+#
+# status settings : check every N second, +/- incertitude_factor %
+# checkstatus_period = 900
+#
+# health logging : log some stats every N seconds, +/- incertitude_factor %
+# loghealth_period = 60
+#
+# once per day, hour specified below (HH:MM:SS), the scheduler will
+# analyse the database, looking to weird / broken commands;
+# you should enable this if you see stalled commands in logs
+# in this case, please specify an hour when the scheduler is
+# not very used (8 pm can be a good choice: analyse_hour = 20:00:00)
+# set to empty by default to disable analysis
+# analyse_hour =
+#
+# attempt to clean states in commands every n seconds
+# clean_states_time = 3600
+# clean state that are going to be clean
+# (from the launcher point of view, ie :
+#  * stop -> the command is not running on the launcher but it's state in the db say it is)
+#  * run -> the command
+# possible states : run, stop
+# active_clean_states =
+#
+# default database encoding (used to inject log files)
+# dbencoding = utf-8
+#
+# scheduler mode, see doc !
+# mode = async
+#
+# max number of slots to uses, for all launchers
+# max_slots = 300
+#
+# locking system
+# please use with caution: the only reason to activate this feature
+# is for systems under heavy load; risk of double-preemption is
+# drastically reduce using this, but your system will be even more slow
+# lock_processed_commands = False
+
+## Commands life ##
+# Command max default authorized time (for each stage)
+# max_command_time = 3600
+#
+# Command max upload time (aka 'upload' stage), override the previous one for looooong uploads
+# max_upload_time = 21600
+#
+# Command max WOL wait-for-completion time: wait this ammount of second before going futher
+# max_wol_time = 300
+
+## NETWORKING ##
+# prefered method to reach a client
+# available:
+# - fqdn: attempt to perform a DNS query on FQDN
+# - hosts: same, no DNS query
+# - ip: just try IP address
+# - netbios: attempt to do a nmblookup on IP adress
+# tests are performed using ping
+# resolv_order = fqdn hosts netbios ip
+
+## CHECKING ##
+# in some situations itn may be useful to do some pre-checks on clients
+# checks can be done against every information recorded into the "target" table
+# the following informations are available:
+# target_name => contain the target Hostname
+# target_uuid => contain the target UUID
+# target_ipaddr => contain the target IP addresses, only the first one is used
+# target_macaddr => contain the target MAC adresses, only the first one is used
+# The two following options are formated as follow:
+# *_check = <data-to-ask>=<expected-value>,...
+# for exemple:
+# server_check = IP=ipaddr
+# client_check = UUID=uuid,HOSTNAME=name
+# => will ask to client if its UUID is 'target_uuid', HOSTNAME is 'target_name',
+# and tell it to give us it's IP and check the IP's value is 'target_ipaddr'
+# While checking things, we may also want to announce what we are currently try to
+# do on client, for each stage, for example TRANFERT while transfering something:
+# announce_check = transfert=TRANFERT (comma-separated list as for previous options)
+# currently available keywords: transfert, execute, delete, inventory
+# announce_check =
+# server_check =
+# client_check =
+
+## Computer / Group assignment ##
+# mg_assign_algo = default
+
+
+[database]
+# dbdriver = mysql
+# dbhost = localhost
+# dbport = 3306
+# dbname = msc
+# dbuser = mmc
+# dbpasswd = mmc
+# dbdebug = ERROR
+# dbpoolrecycle = 60
+# dbpooltimeout = 30
+# SSL support
+# dbsslenable = 0
+# dbsslca =
+# dbsslcert =
+# dbsslkey =
+
+[daemon]
+# pidfile = /var/run/pulse2
+# user = root
+# group = root
+# umask = 0077
+# Example of non-root execution settings:
+# user = mmc
+# group = mmc
+# umask = 0007
+# setrlimit option allows to set process system resources usage. Syntax is:
+# setrlimit = limit1 soft1 hard1 limit2 soft2 hard2 ...
+# For example:
+# setrlimit = RLIMIT_NOFILE 2048 2048 RLIMIT_CORE 0 0
+# setrlimit =
+
+# Our launchers
+[launcher_01]
+host=%(ipv4)s
+port=8001
+username = username
+password = password
+enablessl = True
+
+[loggers]
+keys=root
+
+[handlers]
+keys=hand01
+
+[formatters]
+keys=form01
+
+[logger_root]
+level=NOTSET
+handlers=hand01
+
+[handler_hand01]
+class=FileHandler
+level=INFO
+formatter=form01
+args=("%s" % %(pulse2_log_file_scheduler)s,)
+
+[formatter_form01]
+format=%%(asctime)s %%(levelname)s %%(message)s

slapos/recipe/pulse2/template/stunnel.conf.in

+foreground = yes
+output = %(log)s
+pid = %(pid_file)s
+syslog = no
+CApath = %(ca_path)s
+key = %(key)s
+CRLpath = %(ca_crl)s
+cert = %(cert)s
+
+[service]
+accept = %(public_ip)s:%(public_port)s
+connect = %(private_ip)s:%(private_port)s

slapos/recipe/vifib.py

@@ -147,7 +147,10 @@ class Recipe(slapos.recipe.erp5.Recipe):
         conversion_server_conf,
       # as installERP5Site is not trusted (yet) and this recipe is production
       # ready expose more information
-      mysql_url='%(mysql_database)s@%(ip)s:%(tcp_port)s %(mysql_user)s %(mysql_password)s' % mysql_conf,
+      # XXX Use socket access to prevent unwanted connections to original MySQL
+      #     server when cloning an existing ERP5 instance.
+      #     TCP will be required if MySQL is in a different partition/server.
+      mysql_url='%(mysql_database)s %(mysql_user)s %(mysql_password)s %(socket)s' % mysql_conf,
     ))
     return self.path_list
 
@@ -200,7 +203,10 @@ class Recipe(slapos.recipe.erp5.Recipe):
         conversion_server_conf,
       # as installERP5Site is not trusted (yet) and this recipe is production
       # ready expose more information
-      mysql_url='%(mysql_database)s@%(ip)s:%(tcp_port)s %(mysql_user)s %(mysql_password)s' % mysql_conf,
+      # XXX Use socket access to prevent unwanted connections to original MySQL
+      #     server when cloning an existing ERP5 instance.
+      #     TCP will be required if MySQL is in a different partition/server.
+      mysql_url='%(mysql_database)s %(mysql_user)s %(mysql_password)s %(socket)s' % mysql_conf,
     ))
     return self.path_list
 

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

@@ -15,58 +15,39 @@ socket = %(socket)s
 datadir = %(data_directory)s
 pid-file = %(pid_file)s
 log-error = %(error_log)s
-log-slow-queries = %(slow_query_log)s
+slow_query_log
+slow_query_log_file = %(slow_query_log)s
 long_query_time = 5
-skip-locking
-key_buffer = 384M
 max_allowed_packet = 128M
-table_cache = 512
-sort_buffer_size = 2M
-read_buffer_size = 2M
-read_rnd_buffer_size = 8M
-myisam_sort_buffer_size = 64M
-thread_cache_size = 8
 query_cache_size = 32M
-# Try number of CPU's*2 for thread_concurrency
-thread_concurrency = 8
 
-# Replication Master Server (default)
-# binary logging is required for replication
-log-bin=mysql-bin
+plugin-load = ha_groonga.so;ha_sphinx.so
 
-# required unique id between 1 and 2^32 - 1
-# defaults to 1 if master-host is not set
-# but will not function as a master if omitted
-server-id	= 1
+# The following are important to configure and depend a lot on to the size of
+# your database and the available resources.
+#innodb_buffer_pool_size = 4G
+#innodb_log_file_size = 256M
+#innodb_log_buffer_size = 8M
+
+# Some dangerous settings you may want to uncomment if you only want
+# performance or less disk access. Useful for unit tests.
+#innodb_flush_log_at_trx_commit = 0
+#innodb_flush_method = nosync
+#innodb_doublewrite = 0
+#sync_frm = 0
+
+# Uncomment the following if you need binary logging, which is recommended
+# on production instances (either for replication or incremental backups).
+#log-bin=mysql-bin
 
 # Force utf8 usage
 collation_server = utf8_unicode_ci
 character_set_server = utf8
-default-character-set = utf8
 skip-character-set-client-handshake
 
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
 [mysql]
 no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
 socket = %(socket)s
 
-[isamchk]
-key_buffer = 256M
-sort_buffer_size = 256M
-read_buffer = 2M
-write_buffer = 2M
-
-[myisamchk]
-key_buffer = 256M
-sort_buffer_size = 256M
-read_buffer = 2M
-write_buffer = 2M
-
 [mysqlhotcopy]
 interactive-timeout
-

software/MediaWiki/software.cfg

@@ -48,7 +48,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/SilverStripe/software.cfg

@@ -32,7 +32,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/b2evolution/software.cfg

@@ -33,7 +33,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/cmsmadesimple/software.cfg

@@ -32,7 +32,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/coppermine/software.cfg

@@ -43,7 +43,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/dotclear/software.cfg

@@ -43,7 +43,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/dotproject/software.cfg

@@ -43,7 +43,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/drupal/software.cfg

@@ -32,7 +32,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/eSKUeL/software.cfg

@@ -32,7 +32,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/erp5/instance.cfg

@@ -34,14 +34,31 @@ tidstorage_repozo_binary = ${buildout:bin-directory}/tidstorage_repozo
 tidstoraged_binary = ${buildout:bin-directory}/tidstoraged
 xtrabackup_binary = ${xtrabackup:location}/bin/xtrabackup_51
 zabbix_agentd_binary = ${zabbix-agent:location}/sbin/zabbix_agentd
-mk-variable-advisor_binary = ${perl:siteprefix}/bin/mk-variable-advisor
-mk-table-usage_binary = ${perl:siteprefix}/bin/mk-table-usage
-mk-visual-explain_binary = ${perl:siteprefix}/bin/mk-visual-explain
-mk-config-diff_binary = ${perl:siteprefix}/bin/mk-config-diff
-mk-deadlock-logger_binary = ${perl:siteprefix}/bin/mk-deadlock-logger
-mk-error-log_binary = ${perl:siteprefix}/bin/mk-error-log
-mk-index-usage_binary = ${perl:siteprefix}/bin/mk-index-usage
-mk-query-advisor_binary = ${perl:siteprefix}/bin/mk-query-advisor
+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
 
 # cloudooo specific configuration
 ooo_binary_path = ${libreoffice-bin:location}/program
@@ -55,6 +72,7 @@ link_binary_list =
   ${coreutils:location}/bin/ls
   ${coreutils:location}/bin/tr
   ${coreutils:location}/bin/uname
+  ${gettext:location}/lib/gettext/hostname
   ${git:location}/bin/git
   ${graphviz:location}/bin/dot
   ${grep:location}/bin/grep

software/erp5/software.cfg

@@ -28,7 +28,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal
 # Default template for erp5 instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 53f225e13bf7ebcd88bbc2b038c83b6f
+md5sum = 07f09cca8ad4d7858bb40d723998a889
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -40,27 +40,75 @@ md5sum = cbe1d75339c6cb20e1aef818797face1
 output = ${buildout:directory}/schema.json
 mode = 0644
 
+[networkcache]
+# signature certificates of the following uploaders.
+#   Romain Courteaud
+#   Sebastien Robin
+#   Kazuhiko Shiozaki
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
+  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
+  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
+  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
+  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
+  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
+  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
+  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
+  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
+  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
+  QUUGLQ==
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
+  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
+  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
+  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
+  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
+  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
+  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
+  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
+  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
+  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
+  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
+  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
+  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
+  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
+  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
+  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
+  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
+  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
+  vaZhjNYKWQf79l6zXfOvphzJ
+  -----END CERTIFICATE-----
+
+[erp5]
+revision = 7d57428a5cfd0fceed70acb9e86cf274558d606c
+
 [versions]
 MySQL-python = 1.2.3
 Paste = 1.7.5.1
-PasteScript = 1.7.4.2
+PasteScript = 1.7.5
 Products.CMFActionIcons = 2.1.3
 Products.CMFCalendar = 2.2.2
-Products.CMFCore = 2.2.4
+Products.CMFCore = 2.2.5
 Products.CMFDefault = 2.2.2
 Products.CMFTopic = 2.2.1
 Products.CMFUid = 2.2.1
-Products.DCWorkflowGraph = 0.4nxd001
+Products.DCWorkflowGraph = 0.4.1
 Products.ExternalEditor = 1.1.0
-Products.GenericSetup = 1.6.3
+Products.GenericSetup = 1.6.4
 Products.MimetypesRegistry = 2.0.3
-Products.PluggableAuthService = 1.7.5
+Products.PluggableAuthService = 1.7.6
 Products.PluginRegistry = 1.3b1
 Products.TIDStorage = 5.4.7.dev-r45842
 Products.Zelenium = 1.0.3
 StructuredText = 2.11.1
-Werkzeug = 0.7.1
-buildout-versions = 1.6
+Werkzeug = 0.8.1
 cElementTree = 1.0.5-20051216
 chardet = 1.0.1
 cloudooo = 1.2.3
@@ -73,40 +121,40 @@ elementtree = 1.2.7-20070827-preview
 erp5.recipe.cmmiforcei686 = 0.1.3
 erp5diff = 0.8.1.5
 eventlet = 0.9.16
-feedparser = 5.0.1
+feedparser = 5.1
 five.localsitemanager = 2.0.5
 greenlet = 0.3.1
 hexagonit.recipe.cmmi = 1.5.0
 hexagonit.recipe.download = 1.5.0
-http-parser = 0.7.0
-ipdb = 0.6
+http-parser = 0.7.1
+ipdb = 0.6.1
+ipython = 0.11
 meld3 = 0.6.7
 ordereddict = 1.1
 paramiko = 1.7.7.1
 plone.recipe.command = 1.1
 ply = 3.4
-psutil = 0.3.0
-pycrypto = 2.3
-python-ldap = 2.4.3
+psutil = 0.4.0
+python-ldap = 2.4.6
 python-memcached = 1.47
-restkit = 3.3.1
+restkit = 3.3.2
 rtjp-eventlet = 0.3.2
-slapos.cookbook = 0.25
-slapos.recipe.build = 0.6
-slapos.recipe.template = 1.1
+slapos.cookbook = 0.38
+slapos.recipe.build = 0.7
+slapos.recipe.template = 2.2
 threadframe = 0.2
 timerserver = 2.0.2
 urlnorm = 1.1.2
 uuid = 1.30
-validictory = 0.7.1
+validictory = 0.7.2
 xupdate-processor = 0.4
 
 # Required by:
-# slapos.core==0.14
-Flask = 0.7.2
+# slapos.core==0.20
+Flask = 0.8
 
 # Required by:
-# PasteScript==1.7.4.2
+# PasteScript==1.7.5
 # cloudooo==1.2.3
 PasteDeploy = 1.5.0
 
@@ -116,48 +164,60 @@ WSGIUtils = 0.7
 
 # Required by:
 # cloudooo==1.2.3
-# slapos.core==0.14
+# slapos.core==0.20
 argparse = 1.1
 
-# Required by:
-# slapos.recipe.template==1.1
-collective.recipe.template = 1.9
-
 # Required by:
 # SOAPpy==0.12.0nxd001
 fpconst = 0.7.2
 
 # Required by:
-# ipdb==0.6
-ipython = 0.11
-
-# Required by:
-# slapos.cookbook==0.25
+# slapos.cookbook==0.38
 netaddr = 0.7.6
 
 # Required by:
-# slapos.core==0.14
-netifaces = 0.5
+# slapos.core==0.20
+netifaces = 0.6
 
 # Required by:
 # cloudooo==1.2.3
 python-magic = 0.4.0.1
 
 # Required by:
-# slapos.cookbook==0.25
-# slapos.core==0.14
-# zc.buildout==1.5.3-dev-SlapOS-010
+# Products.CMFActionIcons==2.1.3
+# Products.CMFCalendar==2.2.2
+# Products.CMFCore==2.2.5
+# Products.CMFDefault==2.2.2
+# Products.CMFTopic==2.2.1
+# Products.CMFUid==2.2.1
+# Products.DCWorkflow==2.2.3nxd002
+# Products.DCWorkflowGraph==0.4.1
+# Products.ExternalEditor==1.1.0
+# Products.GenericSetup==1.6.4
+# Products.MimetypesRegistry==2.0.3
+# Products.PluggableAuthService==1.7.6
+# Products.PluginRegistry==1.3b1
+# Products.TIDStorage==5.4.7.dev-r45842
+# Products.Zelenium==1.0.3
+# Zope2==2.12.20
+# five.localsitemanager==2.0.5
+# python-ldap==2.4.6
+# slapos.cookbook==0.38
+# slapos.core==0.20
+# zc.buildout==1.6.0-dev-SlapOS-003
 # zc.recipe.egg==1.2.2
+# zope.deprecation==3.4.0
+# zope.structuredtext==3.4.0
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.25
-slapos.core = 0.14
+# slapos.cookbook==0.38
+slapos.core = 0.20
 
 # Required by:
-# slapos.core==0.14
+# slapos.core==0.20
 supervisor = 3.0a10
 
 # Required by:
-# slapos.cookbook==0.25
+# slapos.cookbook==0.38
 xml-marshaller = 0.9.7

software/erp5scalabilitytestbed/instance.cfg

+[buildout]
+parts =
+  erp5-scalability-testbed-instance
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+[erp5-scalability-testbed-instance]
+<= slap_connection
+recipe = slapos.cookbook:erp5scalabilitytestbed
+scalability_tester_binary = ${buildout:bin-directory}/scalability_tester_erp5
+scalability_tester_manager_binary = ${buildout:bin-directory}/nosqltester_manager
+benchmark_suite_path = ${scalability-test-suite:location}

software/erp5scalabilitytestbed/software.cfg

+[buildout]
+recipe_location = ${:parts-directory}/slapos.cookbook
+develop = ${:recipe_location}
+
+extends =
+  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/erp5scalabilitytestbed:/component/lxml-python/buildout.cfg
+
+find-links =
+  http://www.nexedi.org/static/packages/source/slapos.buildout/
+  http://www.nexedi.org/static/packages/source/
+
+parts =
+  template
+  eggs
+  checkrecipe
+  scalability-test-suite
+
+versions = versions
+
+[checkrecipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+
+[slapos.cookbook]
+recipe = plone.recipe.command
+stop-on-error = true
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+command = git clone -b erp5scalabilitytestbed --quiet http://git.erp5.org/repos/slapos.git ${:location}
+update-command = cd ${:location} && git pull --quiet
+
+[eggs]
+dummy = ${slapos.cookbook:location}
+recipe = zc.recipe.egg
+eggs =
+  collective.recipe.template
+  slapos.core
+  slapos.cookbook
+  slapos.tool.nosqltester
+  slapos.tool.nosqltester_manager
+  slapos.tool.nosqltester_manager.plugin.erp5
+  erp5.utils.benchmark
+
+[scalability-test-suite]
+recipe = plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+command = tar -C ${buildout:parts-directory} -zxf /var/tmp/erp5_scalability_test_suite.tar.gz
+update-command = ${:command}
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = 843d97aa6439610ec2d53475e2606581
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[versions]
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-001

software/erp5testnode/software.cfg

@@ -26,7 +26,6 @@ parts =
   subversion
   zip
   git
-  checkrecipe
 
 # Separate from site eggs
 allowed-eggs-from-site-packages =
@@ -45,105 +44,8 @@ allow-hosts =
   psutil.googlecode.com
   www.dabeaz.com
 
-develop =
-  ${:parts-directory}/slapos.cookbook-repository
-  ${:parts-directory}/erp5.util-repository
-
-[checkrecipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link && grep parts ${buildout:develop-eggs-directory}/erp5.util.egg-link
-
-[slapos.cookbook-repository]
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-repository = http://git.erp5.org/repos/slapos.git
-branch = master
-revision = 33e2a6315965925b3585d3dcbe246055bb852cba
-command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
-
-[erp5.util-repository]
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-repository = http://git.erp5.org/repos/erp5.git
-branch = master
-revision = 917d196176e6291d3046abb6177
-command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-009
-
-Jinja2 = 2.6
-Werkzeug = 0.8.1
-buildout-versions = 1.7
-hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3.2
-meld3 = 0.6.7
-plone.recipe.command = 1.1
-slapos.core = 0.19
-slapos.libnetworkcache = 0.10
-slapos.recipe.template = 2.2
-
-# Required by:
-# slapos.core==0.19
-Flask = 0.8
-
-# Required by:
-# slapos.cookbook==0.35  
-PyXML = 0.8.5
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# Required by:
-# slapos.cookbook==0.35  
-netaddr = 0.7.6
-
-# Required by:
-# slapos.core==0.19
-netifaces = 0.6
-
-# Required by:
-# erp5.util==0.3-dev
-# slapos.cookbook==0.35  
-# slapos.core==0.19
-# slapos.libnetworkcache==0.10
-# zc.buildout==1.5.3-dev-SlapOS-009
-setuptools = 0.6c12dev-r88846
-
-# Required by:
-# slapos.core==0.19
-supervisor = 3.0a10
-
-# Required by:
-# slapos.cookbook==0.35  
-xml-marshaller = 0.9.7   
-
-# Required by:
-# slapos.cookbook==0.35  
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.19
-zope.interface = 3.8.0   
-
-
 [eggs]
 recipe = zc.recipe.egg
-# Just so buildout executes [slapos.cookbook-repository] before [eggs], as
-# - [eggs] references [slapos.cookbook-repository]
-# - [instance-recipe] needs [slapos.cookbook-repository] to be finished
-# - we cannot rely on anything else being executed before [eggs]
-dummy =
-  ${slapos.cookbook-repository:location}
-  ${erp5.util-repository:location}
 eggs =
   ${lxml-python:egg}
   zc.buildout
@@ -199,3 +101,62 @@ signature-certificate-list =
   R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
   hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
   -----END CERTIFICATE-----
+
+[versions]
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.6.0-dev-SlapOS-003
+
+Jinja2 = 2.6
+Werkzeug = 0.8.2
+erp5.util = 0.3
+hexagonit.recipe.cmmi = 1.5.0
+lxml = 2.3.2
+meld3 = 0.6.7
+slapos.cookbook = 0.38
+slapos.core = 0.21
+slapos.libnetworkcache = 0.11
+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
+netaddr = 0.7.6
+
+# Required by:
+# slapos.core==0.21
+netifaces = 0.6
+
+# Required by:
+# erp5.util==0.3
+# slapos.cookbook==0.38
+# slapos.core==0.21
+# slapos.libnetworkcache==0.11
+# zc.buildout==1.6.0-dev-SlapOS-003
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.core==0.21
+supervisor = 3.0a12
+
+# Required by:
+# slapos.cookbook==0.38
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.cookbook==0.38
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.21
+zope.interface = 3.8.0

software/ezpublish/software.cfg

@@ -32,7 +32,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/helloworld/instance.cfg

+[buildout]
+parts =
+  dummy
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+[dummy]
+recipe = slapos.recipe.dummy

software/helloworld/software.cfg

+[buildout]
+
+extensions +=
+  mr.developer
+# activates mr.developer
+auto-checkout = *
+versions = versions
+
+find-links += http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+parts =
+  template
+  eggs
+
+unzip = true
+
+[sources]
+# XXX-Cedric : either publish the egg or use mr.developer properly, but DELETE
+# This repository and use slapos.recipe.helloworld.
+slapos.recipe.dummy = git git://github.com/WaterCooled/slapos.recipe.dummy.git
+
+[versions]	
+zc.buildout = 1.5.3-dev-SlapOS-001
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[eggs]
+recipe = zc.recipe.egg
+#eggs = slapos.recipe.helloworld
+eggs = slapos.recipe.dummy

software/java/software.cfg

+[buildout]
+parts =
+  java
+
+versions = versions
+
+[java]
+recipe = slapos.recipe.java

software/joomla/software.cfg

@@ -33,7 +33,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/kumofs/software.cfg

 [buildout]
+extensions =
+  buildout-versions
+
 find-links +=
     http://www.nexedi.org/static/packages/source/slapos.buildout/
 
 extends =
-  ../../component/git/buildout.cfg
   ../../component/kumo/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/stunnel/buildout.cfg
   ../../component/rdiff-backup/buildout.cfg
@@ -17,20 +18,24 @@ 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
 
-parts +=
+parts =
 # Create instance template
-#TODO : list here all parts.
   template
-  libxslt
+  rdiff-backup
+  dcron
+  kumo
+  stunnel
   eggs
   instance-recipe-egg
 
@@ -45,12 +50,10 @@ module = kumofs
 
 [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}
 
@@ -63,18 +66,89 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-slapos.cookbook = 0.13
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.6.0-dev-SlapOS-003
 
-erp5.recipe.cmmiforcei686 = 0.1.1
+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.13
-slapos.core = 0.2
-collective.recipe.template = 1.8
-netaddr = 0.7.5
+# 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
-setuptools = 0.6c12dev-r88795
 
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
+# 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 =
+  -----BEGIN PRIVATE KEY-----
+  MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBANqRqW69hpRtqjuX
+  maEl9cwKPSb/Vu170OUqaNrZYaMnAv1T3pTU8cob5IjuC/HUZiiX/OEIxIsRZuKO
+  H8visw4PQEqSbSKvqOmJONirzXDHyye0Sf9yDRyEubAzbRjsP7wQabAkHhvsUGTK
+  dALIIhoAVTGkDBMryxqMJ9MHzyLjAgMBAAECgYEAmtszIUvUqxsbzob1iTBc+wiS
+  FSw6CZ58/bDTg6Mawz6jppqii+5ntRuYCtAl1Fv5WW998m6E2kclDwVFT+45j0AO
+  JroHGY74Egy54Wl7D2hE5ldJKy4LL6bPdM+FQy3S46Ekc7OyStU2LmMmWHdVMlzx
+  p7UQJ8UeE/UiBj5hUBkCQQD23HriV7cuYqJLzP689CWvWFjjJFtpuJBtYve7aqNb
+  DsL5i64H0eMkDyQzYavZfZg7lO9KAy0PbofInXI9owPHAkEA4qkN5MUZQcNb3zRd
+  TtPdA8WWRuArnAN4U3BZPMHu2UQ9U9gWedY2NzzqYGLw4Hx7XH54fRExG2L35LyA
+  zD9wBQJAS42rZn7mJ6I0ffKdvIMUzZfCjLJh7/d27KOvooK+wG3CKtIfT3FjjXO8
+  5qTsDcKsxv+MRSC3t9NiZ3oYrtinnQJBAJBrozynEYbDkaBQ3ztA50xl83DJmT/Z
+  Piv8JAAAmc26G1F3GCsdgIIFwFkV8eE3r+qpcuBNufp3Pvhx26dIrHkCQQDzFZp4
+  VDhTCQQoEBrGXoz6TRzmGfu8VpQZMXdL7O6aGNVqQGfsWQS7Sh+8iXsOi2APTAjr
+  xUL3fZnXAjr6AnZC
+  -----END PRIVATE KEY-----

software/kvm/software.cfg

 [buildout]
+extensions =
+  buildout-versions
+  
 extends =
   ../../component/dcron/buildout.cfg
   ../../component/git/buildout.cfg
@@ -87,7 +90,7 @@ commit = e7363f43443deb9982bdb5c3db50eec475584b06
 repository = https://github.com/desaintmartin/websockify.git
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 git-binary = ${git:location}/bin/git
-command = (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit}) || (rm -fr ${:location}; exit 1)
+command = export GIT_SSL_NO_VERIFY=true; (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit}) || (rm -fr ${:location}; exit 1)
 update-command =
 
 [check-local-eggs]
@@ -117,23 +120,23 @@ mode = 0644
 [versions]
 zc.buildout = 1.5.3-dev-SlapOS-010
 
+slapos.cookbook = 0.37
 Jinja2 = 2.6
 Werkzeug = 0.8.1
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3.1
+lxml = 2.3.2
 meld3 = 0.6.7
 plone.recipe.command = 1.1
-slapos.cookbook = 0.35
 slapos.recipe.template = 2.2
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.core==0.19
+# slapos.core==0.20
 Flask = 0.8
 
 # Required by:
-# slapos.cookbook==0.35
+# slapos.cookbook==0.37
 PyXML = 0.8.4
 
 # Required by:
@@ -141,11 +144,11 @@ PyXML = 0.8.4
 hexagonit.recipe.download = 1.5.0
 
 # Required by:
-# slapos.cookbook==0.35
+# slapos.cookbook==0.37
 netaddr = 0.7.6
 
 # Required by:
-# slapos.core==0.19
+# slapos.core==0.20
 netifaces = 0.6
 
 # Required by:
@@ -153,28 +156,28 @@ netifaces = 0.6
 numpy = 1.6.1
 
 # Required by:
-# slapos.cookbook==0.35
-# slapos.core==0.19
+# slapos.cookbook==0.37
+# slapos.core==0.20
 # zc.buildout==1.5.3-dev-SlapOS-010
 # zc.recipe.egg==1.3.2
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.35
-slapos.core = 0.19
+# slapos.cookbook==0.37
+slapos.core = 0.20
 
 # Required by:
-# slapos.core==0.19
+# slapos.core==0.20
 supervisor = 3.0a10
 
 # Required by:
-# slapos.cookbook==0.35
+# slapos.cookbook==0.37
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.35
+# slapos.cookbook==0.37
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.19
+# slapos.core==0.20
 zope.interface = 3.8.0
\ No newline at end of file

software/lamp-template-static/software.cfg

 [buildout]
+extensions += buildout-versions
+
 versions = versions
 
 parts =
@@ -9,8 +11,8 @@ parts =
   downloadcache-workaround
 
 extends =
-  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.50:/stack/lamp.cfg
-  http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.50:/stack/shacache-client.cfg
+  ../../stack/lamp.cfg
+  ../../stack/shacache-client.cfg
 
 [application]
 recipe = hexagonit.recipe.download
@@ -33,17 +35,71 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
+zc.buildout = 1.6.0-dev-SlapOS-003
 slapos.cookbook = 0.20
 
-# Temporary fix for slapos-0.50
-[lxml-python]
-find-links += http://pypi.python.org/pypi/lxml/2.3.1
+# Generated by buildout-versions
+Jinja2 = 2.6
+Werkzeug = 0.8.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+hexagonit.recipe.download = 1.5.0
+meld3 = 0.6.8
+plone.recipe.command = 1.1
+slapos.recipe.template = 2.2
+
+# Required by:
+# slapos.core==0.21
+Flask = 0.8
+
+# Required by:
+# slapos.cookbook==0.20
+PyXML = 0.8.4
+
+# Required by:
+# slapos.cookbook==0.20
+# slapos.core==0.21
+# xml-marshaller==0.9.7
+lxml = 2.3.3
+
+# Required by:
+# slapos.cookbook==0.20
+netaddr = 0.7.6
+
+# Required by:
+# slapos.core==0.21
+netifaces = 0.6
+
+# Required by:
+# slapos.cookbook==0.20
+# 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.20
+slapos.core = 0.21
+
+# Required by:
+# slapos.core==0.21
+supervisor = 3.0a12
+
+# Required by:
+# slapos.cookbook==0.20
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.cookbook==0.20
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.21
+zope.interface = 3.8.0
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically

software/lamp-template/software.cfg

@@ -49,7 +49,6 @@ keep-compile-dir = false
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = 
   ${instance-recipe:egg}
 

software/libcloud-requester/instance.cfg

+# Version: 0.0.1
+[buildout]
+parts =
+  libcloud-requester
+
+# instance shall be offline
+offline = true
+eggs-directory = ${software_definition:software_home}/eggs
+develop-eggs-directory = ${software_definition:software_home}/develop-eggs
+
+[libcloud-requester]
+# slap connection information
+slap_computer_id = ${slap_computer_id}
+slap_computer_partition_id = ${slap_computer_partition_id}
+slap_server_url = ${slap_server_url}
+slap_software_release_url = ${slap_software_release_url}
+
+# select recipe
+recipe = slapos.recipe.libcloudrequest

software/libcloud-requester/software.cfg

+# Version: 0.0.1
+[buildout]
+parts =
+  workaround-downloadcache
+  libcloudrequestertemplate
+  eggs
+
+find-links =
+    http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+versions = versions
+[workaround-downloadcache]
+recipe = plone.recipe.command
+command =
+ rm -rf ${buildout:directory}/downloads
+update-command = ${:command}
+
+[libcloudrequestertemplate]
+recipe = slapos.recipe.hrdownload
+url = ${:_profile_base_location_}/instance.cfg
+filename = template.cfg
+destination = ${buildout:directory}
+download-only = true
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  slapos.recipe.libcloudrequest
+
+[versions]
+zc.buildout = 1.5.3-dev-SlapOS-001

software/libcloud/instance.cfg

+# Version: 0.0.4dev
+[buildout]
+parts =
+  libcloud-instance
+
+# instance shall be offline
+offline = true
+eggs-directory = ${software_definition:software_home}/eggs
+develop-eggs-directory = ${software_definition:software_home}/develop-eggs
+
+[libcloud-instance]
+# slap connection information
+slap_computer_id = ${slap_computer_id}
+slap_computer_partition_id = ${slap_computer_partition_id}
+slap_server_url = ${slap_server_url}
+slap_software_release_url = ${slap_software_release_url}
+
+# select recipe
+recipe = slapos.recipe.libcloud
+
+server_binary = ${software_definition:software_home}/bin/cloudmgr

software/libcloud/software.cfg

+# Version: 0.0.5dev
+[buildout]
+parts =
+  workaround-downloadcache
+  libcloudtemplate
+  paramiko-wrokaround-dependency
+  paramiko-wrokaround
+  eggs
+
+versions = paramiko-workaround-versions
+
+[paramiko-workaround-versions]
+paramiko = 1.7.6
+
+[paramiko-wrokaround-dependency]
+recipe = zc.recipe.egg
+eggs =
+  pycrypto
+
+[paramiko-wrokaround]
+recipe = zc.recipe.egg
+index =
+eggs =
+  paramiko
+
+[workaround-downloadcache]
+recipe = plone.recipe.command
+command =
+ rm -rf ${buildout:directory}/downloads
+update-command = ${:command}
+
+[libcloudtemplate]
+recipe = slapos.recipe.hrdownload
+url =
+filename = template.cfg
+destination = ${buildout:directory}
+download-only = true
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  slapos.tool.cloudmgr
+  slapos.recipe.libcloud

software/magento/software.cfg

@@ -31,7 +31,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/mysql-5.1/software.cfg

 [buildout]
+extensions =
+  buildout-versions
 find-links +=
     http://www.nexedi.org/static/packages/source/slapos.buildout/
 
 extends =
-  ../../component/mysql-5.1/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/mysql-5.1/buildout.cfg
   ../../component/perl/buildout.cfg
-  ../../component/xtrabackup/buildout.cfg
   ../../component/rdiff-backup/buildout.cfg
-  ../../component/lxml-python/buildout.cfg
+  ../../component/stunnel/buildout.cfg
+  ../../component/xtrabackup/buildout.cfg
   ../../stack/shacache-client.cfg
 
 # Use only quite well working sites.
@@ -19,23 +20,27 @@ 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
 
-parts +=
-#TODO : list here all parts.
-# Create instance template
+parts =
   template
-  libxslt
+  rdiff-backup
+  stunnel
+  logrotate
+  xtrabackup
+  dcron
+  mysql-5.1
   eggs
   instance-recipe-egg
-  rdiff-backup
 
 # XXX: Workaround of SlapOS limitation
 # Unzippig of eggs is required, as SlapOS do not yet provide nicely working
@@ -48,12 +53,10 @@ 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}
 
@@ -66,60 +69,55 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-zc.buildout = 1.5.3-dev-SlapOS-009
+zc.buildout = 1.6.0-dev-SlapOS-003
+# Use old cookbook version
 slapos.cookbook = 0.13
 
 Jinja2 = 2.6
-Werkzeug = 0.7.1
+Werkzeug = 0.8.2
+buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
-meld3 = 0.6.7
+hexagonit.recipe.download = 1.5.0
+meld3 = 0.6.8
 rdiff-backup = 1.0.5
-slapos.recipe.template = 1.1
+slapos.recipe.template = 2.2
 
 # Required by:
-# slapos.core==0.14
-Flask = 0.7.2
+# slapos.core==0.21
+Flask = 0.8
 
 # Required by:
 # slapos.cookbook==0.13
 PyXML = 0.8.4
 
-# Required by:
-# slapos.recipe.template==1.1
-collective.recipe.template = 1.9
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
 # Required by:
 # slapos.cookbook==0.13
-# slapos.core==0.14
+# slapos.core==0.21
 # xml-marshaller==0.9.7
-lxml = 2.3
+lxml = 2.3.3
 
 # Required by:
 # slapos.cookbook==0.13
 netaddr = 0.7.6
 
 # Required by:
-# slapos.core==0.14
-netifaces = 0.4
+# slapos.core==0.21
+netifaces = 0.6
 
 # Required by:
 # slapos.cookbook==0.13
-# slapos.core==0.14
-# zc.buildout==1.5.3-dev-SlapOS-009
+# 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.13
-slapos.core = 0.14
+slapos.core = 0.21
 
 # Required by:
-# slapos.core==0.14
-supervisor = 3.0a10
+# slapos.core==0.21
+supervisor = 3.0a12
 
 # Required by:
 # slapos.cookbook==0.13
@@ -130,5 +128,26 @@ xml-marshaller = 0.9.7
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.14
-zope.interface = 3.7.0
\ No newline at end of file
+# slapos.core==0.21
+zope.interface = 3.8.0
+
+[networkcache]
+# Cedric de Saint Martin signature certificate
+signature-certificate-list =
+  -----BEGIN PRIVATE KEY-----
+  MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBANqRqW69hpRtqjuX
+  maEl9cwKPSb/Vu170OUqaNrZYaMnAv1T3pTU8cob5IjuC/HUZiiX/OEIxIsRZuKO
+  H8visw4PQEqSbSKvqOmJONirzXDHyye0Sf9yDRyEubAzbRjsP7wQabAkHhvsUGTK
+  dALIIhoAVTGkDBMryxqMJ9MHzyLjAgMBAAECgYEAmtszIUvUqxsbzob1iTBc+wiS
+  FSw6CZ58/bDTg6Mawz6jppqii+5ntRuYCtAl1Fv5WW998m6E2kclDwVFT+45j0AO
+  JroHGY74Egy54Wl7D2hE5ldJKy4LL6bPdM+FQy3S46Ekc7OyStU2LmMmWHdVMlzx
+  p7UQJ8UeE/UiBj5hUBkCQQD23HriV7cuYqJLzP689CWvWFjjJFtpuJBtYve7aqNb
+  DsL5i64H0eMkDyQzYavZfZg7lO9KAy0PbofInXI9owPHAkEA4qkN5MUZQcNb3zRd
+  TtPdA8WWRuArnAN4U3BZPMHu2UQ9U9gWedY2NzzqYGLw4Hx7XH54fRExG2L35LyA
+  zD9wBQJAS42rZn7mJ6I0ffKdvIMUzZfCjLJh7/d27KOvooK+wG3CKtIfT3FjjXO8
+  5qTsDcKsxv+MRSC3t9NiZ3oYrtinnQJBAJBrozynEYbDkaBQ3ztA50xl83DJmT/Z
+  Piv8JAAAmc26G1F3GCsdgIIFwFkV8eE3r+qpcuBNufp3Pvhx26dIrHkCQQDzFZp4
+  VDhTCQQoEBrGXoz6TRzmGfu8VpQZMXdL7O6aGNVqQGfsWQS7Sh+8iXsOi2APTAjr
+  xUL3fZnXAjr6AnZC
+  -----END PRIVATE KEY-----
+

software/net2ftp/software.cfg

@@ -53,7 +53,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs =
     ${mysql-python:egg}
     ${instance-recipe:egg}

software/nosqltestbed/instance.cfg

+[buildout]
+parts =
+  kumoinstance
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+[kumoinstance]
+<=slap_connection
+recipe = slapos.cookbook:nosqltestbed
+manager_binary = ${kumo:location}/bin/kumo-manager
+server_binary = ${kumo:location}/bin/kumo-server
+gateway_binary = ${kumo:location}/bin/kumo-gateway
+nosqltester_binary = ${buildout:bin-directory}/nosqltester
+memstrike_binary = ${memstrike:location}/bin/memstrike
+nosqltester_manager_binary = ${buildout:bin-directory}/nosqltester_manager

software/nosqltestbed/software.cfg

+[buildout]
+recipe_location = ${:parts-directory}/slapos.cookbook
+develop = ${:recipe_location}
+
+extends =
+  ../../component/kumo/buildout.cfg
+  ../../component/memstrike/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+
+find-links =
+  http://www.nexedi.org/static/packages/source/slapos.buildout/
+  http://www.nexedi.org/static/packages/source/
+
+parts =
+  template
+  eggs
+  kumo
+  memstrike
+  checkrecipe
+
+versions = versions
+
+# separate from system python
+include-site-packages = false
+exec-sitecustomize = false
+allowed-eggs-from-site-packages =
+
+[kumo]
+environment += CXXFLAGS=-DKUMO_IPV6
+
+[checkrecipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+
+[slapos.cookbook]
+recipe = plone.recipe.command
+stop-on-error = true
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+command = ${git:location}/bin/git clone -b nosqltestbed --quiet http://git.erp5.org/repos/slapos.git ${:location}
+update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
+
+[eggs]
+dummy = ${slapos.cookbook:location}
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  PyXML
+  Zope2
+  collective.recipe.template
+  netaddr
+  slapos.core
+  xml_marshaller
+  slapos.cookbook
+  slapos.tool.nosqltester
+  slapos.tool.nosqltester_manager
+  slapos.tool.nosqltester_manager.kumo
+  erp5.utils.benchmark
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = 1c1000ea9829f23a897d256373191df6
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[versions]
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-001

software/openX/software.cfg

@@ -32,7 +32,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/os-commerce/software.cfg

@@ -33,7 +33,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/phpbb/software.cfg

@@ -32,7 +32,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs =
     ${mysql-python:egg}
     ${instance-recipe:egg}

software/phpmyadmin/software.cfg

@@ -43,7 +43,6 @@ module = lamp.simple
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/phpnuke/software.cfg

@@ -44,7 +44,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/pimcore/software.cfg

@@ -32,7 +32,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/piwigo/software.cfg

@@ -44,7 +44,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/piwik/software.cfg

@@ -34,7 +34,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/prestashop/software.cfg

@@ -32,7 +32,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs =
     ${mysql-python:egg}
     ${instance-recipe:egg}

software/proactive/instance.cfg

+[buildout]
+parts =
+  proactive
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+
+[proactive]
+recipe = slapos.recipe.proactive
+
+proactive_location = ${proactive:location}
+java_home = ${java:location}

software/proactive/software.cfg

+[buildout]
+versions = versions
+# Should we use a local version of java.cfg before we change git structure?
+extends = ../java/software.cfg
+
+find-links += http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+parts =
+  template
+  eggs
+  proactive
+  java
+
+unzip = true
+
+[versions]	
+zc.buildout = 1.5.3-dev-SlapOS-001
+
+[proactive]
+recipe = hexagonit.recipe.download
+url = http://www-sop.inria.fr/oasis/amedro/public/PABundle.tar.gz
+#url = http://www.activeeon.com/public_content/releases/ProActive/Scheduling/3.0.3/ProActiveScheduling-3.0.3_server.tar.gz
+#md5sum = 776f78e9058d4b5dc86351bf45305c45
+
+#[java-download]
+#recipe = slapos.recipe.download
+## 64bit self extracting
+##url = http://javadl.sun.com/webapps/download/AutoDL?BundleId=43875
+##md5sum = e4143387e31838a51df76774d102f49a
+## This is jre1.6.0_25 32 bits self-extracting
+#url = http://javadl.sun.com/webapps/download/AutoDL?BundleId=48334
+#md5sum = 377456da9fa4d867d4bdf4c655a16dce
+#
+#[java]
+#recipe = plone.recipe.command
+#location = ${buildout:parts-directory}/${:_buildout_section_name_}
+#command = rm -fr ${:location} && mkdir -p ${:location} && cd ${:location} && /bin/sh ${java-download:target}
+#update-command = ${:command}
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  slapos.recipe.proactive
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+#md5sum = 88fe7e2d1e04618b1b4fcafde683d75a
+output = ${buildout:directory}/template.cfg
+mode = 0644
+

software/pulse/instance.cfg

+[buildout]
+parts =
+  instance
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+[instance]
+recipe = ${instance-recipe:egg}:${instance-recipe:module}
+dcrond_binary = ${dcron:location}/sbin/crond
+httpd_binary = ${apache:location}/bin/httpd
+innobackupex_binary = ${xtrabackup:location}/bin/innobackupex
+mmc_agent_binary = ${mmc_core:location}/bin/mmc-agent
+mysql_binary = ${mysql-5.1:location}/bin/mysql
+mysql_install_binary = ${mysql-5.1:location}/bin/mysql_install_db
+mysql_upgrade_binary = ${mysql-5.1:location}/bin/mysql_upgrade
+mysqld_binary = ${mysql-5.1:location}/libexec/mysqld
+openssl_binary = ${openssl:location}/bin/openssl
+rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
+stunnel_binary = ${stunnel:location}/bin/stunnel
+xtrabackup_binary = ${xtrabackup:location}/bin/xtrabackup_51
\ No newline at end of file

software/pulse/software.cfg

+[buildout]
+slaposcookbook_recipe_location = ${:parts-directory}/slaposcookbook
+develop =
+  ${:slaposcookbook_recipe_location}
+
+extensions =
+  slapos.zcbworkarounds
+  slapos.rebootstrap
+
+find-links +=
+    http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+extends =
+  ../../component/git/buildout.cfg
+  ../../component/openssl/buildout.cfg
+  ../../component/openldap/buildout.cfg
+  ../../component/mysql-5.1/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/stunnel/buildout.cfg
+  ../../component/rdiff-backup/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../component/apache-php/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/python-ldap-python/buildout.cfg
+  ../../component/mysql-python/buildout.cfg
+  ../../component/xtrabackup/buildout.cfg
+  
+#TODO add twisted
+
+# Use only quite well working sites.
+allow-hosts =
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  dist.repoze.org
+  effbot.org
+  github.com
+  peak.telecommunity.com
+  psutil.googlecode.com
+  www.dabeaz.com
+
+versions = versions
+
+parts =
+# Create instance template
+#TODO : list here all parts.
+  template
+  libxslt
+  eggs
+  instance-recipe-egg
+  mmc_core
+  pulse2
+
+# 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]
+# Just so buildout executes [slaposcookbook] before [eggs], as
+# - [eggs] references [slaposcookbook]
+# - [instance-recipe] needs [slaposcookbook] to be finished
+# - we cannot rely on anything else being executed before [instance-recipe]
+slaposcookbook_dummy = ${slaposcookbook:location}
+egg = slapos.cookbook
+module = pulse2
+
+[mmc_core]
+recipe = hexagonit.recipe.cmmi
+url = http://jean.parpaillon.free.fr/pulse2/mmc-3.0.2.tar.gz
+#md5sum = 832f96a6ec4b8fc7cf49b9efd4e89060
+#configure-options = 
+#environment =
+#  PATH=${pkgconfig:location}/bin:%(PATH)s
+#  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
+#  CPPFLAGS =-I${libuuid:location}/include
+#  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
+
+[pulse2]
+recipe = hexagonit.recipe.cmmi
+url = http://jean.parpaillon.free.fr/pulse2/pulse2-1.3.1-78-gde4801e.tar.gz
+#md5sum = 832f96a6ec4b8fc7cf49b9efd4e89060
+#configure-options = --with-ldap-confdir
+#environment = 
+#  PATH=${pkgconfig:location}/bin:%(PATH)s
+#  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
+#  CPPFLAGS =-I${libuuid:location}/include
+#  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
+
+[slaposcookbook]
+recipe = plone.recipe.command
+git_param =--quiet -b pulse
+git = ${git:location}/bin/git
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+stop-on-error = true
+command = ${:git} clone ${:git_param} http://git.erp5.org/repos/slapos.git ${:location} || exit 1;
+update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
+
+[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}
+  ${mysql-python:egg}
+  ${python-ldap-python:egg}
+  Twisted
+  SQLAlchemy
+  pyOpenSSL
+
+[template]
+# Default template for the instance.
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+#md5sum = 837caf9897332a5f70c72438f1dc5bae
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[versions]
+# Required by Pulse2
+SQLAlchemy = 0.6.0
+#slapos.cookbook = 0.4
+
+# Required by slapos.cookbook==0.4
+#slapos.core = 0.2
+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.5.3-dev-SlapOS-001

software/punbb/software.cfg

@@ -43,7 +43,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/sheepdogtestbed/instance.cfg

+[buildout]
+parts =
+  sheepstrikeinstance
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+[sheepstrikeinstance]
+<=slap_connection
+recipe = slapos.recipe.sheepdogtestbed
+nosqltester_binary = ${buildout:bin-directory}/nosqltester
+sheepstrike_binary = ${sheepstrike:location}/bin/sheepstrike
+nosqltester_manager_binary = ${buildout:bin-directory}/nosqltester_manager

software/sheepdogtestbed/software.cfg

+[buildout]
+extends = ../../stack/sheepdogtestbed.cfg
+
+parts +=
+  template
+
+find-links =
+    http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+versions = versions
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = f58328139c7fbaea13a89efc8e6810c1
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[versions]
+zc.buildout = 1.5.3-dev-SlapOS-001

software/simpleMachineForum/software.cfg

@@ -33,7 +33,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/slaprunner/software.cfg

@@ -49,7 +49,7 @@ buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7
 slapos.cookbook = 0.31
-slapos.libnetworkcache = 0.10
+slapos.libnetworkcache = 0.11
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.8
 
@@ -77,7 +77,7 @@ netaddr = 0.7.6
 
 # Required by:
 # slapos.core==0.18
-netifaces = 0.5
+netifaces = 0.6
 
 # Required by:
 # slapos.toolbox==0.8

software/spip/software.cfg

@@ -32,7 +32,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/statusnet/software.cfg

@@ -32,7 +32,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/sugar-crm/software.cfg

@@ -32,7 +32,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/testnode/instance.cfg

+[buildout]
+parts =
+  testnode
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+[testnode]
+recipe = slapos.cookbook:testnode
+
+buildbot_binary = ${buildout:bin-directory}/buildbot
+git_binary = ${git:location}/bin/git
+slapgrid_partition_binary = ${buildout:bin-directory}/slapgrid-cp
+slapgrid_software_binary = ${buildout:bin-directory}/slapgrid-sr
+slapproxy_binary = ${buildout:bin-directory}/slapproxy
+svn_binary = ${subversion:location}/bin/svn
+svnversion_binary = ${subversion:location}/bin/svnversion
+zip_binary = ${zip:location}/bin/zip

software/testnode/software.cfg

+[buildout]
+recipe_location = ${:parts-directory}/slapos.cookbook
+develop = ${:recipe_location}
+versions = versions
+extensions = slapos.rebootstrap
+rebootstrap-section = python2.6
+extends =
+  ../../component/python-2.6/buildout.cfg
+  ../../component/subversion/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../component/git/buildout.cfg
+  ../../component/zip/buildout.cfg
+
+parts =
+  template
+  bootstrap
+  eggs
+  subversion
+  git
+  zip
+  checkrecipe
+
+find-links +=
+  http://www.nexedi.org/static/packages/source/slapos.buildout/
+  http://www.nexedi.org/static/packages/source/
+
+[checkrecipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+
+[slapos.cookbook]
+recipe = plone.recipe.command
+stop-on-error = true
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+command = ${git:location}/bin/git clone -b testnode --quiet http://git.erp5.org/repos/slapos.git ${:location}
+update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = 03451596826e487dc97d81e27a1e7a73
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[bootstrap]
+recipe = zc.recipe.egg
+eggs = zc.buildout
+suffix =
+scripts =
+    buildout=bootstrap2.6
+arguments = sys.argv[1:] + ["bootstrap"]
+
+[rebootstrap]
+section = python2.6
+version = 1
+
+[eggs]
+dummy = ${slapos.cookbook:location}
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  Zope2
+  collective.recipe.template
+  netaddr
+  slapos.slap
+  xml_marshaller
+  PyXML
+  slapos.core
+  slapos.cookbook
+  buildbot
+  Twisted
+entry-points = buildbot=buildbot.scripts.runner:run
+
+[versions]
+zc.buildout = 1.5.3-dev-SlapOS-001
+# only those buildout with Twisted are known to work
+buildbot = 0.7.12
+Twisted = 8.2.0
+# locally fixed PyXML which supports python 2.6
+PyXML = 0.8.4nxd001

software/tiki/software.cfg

@@ -32,7 +32,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/vifib/software.cfg

@@ -4,9 +4,23 @@ extends =
 
 parts +=
   vifib
+  check-slapos.core
+
+develop =
+  ${:parts-directory}/vifib
+
+[check-slapos.core]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/slapos.core.egg-link
 
 [eggs]
-eggs += slapos.core
+dummy =
+  ${vifib:location}
+eggs +=
+  suds
+  slapos.core
 
 [instance-recipe]
 module = vifib
@@ -20,8 +34,7 @@ repository_id_list += vifib/master
 [vifib]
 <= erp5
 repository = http://git.erp5.org/repos/slapos.core.git
-# tag: vifib-0.2
-revision = f42ad28f0aa47d8cdb028ce6a1796eb7ef6f066e
+revision =
 
 [local-bt5-repository]
 # XXX: workaround for zc.buildout bug, as list += ends up with adding new entry

software/wordpress/software.cfg

@@ -41,7 +41,6 @@ module = lamp.request
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [template]

software/xoops/software.cfg

@@ -33,7 +33,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [versions]

software/zencart/software.cfg

@@ -42,7 +42,6 @@ mode = 0644
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs =
     ${mysql-python:egg}
     ${instance-recipe:egg}

stack/erp5.cfg

@@ -31,7 +31,7 @@ allow-hosts =
 
 extends =
 # Exact version of Zope
-  http://svn.zope.org/repos/main/Zope/tags/2.12.19/versions.cfg
+  http://svn.zope.org/repos/main/Zope/tags/2.12.20/versions.cfg
   ../component/logrotate/buildout.cfg
   ../component/dcron/buildout.cfg
   ../component/file/buildout.cfg
@@ -47,11 +47,12 @@ extends =
   ../component/kumo/buildout.cfg
   ../component/libreoffice-bin/buildout.cfg
   ../component/lxml-python/buildout.cfg
-  ../component/maatkit/buildout.cfg
+  ../component/percona-toolkit/buildout.cfg
   ../component/mariadb/buildout.cfg
   ../component/memcached/buildout.cfg
   ../component/mysql-python/buildout.cfg
   ../component/pdftk/buildout.cfg
+  ../component/pycrypto-python/buildout.cfg
   ../component/pysvn-python/buildout.cfg
   ../component/python-2.6/buildout.cfg
   ../component/python-2.7/buildout.cfg
@@ -90,6 +91,7 @@ parts =
   libpng
   ghostscript
   mariadb
+  mroonga-mariadb
   sphinx
   imagemagick
   kumo
@@ -99,6 +101,9 @@ parts =
   tesseract
   hookbox
   bootstrap2.6
+  perl-DBD-mariadb
+  perl-DBI
+  percona-toolkit
   zabbix-agent
   pdftk
   dcron
@@ -219,7 +224,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 stop-on-error = true
 repository = http://git.erp5.org/repos/erp5.git
 branch = master
-revision = f1bc8fdc0e4ce17530b32468c2affda8a6e9e896
+revision =
 command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
 update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
 
@@ -305,7 +310,7 @@ eggs =
   ${lxml-python:egg}
   ${python-ldap-python:egg}
   ${pysvn-python:egg}
-  pycrypto
+  ${pycrypto-python:egg}
   PyXML
   SOAPpy
   cElementTree
@@ -407,7 +412,7 @@ scripts =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
+zc.buildout = 1.6.0-dev-SlapOS-003
 
 # pin Acquisition and Products.DCWorkflow to Nexedi flavour of eggs
 Acquisition = 2.13.7nxd001

stack/lamp.cfg

@@ -30,12 +30,14 @@ extends =
   ../component/git/buildout.cfg
   ../component/glib/buildout.cfg
   ../component/logrotate/buildout.cfg
-  ../component/python-2.7/buildout.cfg
   ../component/lxml-python/buildout.cfg
   ../component/zlib/buildout.cfg
   ../component/stunnel/buildout.cfg  
   ../component/pycrypto-python/buildout.cfg
   ../component/mysql-python/buildout.cfg
+  ../component/python-2.7/buildout.cfg
+# python-2.7 component is here only for compatibility with old software.cfg.
+# It is not needed and should not be used in LAMP-based software.cfg
 
 [eggs]
 recipe = zc.recipe.egg

stack/sheepdogtestbed.cfg

+[buildout]
+extends = 
+  ../component/lxml-python/buildout.cfg
+  ../component/sheepstrike/buildout.cfg
+
+parts =
+  eggs
+  sheepstrike
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  slapos.recipe.sheepdogtestbed
+  slapos.tool.nosqltester
+  slapos.tool.nosqltester_manager
+  slapos.tool.nosqltester_manager.sheepdog