Merge branch 'master' into zimbra

Conflicts:
	component/slapos/buildout.cfg

CHANGES.txt

 Changes
 =======
 
+0.74.0 (2013-03-05)
+-------------------
+
+ * Generate mysql password randomly in LAMP stack. [Alain Takoudjou]
+ * Add support for apache and haproxy to have more than one listening port. [Vincent Pelletier]
+ * Use a more consistent parameter naming in 6tunnel recipe. [Vincent Pelletier]
+ * Provide an SR-transparent way to (de)serialise master data. [Vincent Pelletier]
+ * Initial version of neoppod recipe. [Vincent Pelletier]
+ * Initial version of clusterized erp5 recipes. [Vincent Pelletier]
+ * General cleanup of the request recipe (simpler parsing, less calls to master). [Vincent Pelletier, Cedric de Saint Martin]
+
+0.73.1 (2013-02-19)
+-------------------
+
+ * softwaretype recipe: all falsy parameter values are now ignored. [Cedric de Saint Martin]
+
+0.73.0 (2013-02-18)
+-------------------
+
+ * Add mioga and apacheperl recipes. [Viktor Horvath]
+ * request.py: Properly fetch instance_guid of instance. [Cedric de Saint Martin]
+ * request.py: Only append SLA parameter to the list if the key actually exists and is not empty string. [Cedric de Saint Martin]
+
+0.72.0 (2013-02-11)
+-------------------
+
+ * librecipe: correctly handle newline and missing file in addLineToFile(). [Marco Mariani]
+ * LAMP: Copy php application even if directory exists but is empty. This handle new resilient LAMP stack. [Cedric de Saint Martin]
+ * LAMP: Don't even try to restart/reload/graceful Apache. This fix "Apache hangs" problem. [Cedric de Saint Martin]
+
 0.71.4 (2013-02-01)
 -------------------
+
  * Enable IPv6 support in KumoFS. [Vincent Pelletier]
  * Use new connection and get result when try to create new erp5 site. [Rafael Monnerat]
  * Set up timezone database in mariab's mysql table so that we can use timezone conversion function. [Kazuhiko Shiozaki]
@@ -101,13 +132,13 @@ Changes
     [Antoine Catton]
 
 0.64 (2012-08-27)
-----------------
+-----------------
 
   * Fix: remove "template" recipe which was collinding with slapos.recipe.template.
     [Antoine Catton]
 
 0.63 (2012-08-22)
-----------------
+-----------------
 
   * Add the ability to run command line in shellinabox. [Antoine Catton]
   * Add the ability to run shellinabox as root. (for LXC purpose) [Antoine Catton]
@@ -165,7 +196,7 @@ Changes
   * Add slapmonitor and slapreport recipes. [Mohamadou Mbengue]
 
 0.54.1 (2012-06-18)
------------------
+-------------------
 
   * Fix 0.54 release containing wrong code in request.py.
 
@@ -282,7 +313,7 @@ Changes
    [Cedric de Saint Martin]
 
 0.40.1 (2012-03-01)
------------------
+-------------------
 
  * Fix manifest to include files needed for apache. [Cedric de Saint Martin]
 
@@ -344,7 +375,7 @@ Changes
 -----------------
 
   * LAMP : Recipe can now call lampconfigure from slapos.toolbox which will
-   configure PHP application instance when needed. [Alain Takoudjou Kamdem]
+    configure PHP application instance when needed. [Alain Takoudjou Kamdem]
 
 0.31 (2011-10-16)
 -----------------
@@ -480,7 +511,7 @@ Changes
 -----------------
 
  * Add PHPMyAdmin software release used in SlapOS tutorials
- [Cedric de Saint Martin]
+   [Cedric de Saint Martin]
  * Add slaprunner software release [Cedric de Saint Martin]
 
 

component/6tunnel/buildout.cfg

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

component/apache-perl/buildout.cfg

 [buildout]
-parts = apache-perl
+parts = apache-perl perl-Apache2-Request
 
 extends =
   ../apache/buildout.cfg
@@ -15,7 +15,16 @@ configure-command =
   ${perl:location}/bin/perl Makefile.PL
 configure-options =
   MP_AP_PREFIX=${apache-2.2:location}
+  LIBS="-L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}"
 
+# for mod_apreq2 and Apache2::Request
+[perl-Apache2-Request]
+recipe = slapos.recipe.build:cpan
+modules =
+  I/IS/ISAAC/libapreq2-2.13.tar.gz
+perl = perl
+cpan-configuration =
+  makepl_arg = ('--with-apache2-apxs=${apache-2.2:location}/bin/apxs')
 environment =
-  # CPPFLAGS=-I${libuuid:location}/include
-  MP_CCOPTS=-L${libuuid:location}/lib
+  APR_LDFLAGS = -L${libuuid:location}/lib -Wl,-R${libuuid:location}/lib -L${libexpat:location}/lib -Wl,-R${libexpat:location}/lib -L${apache-2.2:location}/lib -Wl,-R${apache-2.2:location}/lib
+  LDFLAGS=-L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -L${libexpat:location}/lib -Wl,-rpath=${libexpat:location}/lib -L${apache-2.2:location}/lib -Wl,-rpath=${apache-2.2:location}/lib

component/apache-php/buildout.cfg

@@ -15,32 +15,31 @@ extends =
   ../mariadb/buildout.cfg
   ../openldap/buildout.cfg
   ../pkgconfig/buildout.cfg
-  ../zip/buildout.cfg
+  ../zlib/buildout.cfg
+
 
 [apache-php]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = hexagonit.recipe.cmmi
 depends =
   ${mariadb:version}
-url = http://fr2.php.net/distributions/php-5.3.13.tar.gz
-md5sum = 179c67ce347680f468edbfc3c425476a
+url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
+md5sum = 5c7b614242ae12e9cacca21c8ab84818
 configure-options =
   --with-apxs2=${apache:location}/bin/apxs
   --with-libxml-dir=${libxml2:location}
   --with-mysql=${mariadb:location}
   --with-zlib-dir=${zlib:location}
-  --with-bz2-dir=${bzip2:location}
+  --with-bz2=${bzip2:location}
   --with-mcrypt=${libmcrypt:location}
   --with-gd
   --with-jpeg-dir=${libjpeg:location}
   --with-png-dir=${libpng:location}
   --enable-gd-native-ttf
-  --with-ttf
   --with-freetype-dir=${freetype:location}
   --with-pdo-mysql=mysqlnd
   --with-mysqli=mysqlnd
   --with-curl=${curl:location}
-  --with-zip-dir=${zip:location}
   --with-imap=${cclient:location}
   --with-iconv-dir=${libiconv:location}
   --with-gettext=${gettext:location}
@@ -52,10 +51,8 @@ configure-options =
   --enable-session
   --enable-exif
   --enable-zip
-  --enable-bz2
   --enable-ftp
 
-
 # Changing TMPDIR is required for PEAR installation.
 # It will create a pear/temp directory under the SR instead of a shared /tmp/pear/temp.
 # XXX we could mkdir tmp there
@@ -65,26 +62,29 @@ environment =
   PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
   LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid
   TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
-
+  HOME=${apache:location}
 
 
 
 [apache-php-postgres]
-<=apache-php
+# Note: Shall react on each build of apache and reinstall itself
+recipe = hexagonit.recipe.cmmi
+depends =
+   ${postgresql:url}
+url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
+md5sum = 5c7b614242ae12e9cacca21c8ab84818
 configure-options =
   --with-apxs2=${apache:location}/bin/apxs
   --with-libxml-dir=${libxml2:location}
   --with-zlib-dir=${zlib:location}
-  --with-bz2-dir=${bzip2:location}
+  --with-bz2=${bzip2:location}
   --with-mcrypt=${libmcrypt:location}
   --with-gd
   --with-jpeg-dir=${libjpeg:location}
   --with-png-dir=${libpng:location}
   --enable-gd-native-ttf
-  --with-ttf
   --with-freetype-dir=${freetype:location}
   --with-curl=${curl:location}
-  --with-zip-dir=${zip:location}
   --with-imap=${cclient:location}
   --with-iconv-dir=${libiconv:location}
   --with-gettext=${gettext:location}
@@ -96,10 +96,21 @@ configure-options =
   --enable-session
   --enable-exif
   --enable-zip
-  --enable-bz2
   --enable-ftp
   --with-pgsql=${postgresql:location}
 
+# Changing TMPDIR is required for PEAR installation.
+# It will create a pear/temp directory under the SR instead of a shared /tmp/pear/temp.
+# XXX we could mkdir tmp there
+
+environment =
+  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
+  PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
+  LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid
+  TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
+  HOME=${apache:location}
+
+
 
 [libmcrypt]
 recipe = hexagonit.recipe.cmmi

component/apache/buildout.cfg

@@ -21,19 +21,19 @@ md5sum = ffee70a111fd07372982b0550bbb14b7
 
 [apr-util]
 recipe = hexagonit.recipe.download
-version = 1.4.1
+version = 1.5.1
 url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-util-${:version}.tar.bz2
-md5sum = 52b31b33fb1aa16e65ddaefc76e41151
+md5sum = 9c1db8606e520f201c451ec9a0b095f6
 
 [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}
-version = 2.4.3
-revision = 2
+version = 2.4.4
+revision = 1
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 87aaf7bc7e8715f0455997bb8c6791aa
+md5sum = 0e712ee2119cd798c8ae39d5f11a9206
 configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
 configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
                     --disable-static
@@ -120,8 +120,8 @@ make-targets =
 [apache-2.2]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = hexagonit.recipe.cmmi
-url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.22.tar.gz
-md5sum = d77fa5af23df96a8af68ea8114fa6ce1
+url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.24.tar.gz
+md5sum = 64a3392018ad60583209a16d728180d3
 patch-options = -p1
 configure-options = --disable-static
                     --enable-authn-alias
@@ -149,6 +149,7 @@ configure-options = --disable-static
                     --enable-proxy-scgi
                     --enable-dav
                     --enable-dav-fs
+                    --enable-dav-lock
                     --enable-so
                     --enable-ssl
                     --with-included-apr

component/automake/buildout.cfg

@@ -2,12 +2,13 @@
 extends =
   ../autoconf/buildout.cfg
   ../perl/buildout.cfg
+  ../xz-utils/buildout.cfg
 parts =
   automake
 
 [automake]
 recipe = hexagonit.recipe.cmmi
-md5sum = e620cb9e0259159341c0e0d6b712b67a
-url = http://ftp.gnu.org/gnu/automake/automake-1.12.2.tar.gz
+md5sum = 140e084223bf463a24c1a28427c6aec7
+url = http://ftp.gnu.org/gnu/automake/automake-1.12.6.tar.xz
 environment =
-  PATH =${autoconf:location}/bin:${perl:location}/bin:%(PATH)s
+  PATH =${autoconf:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s

component/cloudooo/buildout.cfg

@@ -15,14 +15,10 @@ update-command = ${:command}
 command = grep parts ${buildout:develop-eggs-directory}/cloudooo.egg-link
 
 [cloudooo-repository]
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
+recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/cloudooo.git
 branch = master
-revision =
-command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
+git-executable = ${git:location}/bin/git
 
 [cloudooo]
 recipe = zc.recipe.egg
@@ -44,4 +40,4 @@ scripts =
   paster=cloudooo_paster
   runCloudoooUnitTest
   runCloudoooTestSuite
-ugly-depend-on = ${cloudooo-repository:command} ${cloudooo-repository:update-command} ${cloudooo-check-recipe:command}
+ugly-depend-on = ${cloudooo-repository:recipe} ${cloudooo-repository:repository} ${cloudooo-check-recipe:command}

component/cmake/buildout.cfg

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

component/coreutils/buildout.cfg

 [buildout]
+extends =
+  ../xz-utils/buildout.cfg
 parts =
   coreutils
 
-[coreutils-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 63c2299d92d23e4748abb9668b7e62ea
-download-only = true
-filename = drop.gets.patch
-
 [coreutils]
-virtual-depends = ${coreutils-drop.gets.patch:md5sum}
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.12.tar.gz
-md5sum = fce7999953a67243d00d75cc86dbcaa6
-
-patch-options = -p1
-patches =
-  ${coreutils-drop.gets.patch:location}/${coreutils-drop.gets.patch:filename}
-
+url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.20.tar.xz
+md5sum = 3d69af8f561fce512538a9fe85f147ff
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-install-program=tr,basename,uname,cat,cp,ls
 environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
   LDFLAGS =-Wl,--as-needed

component/coreutils/drop.gets.patch

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

component/curl/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 
 [curl]
 recipe = hexagonit.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.24.0.tar.bz2
-#md5sum = 5f6d50c4d4ee38c57fe37e3cff75adbd
+url = http://curl.haxx.se/download/curl-7.29.0.tar.bz2
+md5sum = fa5f37f38a8042020e292ce7ec5341ce
 configure-options =
   --disable-static
   --disable-ldap

component/cyrus-sasl/buildout.cfg

@@ -4,24 +4,10 @@ parts =
 extends =
   ../zlib/buildout.cfg
 
-[cyrus-sasl-gcc4.4-patch]
-# patch available thanks to Gentoo packagers
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch?revision=1.2
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 5deb4d67b53ecba20c7887fc8fdebee1
-filename = cyrus-sasl-2.1.22-gcc44.patch
-download-only = true
-
 [cyrus-sasl]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.23.tar.gz
-md5sum = 2eb0e48106f0e9cd8001e654f267ecbc
-
-patches =
-  ${cyrus-sasl-gcc4.4-patch:location}/${cyrus-sasl-gcc4.4-patch:filename}
-patch-options =
-  -p1
+url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
+md5sum = a7f4e5e559a0e37b3ffc438c9456e425
 
 configure-options =
   --disable-digest

component/firefox/buildout.cfg

@@ -22,8 +22,8 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-x86 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/linux-i686/fr/firefox-11.0.tar.bz2 a7e9c614ddac993476ef771afaedf568
-x86-64 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/linux-x86_64/fr/firefox-11.0.tar.bz2 b358865c08145211314a62660e871614
+x86 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/18.0.2/linux-i686/en-US/firefox-18.0.2.tar.bz2 9eb4dcf2e9578203a16da3c70817ccb2
+x86-64 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/18.0.2/linux-x86_64/en-US/firefox-18.0.2.tar.bz2 29903172f6fd788f04dbeb27b9193fe6
 
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
@@ -34,9 +34,9 @@ script =
   wrapper = open(wrapper_location, 'w')
   wrapper.write("""#!${dash:location}/bin/dash
   cd %(location)s
-  export LD_LIBRARY_PATH=%(location)s:${libXrender:location}/lib/:${freetype:location}/lib/:${fontconfig:location}/lib/:${libX11:location}/lib/:${bzip2:location}/lib/:${libXext:location}/lib/:${libXt:location}/lib/:${zlib:location}/lib/:${libXcursor:location}/lib/:${gtk-2:location}/lib/:${cairo:location}/lib/:${pango:location}/lib/:${glib:location}/lib/:${atk:location}/lib/:${gdk-pixbuf:location}/lib/:${alsa:location}/lib/:${libpng:location}/lib/:${libSM:location}/lib/:${libICE:location}/lib:${libxml2:location}/lib:${openssl:location}/lib
+  export LD_LIBRARY_PATH=%(location)s:${libXrender:location}/lib/:{dbus:location}/lib/:${dbus-glib:location}/lib/:${freetype:location}/lib/:${fontconfig:location}/lib/:${libX11:location}/lib/:${bzip2:location}/lib/:${libXext:location}/lib/:${libXt:location}/lib/:${zlib:location}/lib/:${libXcursor:location}/lib/:${gtk-2:location}/lib/:${cairo:location}/lib/:${pango:location}/lib/:${glib:location}/lib/:${atk:location}/lib/:${gdk-pixbuf:location}/lib/:${alsa:location}/lib/:${libpng:location}/lib/:${libSM:location}/lib/:${libICE:location}/lib:${libxml2:location}/lib:${openssl:location}/lib
   export PATH=${fontconfig:location}/bin:$PATH
   exec %(location)s/firefox $*""")
   wrapper.close()
-  os.chmod(wrapper_location, 0777)
+  os.chmod(wrapper_location, 0755)
 

component/fontconfig/buildout.cfg

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

component/fonts/buildout.cfg

@@ -14,8 +14,8 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [liberation-fonts]
 recipe = hexagonit.recipe.download
 strip-top-level-dir = true
-url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-1.07.0.tar.gz
-md5sum = 8150db1c6e27cacdfd524b563b85b69e
+url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-2.00.1.tar.gz
+md5sum = 5c781723a0d9ed6188960defba8e91cf
 destination = ${fonts:location}/${:_buildout_section_name_}
 
 # IPAex and IPA Font - Japanese fonts provided by IPA
@@ -23,8 +23,8 @@ destination = ${fonts:location}/${:_buildout_section_name_}
 [ipaex-fonts]
 recipe = hexagonit.recipe.download
 strip-top-level-dir = true
-url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAexfont00103.zip
-md5sum = ac67b2fc3aab7f683d89f0070df284e7
+url = http://ossipedia.ipa.go.jp/ipafont/ipaexfont/IPAexfont00201.php
+md5sum = 7bf84182a04a9632268dbcb03f100d05
 destination = ${fonts:location}/${:_buildout_section_name_}
 
 [ipa-fonts]

component/freetype/buildout.cfg

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

component/gcc/buildout.cfg

@@ -55,13 +55,6 @@ environment =
   PATH=${m4:location}/bin:%(PATH)s
   LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${ppl:location}/lib
 
-[ecj]
-recipe = hexagonit.recipe.download
-download-only = true
-url = ftp://sourceware.org/pub/java/ecj-4.5.jar
-md5sum = d7cd6a27c8801e66cbaa964a039ecfdb
-filename = ecj.jar
-
 [gcc-download]
 hack-revision = ${gcc-interconnection-workaround:hack-revision}
 recipe = hexagonit.recipe.download
@@ -70,15 +63,6 @@ md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
 strip-top-level-dir = True
 destination = ${gcc-source:location}
 
-[gcc-java-download]
-hack-revision = ${gcc-interconnection-workaround:hack-revision}
-recipe = hexagonit.recipe.download
-url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-java-4.5.3.tar.bz2
-md5sum = 08e045fdbdc22ac9af3aec3b8d16dbab
-strip-top-level-dir = True
-destination = ${gcc-source:location}
-ignore-existing = true
-
 [gcc-source]
 hack-revision = ${gcc-interconnection-workaround:hack-revision}
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -90,53 +74,10 @@ url = ${:_profile_base_location_}/${:filename}
 filename = ${:_buildout_section_name_}
 download-only = true
 
-[gcc-java-pre-4.4.patch]
-recipe = hexagonit.recipe.download
-md5sum = 9a563576126d9fcf234ef29c2fc7df76
-url = ${:_profile_base_location_}/${:filename}
-filename = ${:_buildout_section_name_}
-download-only = true
-
-[gcc-java-minimal]
-hack-revision = ${gcc-interconnection-workaround:hack-revision}
-depends =
-  ${gcc-download:location}
-  ${gcc-java-download:location}
-recipe = hexagonit.recipe.cmmi
-path = ${gcc-source:location}
-md5sum = bb3265edf0fa7543e50cedb93e04e427
-patches =
-  ${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
-  ${gcc-java-pre-4.4.patch:location}/${gcc-java-pre-4.4.patch:filename}
-patch-options = -p2
-configure-command = make clean \\; make distclean \\; ./configure
-# GMP does not correctly detect achitecture so it have to be given
-# as hexagonit.recipe.cmmi is using shell expansion in subproceses
-# backticks are working
-configure-options =
-  --disable-bootstrap
-  --enable-languages=java
-  --disable-multilib
-  --with-gmp=${gmp:location}
-  --with-mpfr=${mpfr:location}
-  --with-mpc=${mpc:location}
-  --with-ecj-jar=${ecj:location}/${ecj:filename}
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-  --without-ppl
-  --without-cloog
-
-environment =
-  CPPFLAGS =-I${mpfr:location}/include -I${gmp:location}/include -I${mpc:location}/include
-  LDFLAGS =-L${mpfr:location}/lib -Wl,-rpath=${mpfr:location}/lib -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib
-  PATH=${zip:location}/bin:%(PATH)s
-# make install does not work when several core are used
-make-targets = install -j1
-
 [gcc]
 hack-revision = ${gcc-interconnection-workaround:hack-revision}
 depends =
   ${gcc-download:location}
-  ${gcc-java-download:location}
 recipe = hexagonit.recipe.cmmi
 path = ${gcc-source:location}
 md5sum = bb3265edf0fa7543e50cedb93e04e427
@@ -149,7 +90,7 @@ configure-command = make clean \\; make distclean \\; ./configure
 # backticks are working
 configure-options =
   --disable-bootstrap
-  --enable-languages="c,c++,java"
+  --enable-languages="c,c++"
   --disable-multilib
   --with-gmp=${gmp:location}
   --with-mpfr=${mpfr:location}

component/gettext/buildout.cfg

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

component/gettext/drop.gets.patch

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

component/ghostscript/buildout.cfg

@@ -13,9 +13,12 @@ depends =
   ${libtiff:version}
 configure-options =
   --disable-cups
+  --disable-threadsafe
   --with-system-libtiff
+  --without-libidn
   --without-x
   --with-drivers=FILES
+  --with-fontpath=${ghostscript-fonts:location}
 # it seems that parallel build sometimes fails for ghostscript.
 make-options = -j1
 environment =
@@ -29,5 +32,11 @@ environment =
 
 [ghostscript-9]
 <= ghostscript-common
-url = http://downloads.ghostscript.com/public/ghostscript-9.06.tar.bz2
-md5sum = 46f9ebe40dc52755287b30704270db11
+url = http://downloads.ghostscript.com/public/ghostscript-9.07.tar.bz2
+md5sum = eea27befc1e85bef6d4768202f6b03a5
+
+[ghostscript-fonts]
+recipe = hexagonit.recipe.download
+url = http://downloads.sourceforge.net/project/gs-fonts/gs-fonts/8.11%20%28base%2035%2C%20GPL%29/ghostscript-fonts-std-8.11.tar.gz
+md5sum = 6865682b095f8c4500c54b285ff05ef6
+strip-top-level-dir = true

component/gnutls/buildout.cfg

@@ -24,7 +24,7 @@ environment =
 [gnutls]
 # XXX-Cedric : update to latest gnutls
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/gnutls/gnutls-2.8.6.tar.bz2
+url = ftp://ftp.gnutls.org/gcrypt/gnutls/v2.8/gnutls-2.8.6.tar.bz2
 md5sum = eb0a6d7d3cb9ac684d971c14f9f6d3ba
 configure-options =
   --with-libgcrypt-prefix=${gcrypt:location}

component/grep/buildout.cfg

 [buildout]
 extends =
   ../pcre/buildout.cfg
+  ../xz-utils/buildout.cfg
 parts =
   grep
 
 [grep]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/grep/grep-2.9.tar.gz
-md5sum = 03e3451a38b0d615cb113cbeaf252dc0
+url = http://ftp.gnu.org/gnu/grep/grep-2.14.tar.xz
+md5sum = d4a3f03849d1e17ce56ab76aa5a24cab
 environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${pcre:location}/include
   LDFLAGS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib

component/groonga/buildout.cfg

@@ -5,10 +5,15 @@
 parts =
   groonga
 
+extends =
+  ../pkgconfig/buildout.cfg
+  ../zlib/buildout.cfg
+
 [groonga]
 recipe = hexagonit.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-2.0.6.tar.gz
-md5sum = 64467d1ab8d5e0df8348a636972a95a7
+version = 3.0.1
+url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
+md5sum = fd03bb14a04e7c696151b5673e408701
 configure-options =
   --disable-static
   --disable-glibtest
@@ -16,3 +21,20 @@ configure-options =
   --disable-document
   --disable-groonga-httpd
   --without-mecab
+environment =
+  CPPFLAGS =-I${zlib:location}/include
+  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
+
+[groonga-normalizer-mysql]
+recipe = hexagonit.recipe.cmmi
+version = 1.0.1
+url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz
+md5sum = 93239c856f2e4768562506d440cb4c7d
+location = ${groonga:location}
+depends =
+  ${groonga:version}
+configure-options =
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig

component/gtk-2/buildout.cfg

@@ -20,6 +20,7 @@ url = http://cairographics.org/releases/cairo-1.10.2.tar.gz
 md5sum = f101a9e88b783337b20b2e26dfd26d5f
 configure-options = 
   --enable-tee=yes
+  --enable-xlib=no
 environment = 
   PATH=${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig
@@ -36,7 +37,7 @@ configure-options =
 # XXX-Cedric : Why, god, why do I have to supply the -lXrender option to linker?
 environment = 
   PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig::${libXrender:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
   CPPFLAGS=-I${cairo:location}/include/cairo -I${libX11:location}/include/X11 -I${libxcb:location}/include/xcb -I${libXau:location}/include/X11 -I${bzip2:location}/include -L${libXrender:location}/include -I${zlib:location}/include
   LDFLAGS=-L${cairo:location}/lib -Wl,-rpath=${cairo:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libxcb:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libXau:location}/lib -Wl,-rpath=${libXau:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -lXrender -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
   LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib

component/gzip/buildout.cfg

 [buildout]
+extends =
+  ../xz-utils/buildout.cfg
 parts =
   gzip
 
-[gzip-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = d9b1156f912c8cf006f140482918ebc9
-download-only = true
-filename = drop.gets.patch
-
 [gzip]
-virtual-depends = ${gzip-drop.gets.patch:md5sum}
 recipe = hexagonit.recipe.cmmi
-
-patch-options = -p1
-patches =
-  ${gzip-drop.gets.patch:location}/${gzip-drop.gets.patch:filename}
-
-url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.4.tar.gz
-md5sum = e381b8506210c794278f5527cba0e765
+url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.5.tar.xz
+md5sum = 2a431e169b6f62f7332ef6d47cc53bae
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s

component/imagemagick/buildout.cfg

@@ -13,9 +13,12 @@ extends =
   ../libpng/buildout.cfg
   ../libtiff/buildout.cfg
   ../libtool/buildout.cfg
+  ../libxml2/buildout.cfg
   ../jasper/buildout.cfg
   ../jbigkit/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../webp/buildout.cfg
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
 
 [imagemagick-6.6.6-1-no-gsx-gsc-probe.patch]
@@ -28,11 +31,10 @@ filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
 
 [imagemagick]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.vim.org/ImageMagick/ImageMagick-6.8.1-9.tar.bz2
-md5sum = cde56988f9d2208d9d61815cc23665b4
+url = http://ftp.vim.org/ImageMagick/ImageMagick-6.8.2-6.tar.xz
+md5sum = ee01558201041a9978dd14b1db946ce8
 depends =
   ${libtiff:version}
-  ${librsvg:version}
 configure-options =
   --disable-static
   --without-x
@@ -49,22 +51,21 @@ configure-options =
   --without-lcms
   --without-lcms2
   --without-lqr
-  --without-lzma
   --without-openexr
   --without-pango
+  --without-rsvg
   --without-wmf
-  --without-xml
   --with-bzlib=${bzip2:location}
   --with-zlib=${zlib:location}
   --with-ltdl-include=${libtool:location}/include
   --with-ltdl-lib=${libtool:location}/lib
-  --with-rsvg=${librsvg:location}
+  --with-gs-font-dir=${ghostscript-fonts:location}
   --with-frozenpaths
 patch-options = -p1
 patches =
   ${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:location}/${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:filename}
 environment =
-  PATH=${freetype:location}/bin:${ghostscript:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${librsvg:location}/lib/pkgconfig
-  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib
+  PATH=${freetype:location}/bin:${ghostscript:location}/bin:${librsvg:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
+  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include -I${webp:location}/include
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib

component/java/buildout.cfg

@@ -41,7 +41,7 @@ script =
   (download_dir, filename) = os.path.split(download_file)
   auto_extract_bin = os.path.join(extract_dir, filename)
   shutil.move(download_file, auto_extract_bin)
-  os.chmod(auto_extract_bin, 0777)
+  os.chmod(auto_extract_bin, 0755)
   subprocess.call([auto_extract_bin])
   self.cleanup_dir_list.append(extract_dir)
   workdir = guessworkdir(extract_dir)

component/libpng/buildout.cfg

 [buildout]
 extends =
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -11,6 +12,7 @@ recipe = hexagonit.recipe.cmmi
 configure-options =
   --disable-static
 environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS =-I${zlib:location}/include
   LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 
@@ -21,5 +23,5 @@ md5sum = 717caa58e9c71a80820eb38c4f4d6ec3
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.12.tar.bz2
-md5sum = d87f9c34ccab8242c00e41925839f6c9
+url = http://download.sourceforge.net/libpng/libpng-1.5.14.tar.xz
+md5sum = 94284b01d62ca43c5eb3f6702db08ed8

component/libreoffice-bin/buildout.cfg

@@ -12,15 +12,14 @@ find-links =
 [libreoffice-bin]
 recipe = slapos.recipe.build
 # here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
-version = 3.5.6
-#url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
-url = http://ftp.psu.ac.th/pub/libreoffice/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
+version = 3.6.5
+url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
 # supported architectures md5sums
-md5sum_x86 = 079609188b86ede3b3eebe2b75862b31
-md5sum_x86-64 = 6a559fa9c62c810464254d129bd2dc17
+md5sum_x86 = 9575c9a567d48a9feeaed2f915bfdf7f
+md5sum_x86-64 = 302e326f2b2a524a78994705ea782770
 
 # where office code can be found?
-officedir = libreoffice3.5
+officedir = libreoffice3.6
 
 # script to install
 script =

component/librsvg/buildout.cfg

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

component/libtiff/buildout.cfg

@@ -10,7 +10,7 @@ parts =
 [libtiff]
 recipe = hexagonit.recipe.cmmi
 version = 4.0.3
-url = http://download.osgeo.org/libtiff/tiff-${:version}.tar.gz
+url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz
 md5sum = 051c1068e6a0627f461948c365290410
 configure-options =
   --disable-static

component/libxml2/buildout.cfg

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

component/libxslt/buildout.cfg

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

component/mariadb/buildout.cfg

@@ -25,10 +25,10 @@ download-only = true
 
 [mariadb]
 recipe = hexagonit.recipe.cmmi
-version = 5.5.28a
+version = 5.5.30
 revision = 1
 url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
-md5sum = a2d20a040ef1e49944a4ffe65ed7fefa
+md5sum = 39d4da4dabc8bda012517b3587dee6f8
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0
@@ -62,18 +62,17 @@ environment =
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/
 recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-2.06.tar.gz
-md5sum = 89ce640a57ed8f2161b8358ff4c29c66
+url = http://packages.groonga.org/source/mroonga/mroonga-3.01.tar.gz
+md5sum = 45c302ca45ae0eb4bbc6f3ec5f7f1072
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config
 depends =
   ${mariadb:version}
   ${mariadb:revision}
+  ${groonga-normalizer-mysql:version}
 environment =
   PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga
   LDFLAGS=-L${groonga:location}/lib
-  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
-  CXXFLAGS=-Wno-deprecated
-# CXXFLAGS workaround: avoid depracation warning in order to compile on gcc 4.7+
+  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig:${groonga-normalizer-mysql:location}/lib/pkgconfig

component/noVNC/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 [noVNC]
 recipe = hexagonit.recipe.download
-url = http://cloud.github.com/downloads/kanaka/noVNC/novnc-0.4.tar.gz
-md5sum = 5703d5d46022d8723796dcbbf821ee7f
+# Post-0.4 release from January 2013
+url = http://github.com/kanaka/noVNC/zipball/3b2acc2258d36137a37edfbe0f03a3099189c49d
+md5sum = 0d06abc20e59643e14fefe52b42daf60
 strip-top-level-dir = true

component/openldap/buildout.cfg

@@ -8,8 +8,8 @@ extends =
 
 [openldap]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.32.tgz
-md5sum = 6a3e85cf61860ca5e8a1eba6753dd9d0
+url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.33.tgz
+md5sum = 5adae44897647c15ce5abbff313bc85a
 configure-options =
   --disable-static
   --disable-slapd

component/openssl/buildout.cfg

@@ -29,8 +29,8 @@ download-only = true
 
 [openssl]
 recipe = hexagonit.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.1c.tar.gz
-md5sum = ae412727c8c15b67880aef7bd2999b2e
+url = https://www.openssl.org/source/openssl-1.0.1e.tar.gz
+md5sum = 66bf6f10f060d561929de96f9dfe5b8c
 patch-binary = ${patch:location}/bin/patch
 patches =
   ${openssl-nodoc.patch:location}/${openssl-nodoc.patch:filename}

component/patch/buildout.cfg

 [buildout]
+extends =
+  ../xz-utils/buildout.cfg
 parts =
   patch
 
 [patch]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.gnu.org/gnu/patch/patch-2.6.1.tar.gz
-md5sum = d758eb96d3f75047efc004a720d33daf
+url = ftp://ftp.gnu.org/gnu/patch/patch-2.7.1.tar.xz
+md5sum = e9ae5393426d3ad783a300a338c09b72
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s

component/pcre/buildout.cfg

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

component/percona-toolkit/buildout.cfg

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

component/perl-Crypt-SSLeay/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+  ../../component/openssl/buildout.cfg
+  ../../component/zlib/buildout.cfg
+parts =
+  perl-Crypt-SSLeay
+
+[perl-Crypt-SSLeay]
+recipe = slapos.recipe.build:cpan
+modules =
+  G/GA/GAAS/URI-1.60.tar.gz
+  N/NA/NANIS/Crypt-SSLeay-0.64.tar.gz
+cpan-configuration =
+  make_arg=('OTHERLDFLAGS="-L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${openssl:location}/lib -Wl,-R${openssl:location}/lib"')
+  makepl_arg=('INC=-I${openssl:location}/include')
+environment =
+  OPENSSL_PREFIX=${openssl:location}
+perl = perl
+

component/perl-DBD-Pg/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+  ../postgresql/buildout.cfg
+parts =
+  perl-DBD-Pg
+
+[perl-DBD-Pg]
+recipe = slapos.recipe.build:cpan
+modules =
+  T/TU/TURNSTEP/DBD-Pg-2.19.3.tar.gz
+environment =
+  POSTGRES_HOME=${postgresql:location}
+perl = perl

component/perl-DBD-mariadb/buildout.cfg

@@ -9,9 +9,11 @@ parts =
 [perl-DBD-mariadb]
 recipe = hexagonit.recipe.cmmi
 version = 4.019
+# binary library should be rebuilt when perl is updated.
 depends =
   ${mariadb:version}
   ${perl:version}
+  ${perl:revision}
   ${perl-DBI:version}
 url = http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.019.tar.gz
 md5sum = 566d98ab8ffac9626a31f6f6d455558e

component/perl-DBI/buildout.cfg

@@ -7,8 +7,10 @@ parts =
 [perl-DBI]
 recipe = hexagonit.recipe.cmmi
 version = 1.616
+# binary library should be rebuilt when perl is updated.
 depends =
   ${perl:version}
+  ${perl:revision}
 url = http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-1.616.tar.gz
 md5sum = 799313e54a693beb635b47918458f7c4
 configure-command =

component/perl-Encode-HanExtra/buildout.cfg

@@ -6,8 +6,10 @@ parts =
 
 [perl-Encode-HanExtra]
 recipe = hexagonit.recipe.cmmi
+# binary library should be rebuilt when perl is updated.
 depends =
   ${perl:version}
+  ${perl:revision}
 url = http://search.cpan.org/CPAN/authors/id/A/AU/AUDREYT/Encode-HanExtra-0.23.tar.gz
 md5sum = e1d3bc32c1c8ee304235a06fbcd5d5a4
 configure-command =

component/perl-HTML-Parser/buildout.cfg

@@ -7,8 +7,10 @@ parts =
 
 [perl-HTML-Parser]
 recipe = hexagonit.recipe.cmmi
+# binary library should be rebuilt when perl is updated.
 depends =
   ${perl:version}
+  ${perl:revision}
   ${perl-HTML-Tagset:location}
 url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-3.68.tar.gz
 md5sum = 5550b2da7aa94341f1e8a17a4ac20c68

component/perl-Image-Magick/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+  ../imagemagick/buildout.cfg
+parts = perl-Image-Magick
+
+[perl-Image-Magick_MakefilePL.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 31043e2b79e725d3b251aa09b4549046
+download-only = true
+filename = ${:_buildout_section_name_}
+
+[perl-Image-Magick]
+recipe = hexagonit.recipe.cmmi
+depends =
+  ${perl:version}
+  ${imagemagick:location}
+url = http://search.cpan.org/CPAN/authors/id/J/JC/JCRISTY/PerlMagick-6.77.tar.gz
+md5sum = fa0f66fa0cabbd1b196254f94dec8e99
+patch-options = -p0
+patches =
+  ${perl-Image-Magick_MakefilePL.patch:location}/${perl-Image-Magick_MakefilePL.patch:filename}
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL LIBS="-L${imagemagick:location}/lib -Wl,-R${imagemagick:location}/lib -L${perl:location}/libs-c -Wl,-R${perl:location}/libs-c" INC="-I${imagemagick:location}/include/ImageMagick"

component/perl-Image-Magick/perl-Image-Magick_MakefilePL.patch

+--- Makefile.PL.orig	2012-10-02 14:58:25.537661734 +0200
++++ Makefile.PL	2012-10-02 15:23:32.250928745 +0200
+@@ -156,11 +156,26 @@
+ }
+ 
+ # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
+-my $INC_magick = '-I../ -I.. -pthread -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -pthread -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"';
+-my $LIBS_magick = '-L../magick/.libs -lMagickCore -lperl -lm';
+-my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -pthread";
+-my $LDFLAGS_magick   = "-L../magick/.libs -lMagickCore $Config{'ldflags'} -L/usr/lib";
+-my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} -L/usr/lib";
++my %paths_magick = ();
++foreach my $section ('INC', 'LIBS', 'CCFLAGS', 'LDFLAGS', 'LDDLFLAGS') {
++    $paths_magick{$section} = '';
++}
++{
++    my $i = 0;
++    while ($i <= $#ARGV) {
++        my ($key, $val) = split(/=/, $ARGV[$i], 2);
++        if (exists $paths_magick{$key}) {
++            $paths_magick{$key} = $val;       
++            delete $ARGV[$i];
++        }
++        $i++;
++    }
++}
++# Enforce standard components
++$paths_magick{LIBS}      .= ' -lMagickCore -lperl -lm';
++$paths_magick{CCFLAGS}   .= " $Config{'ccflags'} -fopenmp -g -O2 -Wall -pthread";
++$paths_magick{LDFLAGS}   .= " -lMagickCore $Config{'ldflags'}";
++$paths_magick{LDDLFLAGS} .= " -lMagickCore $Config{'lddlflags'}";
+ 
+ if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) {
+   my($Ipaths, $Lpaths) = AutodetectWin32gcc();
+@@ -168,11 +183,11 @@
+   #
+   # Setup for strawberry perl.
+   #
+-  $INC_magick       = "$Ipaths";
+-  $LIBS_magick      = "-lMagickCore";
+-  $CCFLAGS_magick   = "$Config{'ccflags'}";
+-  $LDFLAGS_magick   = "$Config{'ldflags'} $Lpaths ";
+-  $LDDLFLAGS_magick = "$Config{'lddlflags'} $Lpaths ";
++  $paths_magick{INC}       = "$Ipaths";
++  $paths_magick{LIBS}      = "-lMagickCore";
++  $paths_magick{CCFLAGS}   = "$Config{'ccflags'}";
++  $paths_magick{LDFLAGS}   = "$Config{'ldflags'} $Lpaths ";
++  $paths_magick{LDDLFLAGS} = "$Config{'lddlflags'} $Lpaths ";
+ }
+ 
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+@@ -195,7 +210,7 @@
+    'DEFINE'	=> ' -D_LARGE_FILES=1 -DHAVE_CONFIG_H',     # e.g., '-DHAVE_SOMETHING'
+ 
+    # Header search specfication and preprocessor flags
+-   'INC'	=> $INC_magick,
++   'INC'	=> $paths_magick{INC},
+ 
+    # C compiler
+    #'CC' => 'gcc -std=gnu99 -std=gnu99',
+@@ -204,22 +219,22 @@
+    # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -pthread -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2",
+ 
+    # C compiler flags (e.g. -O -g)
+-   'CCFLAGS' => $CCFLAGS_magick,
++   'CCFLAGS' => $paths_magick{CCFLAGS},
+ 
+    # Linker
+    #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99 -std=gnu99' : $Config{'ld'},
+ 
+    # Linker flags for building an executable
+-   'LDFLAGS' =>  $LDFLAGS_magick,
++   'LDFLAGS' =>  $paths_magick{LDFLAGS},
+ 
+    # Linker flags for building a dynamically loadable module
+-   'LDDLFLAGS' => $LDDLFLAGS_magick,
++   'LDDLFLAGS' => $paths_magick{$LDDLFLAGS},
+ 
+    # Install PerlMagick binary into ImageMagick bin directory
+    'INSTALLBIN'	=> '/usr/local/bin',
+ 
+    # Library specification
+-   'LIBS' => [ $LIBS_magick ],
++   'LIBS' => [ $paths_magick{LIBS} ],
+ 
+    # Perl binary name (if a Perl binary is built)
+    'MAP_TARGET'	=> 'PerlMagick',

component/perl-SGML-Parser-OpenSP/buildout.cfg

@@ -8,8 +8,10 @@ parts =
 
 [perl-SGML-Parser-OpenSP]
 recipe = hexagonit.recipe.cmmi
+# binary library should be rebuilt when perl is updated.
 depends =
   ${perl:version}
+  ${perl:revision}
   ${perl-Class-Accessor:location}
 url = http://search.cpan.org/CPAN/authors/id/B/BJ/BJOERN/SGML-Parser-OpenSP-0.994.tar.gz
 md5sum = b1ee0244e9daa4d37f28cf32c4753691

component/perl-Search-Xapian/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+  ../xapian/buildout.cfg
+parts =
+  perl-Search-Xapian
+
+[perl-Search-Xapian]
+recipe = slapos.recipe.build:cpan
+modules =
+  O/OL/OLLY/Search-Xapian-1.2.10.0.tar.gz
+environment =
+  XAPIAN_CONFIG=${xapian:location}/bin/xapian-config
+perl = perl

component/perl-Term-ReadLine-Gnu/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../readline/buildout.cfg
+parts = perl-Term-ReadLine-Gnu
+
+[perl-Term-ReadLine-Gnu.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = d4e4624e717c8da63e4d153149d57b68
+download-only = true
+filename = ${:_buildout_section_name_}
+
+[perl-Term-ReadLine-Gnu]
+recipe = hexagonit.recipe.cmmi
+depends =
+  ${perl:version}
+url = http://search.cpan.org/CPAN/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.20.tar.gz
+md5sum = fa33510193b89a2ada74fcef00816322
+patch-options = -p0
+patches =
+  ${perl-Term-ReadLine-Gnu.patch:location}/${perl-Term-ReadLine-Gnu.patch:filename}
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL --libdir=${readline:location}/lib --includedir="${readline:location}/include" LIBS="-Wl,-R${readline:location}/lib -L${ncurses:location}/lib -Wl,-R${ncurses:location}/lib" INC="-I${ncurses:location}/include"

component/perl-Term-ReadLine-Gnu/perl-Term-ReadLine-Gnu.patch

+--- Makefile.PL.orig	2012-09-26 16:40:42.922821617 +0200
++++ Makefile.PL	2012-10-02 02:51:26.400659861 +0200
+@@ -22,7 +22,22 @@
+ use Config;
+ use Getopt::Long;
+ use 5.007; use 5.7.0;		# use version 1.09 for older Perl
+-my ($defs, $libs, $lddflags, $RLLIB, $RLINC);
++my ($defs, $lddflags, %config);
++
++{
++    $config{LIBS} = '';
++    $config{INC}  = '';
++
++    my $i = 0;
++    while ($i <= $#ARGV) {
++        my ($key, $val) = split(/=/, $ARGV[$i], 2);
++        $config{$key} = $val;       
++        if ($key eq 'LIBS' || $key eq 'INC') {
++            delete $ARGV[$i];
++        }
++        $i++;
++    }
++}
+ 
+ # exit 0 before creating the Makefile to be CPAN Testers friendly
+ # see http://wiki.cpantester.org/wiki/CPANAuthorNotes
+@@ -36,20 +51,23 @@
+ $defs = ($Config{strings} =~ m|/string.h$|) ? '-DHAVE_STRING_H' : '';
+ 
+ # Parse command line to specify paths for the GNU Readline Library
++# (if they have not already been included within LIBS or INC)
+ {
+     my ($prefix, $libdir, $incdir);
+     GetOptions("prefix=s" => \$prefix,
+ 	       "libdir=s" => \$libdir,
+ 	       "includedir=s" => \$incdir);
+-    $RLLIB = defined $libdir
++    my $RLLIB = defined $libdir
+ 	? "-L$libdir" : (defined $prefix ? "-L$prefix/lib" : '');
+-    $RLINC = defined $incdir
++    my $RLINC = defined $incdir
+ 	? "-I$incdir" : (defined $prefix ? "-I$prefix/include" : '');
++    $config{LIBS} .= " $RLLIB";
++    $config{INC}  .= " $RLINC";
+ }
+ 
+ if ($Config{osname} eq 'os2') {
+     # Check ftp://ftp.math.ohio-state.edu/pub/users/ilya/os2/
+-    $libs = '-lreadline_import';
++    $config{LIBS} .= ' -lreadline_import';
+     $defs .= ' -DOS2_USEDLL';
+     $lddflags = '';
+ } else {
+@@ -60,18 +78,27 @@
+     # Old Cygwin may require setting false (0).
+     my $PREFER_CURSES = $Config{osname} eq 'aix' || $Config{osname} eq 'hpux'
+ 			|| $Config{osname} eq 'cygwin';
+-    my $TERMCAP_LIB = (! $PREFER_CURSES && &search_lib('-ltermcap'))
+-	|| &search_lib('-lncurses')
+-	    || &search_lib('-lcurses');
++    my @lib_dirs = ();
++    # Turn -L<path> parameters into a list of <path>s
++    {
++        foreach my $libopt (split(' ',$config{LIBS})) {
++            if ($libopt =~ m#^-L(.*)$#) {
++                push @lib_dirs, $1;
++            }
++        }
++    }
++    my $TERMCAP_LIB = (! $PREFER_CURSES && &search_lib('-ltermcap', \@lib_dirs))
++	|| &search_lib('-lncurses', \@lib_dirs)
++	    || &search_lib('-lcurses', \@lib_dirs);
+ 
+     unless ($TERMCAP_LIB) {
+ 	warn "Could not find neither libtermcap.a, libncurses.a, or libcurses.\n";
+ 	exit $err;
+     } 
+  
+-    $libs = "-lreadline $TERMCAP_LIB";
++    $config{LIBS} .= " -lreadline $TERMCAP_LIB";
+     # Latest Perl in FreeBSD does not need this hack. (Dec.2002)
+-    $libs .= ' -lcrypt' if ($Config{osname} =~ /freebsd/i);
++    $config{LIBS} .= ' -lcrypt' if ($Config{osname} =~ /freebsd/i);
+     $lddflags = '';
+     # If you are using old Cygwin, enable the following line.
+     #$lddflags = ($Config{osname} =~ /cygwin/i) ? '-static' : '';
+@@ -80,7 +107,7 @@
+ # Check version of  GNU Readline Library (for version 4.2 and before)
+ {
+     my ($rlmajorver, $rlminorver) =
+-	check_readline_version($RLINC, $RLLIB, $defs, $lddflags, $libs);
++	check_readline_version($defs, $lddflags, \%config);
+ 
+     if ($rlmajorver < 4 || $rlmajorver == 4 && $rlminorver <= 2) {
+ 	$defs .= " -DRL_READLINE_VERSION=" .
+@@ -95,15 +122,15 @@
+     (
+      NAME	  => 'Term::ReadLine::Gnu',
+      VERSION_FROM => 'Gnu.pm',
+-     LIBS	  => [ "$RLLIB $libs" ],
+-     LDDLFLAGS	  => "$RLLIB $Config{lddlflags}",
++     LIBS	  => $config{LIBS},
++     LDDLFLAGS	  => $Config{lddlflags},
+      dynamic_lib  => { OTHERLDFLAGS => $lddflags },
+      DEFINE	  => $defs,
+      ($Config{osname} eq 'os2' ?
+       (
+        IMPORTS	  => { xfree => 'emxlibcm.401' }, # Yuck!
+       ) : () ),
+-     INC	  => $RLINC,
++     INC	  => $config{INC},
+      dist	  => { COMPRESS => 'gzip -9f', SUFFIX => 'gz' },
+      clean	  => { FILES => "rlver.c rlver$Config{_exe}" },
+ );
+@@ -122,20 +149,20 @@
+ exit(0);
+ 
+ ########################################################################
+-# Search a library '$lib' in $Config{libpth} directories, and return
++# Search a library '$lib' in the given directories (listref), and return
+ # $lib if exist or undef unless exist.
+ 
+ # ExtUtils::Liblist::ext() do similar job as this subroutine, but it
+ # warns unnecessary messages.
+ sub search_lib {
+-    my ($lib) = @_;
++    my ($lib, $lib_dirs) = @_;
+     unless ($lib =~ /^-l/) {
+ 	warn "search_lib: illegal arguments, \`$lib\'.\n";
+ 	return undef;
+     }
+     my $libbase = 'lib' . substr($lib, 2) . $Config{lib_ext};
+     my $libbase_so = 'lib' . substr($lib, 2) . "." . $Config{so};
+-    foreach (split(' ', $Config{libpth})) {
++    foreach (split(' ', $Config{libpth}), @$lib_dirs) {
+ 	if (-f $_ . '/' . $libbase) {
+ #	    print "$_/$libbase\n";
+ 	    print "Found \`$_/$libbase\'.\n";
+@@ -158,7 +185,7 @@
+ #	RL_VERSION_MINOR
+ # Someday we don't need this subroutine..
+ sub check_readline_version {
+-    my ($RLINC, $RLLIB, $defs, $lddflags, $libs) = @_;
++    my ($defs, $lddflags, $config) = @_;
+     my $frlver = 'rlver.c';
+ 
+     # make temp file
+@@ -172,7 +199,7 @@
+     close(F);
+ 
+     # compile it
+-    my $comp_cmd = "$Config{cc} $RLINC $Config{ccflags} $defs $frlver -o rlver $RLLIB $lddflags $Config{ldflags} $libs";
++    my $comp_cmd = "$Config{cc} $config->{INC} $Config{ccflags} $defs $frlver -o rlver $lddflags $Config{ldflags} $config->{LIBS}";
+     print $comp_cmd, "\n";
+     system($comp_cmd);
+     if ($?) {

component/perl-Text-Iconv/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+  ../libiconv/buildout.cfg
+parts = perl-Text-Iconv
+
+[perl-Text-Iconv]
+recipe = slapos.recipe.build:cpan
+cpan-configuration =
+  makepl_arg='LIBS="-L${libiconv:location}/lib -Wl,-R${libiconv:location}/lib" INC="-I${libiconv:location}/include"'
+modules =
+  M/MP/MPIOTR/Text-Iconv-1.7.tar.gz
+perl = perl

component/perl-XML-LibXML/buildout.cfg

@@ -10,8 +10,10 @@ parts =
 
 [perl-XML-LibXML]
 recipe = hexagonit.recipe.cmmi
+# binary library should be rebuilt when perl is updated.
 depends =
   ${perl:version}
+  ${perl:revision}
   ${perl-XML-NamespaceSupport:location}
   ${perl-XML-SAX:location}
 url = http://search.cpan.org/CPAN/authors/id/P/PA/PAJAS/XML-LibXML-1.70.tar.gz

component/perl-XML-LibXSLT/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+  ../libxslt/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../zlib/buildout.cfg
+parts = perl-XML-LibXSLT
+
+[perl-XML-LibXSLT]
+recipe = slapos.recipe.build:cpan
+cpan-configuration =
+  makepl_arg='LIBS="-L${libxslt:location}/lib -Wl,-R${libxslt:location}/lib -L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${libxml2:location}/lib -Wl,-R${libxml2:location}/lib" INC="-I${libxslt:location}/include -I${libxml2:location}/include/libxml2"'
+modules =
+  S/SH/SHLOMIF/XML-LibXSLT-1.78.tar.gz
+perl = perl

component/perl/buildout.cfg

@@ -12,13 +12,22 @@ md5sum = 9873a89c969bd5a478434c3b8b2d57d8
 download-only = true
 filename = ${:_buildout_section_name_}
 
+[perl-postmakehook-download]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 7fded8308c1676decf77575c6d6b325f
+download-only = true
+filename = create-libs-symlink.py
+
 [perl]
 recipe = hexagonit.recipe.cmmi
 depends =
   ${gdbm:version}
-version = 5.16.0
+version = 5.16.2
+# increase revision when we need to rebuild binary libraries.
+revision = 1
 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
-md5sum = 15a2f95fb27231e10998240f13acf961
+md5sum = 2818ab01672f005a4e552a713aa27b08
 siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
 patch-options = -p1
 patches =
@@ -30,6 +39,8 @@ configure-command =
     -Dcflags=-I${gdbm:location}/include \
     -Dldflags="-L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib" \
     -Ui_db \
-    -Dnoextensions=ODBM_File
+    -Dnoextensions=ODBM_File \
+    -Dusethreads
 environment =
   PATH=${patch:location}/bin:%(PATH)s
+post-make-hook = ${perl-postmakehook-download:location}/${perl-postmakehook-download:filename}:post_make_hook

component/perl/create-libs-symlink.py

+
+import fnmatch
+import os
+import pprint
+
+
+def post_make_hook(options, buildout):
+  location = options['location']
+  matches = []
+  for root, dirnames, filenames in os.walk(location):
+    for filename in fnmatch.filter(filenames, 'libperl.a'):
+      matches.append(os.path.join(root, filename))
+  nr_matches = len(matches)
+  if nr_matches == 0:
+    print "ERROR - no libperl.* found!"
+    exit
+  elif nr_matches > 1:
+    print "WARNING - several libperl.a found, taking only the first one:", matches.join("\n")
+  
+  # matches[0] is a prefix of "location"
+  # For the symlink, we want the relative path.
+  rel_link = os.path.relpath(os.path.dirname(matches[0]), location)
+  os.symlink(rel_link, os.path.join(location, "libs-c"))
+  print "Created symlink \"libs-c\" to", rel_link

component/pkgconfig/buildout.cfg

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

component/poppler/buildout.cfg

@@ -13,8 +13,8 @@ extends =
 
 [poppler]
 recipe = hexagonit.recipe.cmmi
-md5sum = 28c40266f374e1960a7bcead17d39f96
-url = http://poppler.freedesktop.org/poppler-0.20.3.tar.gz
+md5sum = 3939740201c59c470bc7198003450a20
+url = http://poppler.freedesktop.org/poppler-0.22.2.tar.gz
 depends =
   ${libtiff:version}
 configure-options =

component/postgresql/buildout.cfg

@@ -4,6 +4,7 @@ extends =
   ../readline/buildout.cfg
   ../zlib/buildout.cfg
   ../ncurses/buildout.cfg
+  ../perl/buildout.cfg
 parts = postgresql
 
 
@@ -15,10 +16,10 @@ parts = postgresql
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.postgresql.org/pub/source/v9.1.7/postgresql-9.1.7.tar.bz2
 md5sum = eaf7b67493d59d1a60767ffdfbd65ce9
-configure-options = --with-openssl
+configure-options = --with-openssl --with-perl
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib 
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${perl:location}/libs-c -Wl,-rpath=${perl:location}/libs-c
 
 
 [postgresql92]
@@ -28,5 +29,4 @@ md5sum = 1cc388988e69bf75c6b55d59070100f6
 configure-options = --with-openssl
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib 
-
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${perl:location}/libs-c -Wl,-rpath=${perl:location}/libs-c

component/qemu-kvm/buildout.cfg

+[buildout]
+extends = 
+  ../../component/gnutls/buildout.cfg
+  ../../component/libpng/buildout.cfg
+  ../../component/libuuid/buildout.cfg
+  ../../component/zlib/buildout.cfg
+
+[kvm]
+# Backward compatibility
+<= qemu-kvm
+
+[qemu-kvm]
+recipe = hexagonit.recipe.cmmi
+url = http://downloads.sourceforge.net/project/kvm/qemu-kvm/1.2.0/qemu-kvm-1.2.0.tar.gz
+md5sum = d7b18b673c48abfee65a9c0245df0415
+configure-options =
+  --disable-sdl
+  --disable-xen
+  --enable-vnc-tls
+  --disable-vnc-sasl
+  --disable-curses
+  --disable-curl
+  --enable-kvm
+  --disable-docs
+  --enable-vnc-png
+  --disable-vnc-jpeg
+  --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${zlib:location}/include -I${libpng:location}/include"
+  --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -L${gpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls"
+  --disable-werror
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${gnutls:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig

component/qt/buildout.cfg

@@ -25,7 +25,7 @@ script =
   (download_dir, filename) = os.path.split(download_file)
   auto_extract_bin = os.path.join(extract_dir, filename)
   shutil.move(download_file, auto_extract_bin)
-  os.chmod(auto_extract_bin, 0777)
+  os.chmod(auto_extract_bin, 0755)
   subprocess.call([auto_extract_bin])
   self.cleanup_dir_list.append(extract_dir)
   workdir = guessworkdir(extract_dir)

component/rpm2cpio/buildout.cfg

@@ -3,6 +3,7 @@ parts =
   rpm2cpio
 
 [rpm2cpio]
+# https://github.com/ruda/rpm2cpio
 recipe = slapos.recipe.build:download
-url = https://raw.github.com/ruda/rpm2cpio/e196173f1f6b746463b7398e381b94a42edfa345/rpm2cpio.py
+url = ${:_profile_base_location_}/${:_buildout_section_name_}
 md5sum = c5bb6227d99e1ff5df880f997cbed2e3

component/rpm2cpio/rpm2cpio

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Standalone RPM to CPIO converter
+# Copyright (c) 2012 Rudá Moura
+#
+
+'''Extract cpio archive from RPM package.
+
+rpm2cpio converts the RPM on standard input or first parameter to a CPIO archive on standard output.
+
+Usage:
+rpm2cpio < adjtimex-1.20-2.1.i386.rpm  | cpio -it
+./sbin/adjtimex
+./usr/share/doc/adjtimex-1.20
+./usr/share/doc/adjtimex-1.20/COPYING
+./usr/share/doc/adjtimex-1.20/COPYRIGHT
+./usr/share/doc/adjtimex-1.20/README
+./usr/share/man/man8/adjtimex.8.gz
+133 blocks
+'''
+
+import sys
+import StringIO
+import gzip
+
+RPM_MAGIC = '\xed\xab\xee\xdb'
+GZIP_MAGIC = '\x1f\x8b'
+
+def rpm2cpio(stream_in=sys.stdin, stream_out=sys.stdout):
+    lead = stream_in.read(96)
+    if lead[0:4] != RPM_MAGIC:
+        raise IOError, 'the input is not a RPM package'
+    data = stream_in.read()
+    idx = data.find(GZIP_MAGIC)
+    if idx == -1:
+        raise IOError, 'could not find compressed cpio archive'
+    gzstream = StringIO.StringIO(data[idx:])
+    gzipper = gzip.GzipFile(fileobj=gzstream)
+    data = gzipper.read()
+    stream_out.write(data)
+    
+if __name__ == '__main__':
+    if sys.argv[1:]:
+        try:
+            fin = open(sys.argv[1])
+            rpm2cpio(fin)
+            fin.close()
+        except IOError, e:
+            print 'Error:', sys.argv[1], e
+    else:
+        try:
+            rpm2cpio()
+        except IOError, e:
+            print 'Error:', e

component/rsync/buildout.cfg

+[buildout]
+parts =
+  rsync
+
+[rsync]
+recipe = hexagonit.recipe.cmmi
+url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz
+md5sum = 5ee72266fe2c1822333c407e1761b92b
+make-options =
+  PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}

component/slapos/buildout.cfg

@@ -31,6 +31,7 @@ parts =
 
 find-links =
   http://www.nexedi.org/static/packages/source/slapos.buildout/
+  http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
 
 versions = versions
 
@@ -152,7 +153,7 @@ Flask = 0.9
 
 # Required by:
 # hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.core==0.35

component/sqlite3/buildout.cfg

@@ -5,8 +5,8 @@ parts =
 
 [sqlite3]
 recipe = hexagonit.recipe.cmmi
-url = http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz
-md5sum = c97df403e8a3d5b67bb408fcd6aabd8e
+url = http://www.sqlite.org/sqlite-autoconf-3071502.tar.gz
+md5sum = bcb0ab0b5b30116b2531cfeef3c861b4
 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 = ftp://ftp.stunnel.org/stunnel/archive/4.x/stunnel-4.54.tar.gz
-md5sum = c2b1db99e3ed547214568959a8ed18ac
+url = ftp://ftp.stunnel.org/stunnel/archive/4.x/stunnel-4.55.tar.gz
+md5sum = ebe6670368d30c6a01ca33b9c50cb239
 pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook
 configure-options =
   --enable-ipv6

component/webp/buildout.cfg

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

component/wget/buildout.cfg

 [buildout]
 extends =
   ../openssl/buildout.cfg
+  ../pcre/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
 parts =
   wget
 
-[wget-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 866907ebc89fc2e76b44c519cb84930f
-download-only = true
-filename = drop.gets.patch
-
 [wget]
-virtual-depends = ${wget-drop.gets.patch:md5sum}
-patch-options = -p1
-patches =
-  ${wget-drop.gets.patch:location}/${wget-drop.gets.patch:filename}
-
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/wget/wget-1.13.4.tar.bz2
-md5sum = 12115c3750a4d92f9c6ac62bac372e85
+url = http://ftp.gnu.org/gnu/wget/wget-1.14.tar.xz
+md5sum = 316f6f59292c9098ad81fd54f658c579
 configure-options =
   --enable-ipv6
   --enable-opie
@@ -31,7 +21,7 @@ configure-options =
   --with-zlib-lib=${zlib:location}
 
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib
-  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
+  LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include -I${pcre:location}/include

component/wget/drop.gets.patch

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

component/wkhtmltopdf/buildout.cfg

+[buildout]
+
+extends = 
+  ../fontconfig/buildout.cfg
+  ../xorg/buildout.cfg
+
+parts =
+  wkhtmltopdf
+
+[wkhtmltopdf]
+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_x86-64 = http://wkhtmltopdf.googlecode.com/files/wkhtmltopdf-0.11.0_rc1-static-amd64.tar.bz2
+url_x86 = http://wkhtmltopdf.googlecode.com/files/wkhtmltopdf-0.11.0_rc1-static-i386.tar.bz2
+
+# supported architectures md5sums
+md5sum_x86 = d796cfb66e45673d8f6728b61f34d5e0
+md5sum_x86-64 = 02a2c6963728b69b8e329dcbf1f4c7e1
+
+# script to install.
+script =
+  location = %(location)r
+  self.failIfPathExists(location)
+  import sys
+  ARCH_DIR_MAP = { 'x86': 'x86', 'x86-64': 'x86_64' }
+  WK_SUFIX_MAP = { 'x86': 'i386', 'x86-64': 'amd64' }
+  platform = guessPlatform()
+  url = self.options['url_' + platform]
+  md5sum = self.options['md5sum_' + platform]
+  extract_dir = self.extract(self.download(url, md5sum))
+  shutil.move(extract_dir, location)
+  wrapper_location = os.path.join("%(location)s", "wkhtmltopdf")
+  wrapper = open(wrapper_location, 'w')
+  wrapper.write("""#!${dash:location}/bin/dash
+  cd %(location)s
+  export LD_LIBRARY_PATH=%(location)s:${libXrender:location}/lib/:${fontconfig:location}/lib/:${libX11:location}/lib/:${libXext:location}/lib/
+  export PATH=${fontconfig:location}/bin:$PATH
+  exec %(location)s/wkhtmltopdf-""" + WK_SUFIX_MAP[platform]+ """ $*""")
+  wrapper.close()
+  os.chmod(wrapper_location, 0755)

component/xapian/buildout.cfg

+[buildout]
+parts =
+  xapian
+depends =
+  ../zlib/buildout.cfg
+  ../libuuid/buildout.cfg
+
+[xapian]
+recipe = hexagonit.recipe.cmmi
+url = http://oligarchy.co.uk/xapian/1.2.12/xapian-core-1.2.12.tar.gz
+md5sum = faf33a3945edbe4c848627750856cbeb
+environment =
+  CPPFLAGS = -I${zlib:location}/include -I${libuuid:location}/include
+  LDFLAGS = -L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${libuuid:location}/lib -Wl,-R${libuuid:location}/lib
\ No newline at end of file

component/xorg/buildout.cfg

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

component/xz-utils/buildout.cfg

-[buidout]
+[buildout]
 parts =
   xz-utils
 

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.71.4'
+version = '0.74.1-dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
@@ -70,6 +70,7 @@ setup(name=name,
           'agent = slapos.recipe.agent:Recipe',
           'apache.frontend = slapos.recipe.apache_frontend:Recipe',
           'apache.zope.backend = slapos.recipe.apache_zope_backend:Recipe',
+          'apacheperl = slapos.recipe.apacheperl:Recipe', 
           'apachephp = slapos.recipe.apachephp:Recipe',
           'apacheproxy = slapos.recipe.apacheproxy:Recipe',
           'certificate_authority = slapos.recipe.certificate_authority:Recipe',
@@ -104,6 +105,8 @@ setup(name=name,
           'generic.kumofs = slapos.recipe.generic_kumofs:Recipe',
           'generic.memcached = slapos.recipe.generic_memcached:Recipe',
           'generic.mysql = slapos.recipe.generic_mysql:Recipe',
+          'generic.mysql.wrap_update_mysql = slapos.recipe.generic_mysql:WrapUpdateMySQL',
+          'generic.mysql.wrap_mysqld = slapos.recipe.generic_mysql:WrapMySQLd',
           'generic.varnish = slapos.recipe.generic_varnish:Recipe',
           'generic.zope = slapos.recipe.generic_zope:Recipe',
           'generic.zope.zeo.client = slapos.recipe.generic_zope_zeo_client:Recipe',
@@ -111,6 +114,8 @@ setup(name=name,
           'haproxy = slapos.recipe.haproxy:Recipe',
           'helloworld = slapos.recipe.helloworld:Recipe',
           'importmdb = slapos.recipe.importmdb:Recipe',
+          'ipv4toipv6 = slapos.recipe.6tunnel:FourToSix',
+          'ipv6toipv4 = slapos.recipe.6tunnel:SixToFour',
           'java = slapos.recipe.java:Recipe',
           'kumofs = slapos.recipe.kumofs:Recipe',
           'kvm = slapos.recipe.kvm:Recipe',
@@ -126,9 +131,13 @@ setup(name=name,
           'logrotate.d = slapos.recipe.logrotate:Part',
           'memcached = slapos.recipe.memcached:Recipe',
           'mkdirectory = slapos.recipe.mkdirectory:Recipe',
+          'mioga.instantiate = slapos.recipe.mioga.instantiate:Recipe',
           'mydumper = slapos.recipe.mydumper:Recipe',
           'mysql = slapos.recipe.mysql:Recipe',
           'nbdserver = slapos.recipe.nbdserver:Recipe',
+          'neoppod.admin = slapos.recipe.neoppod:Admin',
+          'neoppod.master = slapos.recipe.neoppod:Master',
+          'neoppod.storage = slapos.recipe.neoppod:Storage',
           'nosqltestbed = slapos.recipe.nosqltestbed:NoSQLTestBed',
           'notifier = slapos.recipe.notifier:Recipe',
           'notifier.callback = slapos.recipe.notifier:Callback',
@@ -141,10 +150,12 @@ setup(name=name,
           'postgres.import = slapos.recipe.postgres.backup:ImportRecipe',
           'proactive = slapos.recipe.proactive:Recipe',
           'publish = slapos.recipe.publish:Recipe',
+          'publish.serialised = slapos.recipe.publish:Serialised',
           'publishurl = slapos.recipe.publishurl:Recipe',
           'pwgen = slapos.recipe.pwgen:Recipe',
           'pwgen.stable = slapos.recipe.pwgen:StablePasswordGeneratorRecipe',
           'request = slapos.recipe.request:Recipe',
+          'request.serialised = slapos.recipe.request:Serialised',
           'requestoptional = slapos.recipe.request:RequestOptional',
           'seleniumrunner = slapos.recipe.seleniumrunner:Recipe',
           'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',
@@ -154,6 +165,7 @@ setup(name=name,
           'simplelogger = slapos.recipe.simplelogger:Recipe',
           'siptester = slapos.recipe.siptester:SipTesterRecipe',
           'slapconfiguration = slapos.recipe.slapconfiguration:Recipe',
+          'slapconfiguration.serialised = slapos.recipe.slapconfiguration:Serialised',
           'slapcontainer = slapos.recipe.container:Recipe',
           'slapmonitor = slapos.recipe.slapmonitor:MonitorRecipe',
           'slapmonitor-xml = slapos.recipe.slapmonitor:MonitorXMLRecipe',
@@ -177,6 +189,7 @@ setup(name=name,
           'xwiki = slapos.recipe.xwiki:Recipe',
           'zabbixagent = slapos.recipe.zabbixagent:Recipe',
           'zeo = slapos.recipe.zeo:Recipe',
+
         ],
         'slapos.recipe.nosqltestbed.plugin': [
           'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',

slapos/recipe/6tunnel/__init__.py

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

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

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

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

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

slapos/recipe/apache_frontend/__init__.py

@@ -85,8 +85,20 @@ class Recipe(BaseSlapRecipe):
     domain_dict = {}
 
     for slave_instance in slave_instance_list:
+      # Sanitize inputs
       backend_url = slave_instance.get("url", None)
       reference = slave_instance.get("slave_reference")
+
+      if slave_instance.haskey("enable_cache"):
+        enable_cache = slave_instance.get("enable_cache", "").upper() in ('1', 'TRUE')
+      else:
+        enable_cache = False
+
+      if slave_instance.haskey("type"):
+        slave_type = slave_instance.get("type", "").lower()
+      else:
+        slave_type = None
+
       # Set scheme (http? https?)
       # Future work may allow to choose between http and https (or both?)
       scheme = 'http://'
@@ -120,13 +132,15 @@ class Recipe(BaseSlapRecipe):
       slave_dict[reference] = "%s%s/" % (scheme, domain)
 
       # Check if we want varnish+stunnel cache.
-      if slave_instance.get("enable_cache", "").upper() in ('1', 'TRUE'):
-        # XXX-Cedric : need to refactor to clean code? (to many variables)
-        rewrite_rule = self.configureVarnishSlave(
-            base_varnish_port, backend_url, reference, service_dict, domain)
-        base_varnish_port += 2
-      else:
-        rewrite_rule = "%s %s" % (domain, backend_url)
+      #if enable_cache:
+      #  # XXX-Cedric : need to refactor to clean code? (to many variables)
+      #  rewrite_rule = self.configureVarnishSlave(
+      #      base_varnish_port, backend_url, reference, service_dict, domain)
+      #  base_varnish_port += 2
+      #else:
+      #  rewrite_rule = "%s %s" % (domain, backend_url)
+      # Temporary forbid activation of cache until it is properly tested
+      rewrite_rule = "%s %s" % (domain, backend_url)
 
       # Finally, if successful, we add the rewrite rule to our list of rules
       if rewrite_rule:
@@ -134,7 +148,7 @@ class Recipe(BaseSlapRecipe):
         # rule structure.
         # So we will have one RewriteMap for normal websites, and one
         # RewriteMap for Zope Virtual Host Monster websites.
-        if slave_instance.get("type", "").lower() in ['zope']:
+        if slave_type in ['zope']:
           rewrite_rule_zope_list.append(rewrite_rule)
           # For Zope, we have another dict containing the path e.g '/erp5/...
           rewrite_rule_path = "%s %s" % (domain, slave_instance.get('path', ''))
@@ -529,7 +543,7 @@ class Recipe(BaseSlapRecipe):
     self._createDirectory(mod_ssl_cache_location)
 
     # Create "custom" apache configuration files if it does not exist.
-    # Note : Those files won't be erased or changed when slapgrid is ran.
+    # Note : Those files won't be erased or changed by slapgrid.
     # It can be freely customized by node admin.
     custom_apache_configuration_directory = os.path.join(
         self.data_root_directory, 'apache-conf.d')
@@ -537,12 +551,14 @@ class Recipe(BaseSlapRecipe):
     # First one is included in the end of the apache configuration file
     custom_apache_configuration_file_location = os.path.join(
         custom_apache_configuration_directory, 'apache_frontend.custom.conf')
-    open(custom_apache_configuration_file_location, 'a')
+    if not os.path.exists(custom_apache_configuration_file_location):
+      open(custom_apache_configuration_file_location, 'w')
     # Second one is included in the virtualhost of apache configuration file
     custom_apache_virtual_configuration_file_location = os.path.join(
         custom_apache_configuration_directory,
         'apache_frontend.virtualhost.custom.conf')
-    open(custom_apache_virtual_configuration_file_location, 'a')
+    if not os.path.exists(custom_apache_virtual_configuration_file_location):
+      open(custom_apache_virtual_configuration_file_location, 'w')
 
     # Create backup of custom apache configuration
     backup_path = self.createBackupDirectory('custom_apache_conf_backup')

slapos/recipe/apache_zope_backend/__init__.py

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

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

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

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

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

slapos/recipe/apache_zope_backend/template/vhost.in

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

slapos/recipe/apacheperl/__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.
+#
+##############################################################################
+import shutil
+import os
+import signal
+from binascii import b2a_uu as uuencode
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+  def install(self):
+    path_list = []
+
+    # Copy application
+#    shutil.rmtree(self.options['htdocs'])
+#    shutil.copytree(self.options['source'],
+#                    self.options['htdocs'])
+
+    # Install apache
+    apache_config = dict(
+      pid_file=self.options['pid-file'],
+      lock_file=self.options['lock-file'],
+      ip=self.options['ip'],
+      port=self.options['port'],
+      error_log=self.options['error-log'],
+      access_log=self.options['access-log'],
+      document_root=self.options['htdocs'],
+    )
+    httpd_conf = self.createFile(self.options['httpd-conf'],
+      self.substituteTemplate(self.getTemplateFilename('apache.in'),
+                              apache_config)
+    )
+    path_list.append(httpd_conf)
+
+    wrapper = self.createPythonScript(self.options['wrapper'],
+        'slapos.recipe.librecipe.execute.execute',
+        [self.options['httpd-binary'], '-f', self.options['httpd-conf'],
+         '-DFOREGROUND']
+    )
+    path_list.append(wrapper)
+
+    if os.path.exists(self.options['pid-file']):
+      # Reload apache configuration
+      with open(self.options['pid-file']) as pid_file:
+        pid = int(pid_file.read().strip(), 10)
+      try:
+        os.kill(pid, signal.SIGUSR1) # Graceful restart
+      except OSError:
+        pass
+
+    return path_list

slapos/recipe/apacheperl/template/apache.in

+# Apache static configuration
+
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule perl_module modules/mod_perl.so
+LoadModule apreq_module modules/mod_apreq2.so
+
+# Basic server configuration
+PidFile "%(pid_file)s"
+Listen [%(ip)s]:%(port)s
+ServerAdmin someone@email
+DefaultType text/plain
+TypesConfig conf/mime.types
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+
+# 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
+
+<Perl>
+  use strict;
+  use warnings;
+  package mytest;
+
+  use Apache2::Const -compile => qw(OK);
+  use Apache2::RequestIO ();
+  use Apache2::RequestRec ();
+
+  use Apache2::Request;
+  use Date::Calc ();
+  use Image::Magick;
+
+  sub test_handler {
+    my ($r) = @_;
+    $r->content_type('text/plain');
+    {
+      my $date = localtime();
+      $r->print("Hello world! Current time: $date\n");
+    }
+    {
+      my $year = (localtime())[5] + 1900;
+      $r->print("Testing Date::Calc: English ordinal for current year is "
+        . Date::Calc::English_Ordinal($year) . "\n");
+    }
+    {
+      my $apreq = new Apache2::Request($r);
+      my $hello = $apreq->param('hello');
+      $r->print("Testing Apache2::Request: The parameter 'hello' is '$hello'\n");
+    }
+    {
+      my $im = new Image::Magick;
+      $r->print("Testing Image::Magick: PerlMagick success: "
+                . Image::Magick->Success . "\n");
+    }
+    return Apache2::Const::OK;
+  }
+</Perl>
+
+<Location />
+  SetHandler perl-script
+  PerlHandler mytest::test_handler
+</Location>
+
+DocumentRoot %(document_root)s
+DirectoryIndex index.html

slapos/recipe/apachephp/__init__.py

@@ -24,26 +24,26 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-
 import shutil
 import os
 import signal
-import subprocess
-
 from binascii import b2a_uu as uuencode
 
 from slapos.recipe.librecipe import GenericBaseRecipe
 
-
 class Recipe(GenericBaseRecipe):
 
   def install(self):
     path_list = []
 
-    # Copy application
-    if not os.path.exists(self.options['htdocs']):
-      shutil.copytree(self.options['source'],
-                      self.options['htdocs'])
+    # Copy application if not already existing
+    htdocs_location = self.options['htdocs']
+    if not (os.path.exists(htdocs_location) and os.listdir(htdocs_location)):
+      try:
+        os.rmdir(htdocs_location)
+      except:
+        pass
+      shutil.copytree(self.options['source'], htdocs_location)
 
     # Install php.ini
     php_ini = self.createFile(os.path.join(self.options['php-ini-dir'],
@@ -118,16 +118,12 @@ class Recipe(GenericBaseRecipe):
         self.substituteTemplate(self.options['template'], application_conf))
       path_list.append(config)
 
-    # Reload apache configuration.
-    # notez-bien: a graceful restart or a SIGUSR1 can somehow hang the apache threads.
-
-    subprocess.call([
-                        self.options['httpd-binary'],
-                        '-f',
-                        self.options['httpd-conf'],
-                        '-k',
-                        'graceful'
-                    ])
-
+    #if os.path.exists(self.options['pid-file']):
+    #  # Reload apache configuration
+    #  with open(self.options['pid-file']) as pid_file:
+    #    pid = int(pid_file.read().strip(), 10)
+    #  try:
+    #    os.kill(pid, signal.SIGUSR1) # Graceful restart
+    #  except OSError:
+    #    pass
     return path_list
-

slapos/recipe/generic_kumofs/__init__.py

@@ -35,6 +35,10 @@ class Recipe(GenericBaseRecipe):
     kumo_server_listen_port = int(self.options['server-listen-port'])
     kumo_gateway_port = int(self.options['gateway-port'])
     path_list = []
+    if 'data-path' in self.options:
+      kumo_server_storage = self.options.get('data-path')
+    else:
+      kumo_server_storage = os.path.join(self.options['data-directory'], "kumodb.tch")
     # XXX: kumo is not storing pid in file, unless it is not running as daemon
     #      but running daemons is incompatible with SlapOS, so there is currently
     #      no way to have Kumo's pid files to rotate logs and send signals to them
@@ -48,7 +52,7 @@ class Recipe(GenericBaseRecipe):
       kumo_server_binary=self.options['kumo-server-binary'],
       kumo_server_ip=ip,
       kumo_server_log=self.options['kumo-server-log'],
-      kumo_server_storage=os.path.join(self.options['data-directory'], "kumodb.tch"),
+      kumo_server_storage=kumo_server_storage,
       kumo_manager_port=kumo_manager_port,
       kumo_server_port=kumo_server_port,
       kumo_server_listen_port=kumo_server_listen_port,

slapos/recipe/generic_mysql/__init__.py

@@ -69,9 +69,16 @@ class Recipe(GenericBaseRecipe):
     mysql_script_list = []
 
     # user defined functions
+    mroonga = self.options.get('mroonga', 'ha_mroonga.so')
+    if mroonga:
+      last_insert_grn_id = "CREATE FUNCTION last_insert_grn_id RETURNS " \
+        "INTEGER SONAME '" + mroonga + "';"
+    else:
+      last_insert_grn_id = ""
     mysql_script_list.append(self.substituteTemplate(
       self.getTemplateFilename('mysql-init-function.sql.in'),
       {
+        'last_insert_grn_id': last_insert_grn_id,
       }
     ))
     # real database
@@ -119,14 +126,13 @@ class Recipe(GenericBaseRecipe):
     )
     path_list.append(mysql_update)
 
-    mysqld_binary = self.options['mysqld-binary']
     mysqld = self.createPythonScript(
       self.options['wrapper'],
       '%s.mysql.runMysql' % __name__,
       [dict(
         mysql_base_directory=self.options['mysql-base-directory'],
         mysql_install_binary=self.options['mysql-install-binary'],
-        mysqld_binary=mysqld_binary,
+        mysqld_binary=self.options['mysqld-binary'],
         data_directory=self.options['data-directory'],
         mysql_binary=mysql_binary,
         socket=socket,
@@ -134,6 +140,7 @@ class Recipe(GenericBaseRecipe):
        )]
     )
     path_list.append(mysqld)
+    environment = dict(PATH='%s' % self.options['bin-directory'])
     # TODO: move to a separate recipe (ack'ed by Cedric)
     if 'backup-script' in self.options:
       # backup configuration
@@ -144,7 +151,6 @@ class Recipe(GenericBaseRecipe):
           '--defaults-file=%s' % mysql_conf_file,
           '--socket=%s' % socket.strip(), '--user=root',
           '--ibbackup=%s'% self.options['xtrabackup-binary']]
-      environment = dict(PATH='%s' % self.options['bin-directory'])
       innobackupex_incremental = self.createPythonScript(self.options['innobackupex-incremental'], 'slapos.recipe.librecipe.execute.executee', [innobackupex_argument_list + ['--incremental'], environment])
       path_list.append(innobackupex_incremental)
       innobackupex_full = self.createPythonScript(self.options['innobackupex-full'], 'slapos.recipe.librecipe.execute.executee', [innobackupex_argument_list, environment])
@@ -204,3 +210,33 @@ class Recipe(GenericBaseRecipe):
       path_list.append(pt_exe)
 
     return path_list
+
+class WrapUpdateMySQL(GenericBaseRecipe):
+  def install(self):
+    return [
+      self.createPythonScript(
+        self.options['output'],
+        __name__ + '.mysql.updateMysql',
+        [{
+          'mysql_upgrade_binary': self.options['binary'],
+          'mysql_binary': self.options['mysql'],
+          'mysql_script_file': self.options['init-script'],
+        }]
+      ),
+    ]
+
+class WrapMySQLd(GenericBaseRecipe):
+  def install(self):
+    return [
+      self.createPythonScript(
+        self.options['output'],
+        __name__ + '.mysql.runMysql',
+        [{
+          'mysqld_binary': self.options['binary'],
+          'configuration_file': self.options['configuration-file'],
+          'data_directory': self.options['data-directory'],
+          'mysql_install_binary': self.options['mysql-install-binary'],
+          'mysql_base_directory': self.options['mysql-base-directory'],
+        }]
+      ),
+    ]

slapos/recipe/generic_mysql/mysql.py

@@ -41,8 +41,18 @@ def updateMysql(args):
   conf = args[0]
   sleep = 30
   is_succeed = False
+  try:
+    script_filename = conf.pop('mysql_script_file')
+  except KeyError:
+    pass
+  else:
+    assert 'mysql_script' not in conf
+    with open(script_filename) as script_file:
+      conf['mysql_script'] = script_file.read()
   while True:
-    mysql_upgrade_list = [conf['mysql_upgrade_binary'], '--no-defaults', '--user=root', '--socket=%s' % conf['socket']]
+    mysql_upgrade_list = [conf['mysql_upgrade_binary'], '--no-defaults', '--user=root']
+    if 'socket' in conf:
+      mysql_upgrade_list.append('--socket=' + 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:
@@ -54,7 +64,9 @@ def updateMysql(args):
         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_list = [conf['mysql_binary'].strip(), '--no-defaults', '-B', '--user=root']
+      if 'socket' in conf:
+        mysql_list.append('--socket=' + conf['socket'])
       mysql = subprocess.Popen(mysql_list, stdin=subprocess.PIPE,
           stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
       result = mysql.communicate(conf['mysql_script'])[0]

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

@@ -22,7 +22,7 @@ slow_query_log
 slow_query_log_file = %(slow_query_log)s
 long_query_time = 1
 max_allowed_packet = 128M
-query_cache_size = 32M
+query_cache_size = 0
 
 plugin-load = ha_mroonga.so;handlersocket.so
 

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

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

slapos/recipe/haproxy/__init__.py

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

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

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

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

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

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

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

slapos/recipe/librecipe/__init__.py

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

slapos/recipe/mioga/instantiate.py

+##############################################################################
+#
+# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import os
+import pprint
+import re
+import shutil
+import signal
+import stat
+import subprocess
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+  """\
+  Configure a Mioga instance:
+
+  - copy over /var and /buildinst directories
+  - call "make install-all"
+  """
+
+  def removeIfExisting(self, filepath):
+    if os.path.isfile(filepath):
+      os.remove(filepath)
+
+  def rsync_dir(self, src, target):
+    if os.path.isdir(src) and not src.endswith('/'):
+      src += '/'
+    cmd = subprocess.Popen(self.options['rsync_bin'] + '/rsync -a --specials '
+                           + src + ' ' + target, 
+                           env=os.environ, shell=True)
+    cmd.communicate()
+    
+
+  # Even if there is a dedicated update(), this is still called sometimes.
+  # So better not trust that and decide for ourselves.
+  def install(self):
+    self.options['admin_password'] = 'test_for_programmatic_setting'
+    # Copy the build/ and var/lib/Mioga2 folders into the instance
+    mioga_location = self.options['mioga_location']
+
+    var_dir = self.options['var_directory']
+    self.rsync_dir(os.path.join(mioga_location, 'var'), var_dir)
+    
+    buildinst_dir = self.options['buildinst_directory']
+    self.rsync_dir(self.options['mioga_buildinst'], buildinst_dir)
+    
+    former_directory = os.getcwd()
+    os.chdir(buildinst_dir)
+
+    vardir = self.options['var_directory']
+    mioga_base = os.path.join(vardir, 'lib', 'Mioga2')
+    fm = FileModifier('conf/Config.xml')
+    fm.modifyParameter('init_sql', 'no') # force_init_sql is set manually everywhere
+    fm.modifyParameter('install_dir', mioga_base)
+    fm.modifyParameter('tmp_dir', os.path.join(mioga_base, 'tmp'))
+    fm.modifyParameter('search_tmp_dir', os.path.join(mioga_base, 'mioga_search'))
+    fm.modifyParameter('maildir', os.path.join(vardir, 'spool', 'mioga', 'maildir'))
+    fm.modifyParameter('maildirerror', os.path.join(vardir, 'spool', 'mioga', 'error'))
+    fm.modifyParameter('mailfifo', os.path.join(vardir, 'spool', 'mioga', 'fifo'))
+    notifier_fifo = os.path.join(vardir, 'spool', 'mioga', 'notifier')
+    fm.modifyParameter('notifierfifo', notifier_fifo)
+    searchengine_fifo = os.path.join(vardir, 'spool', 'mioga', 'searchengine')
+    fm.modifyParameter('searchenginefifo', searchengine_fifo)
+    fm.modifyParameter('dbi_passwd', self.options['db_password'])
+    fm.modifyParameter('db_host', self.options['db_host'])
+    fm.modifyParameter('db_port', self.options['db_port'])
+    fm.modifyParameter('dav_host', self.options['public_ipv6'])
+    fm.modifyParameter('dav_port', self.options['public_ipv6_port'])
+    fm.modifyParameter('bin_dir', self.options['bin_dir'])
+    # db_name, dbi_login are standard
+    fm.save()
+    # Ensure no old data is kept
+    self.removeIfExisting('config.mk')
+    # if os.path.isdir('web/conf/apache'):
+    #   shutil.rmtree('web/conf/apache')
+
+    environ = os.environ
+    environ['PATH'] = ':'.join([self.options['perl_bin'],           # priority!
+                                # Mioga scripts in Makefiles and shell scripts
+                                self.options['bin_dir'],            
+                                self.options['libxslt_bin'],
+                                self.options['libxml2_bin'],
+                                self.options['postgres_bin'],
+                                self.options['rsync_bin'],
+                                environ['PATH'] ])
+    environ['MIOGA_SITEPERL'] = self.options['mioga_siteperl']
+    
+    # Write the Postgres password file
+    pgpassfilepath = os.path.join(self.options['instance_root'], '.pgpass')
+    pgpassfile = open(pgpassfilepath, 'w')
+    pgpassfile.write(':'.join([re.sub(r':', r'\:', self.options['db_host']),
+                               self.options['db_port'],
+                               '*', # could be self.options['db_dbname'] or 'postgres'
+                               self.options['db_username'],
+                               self.options['db_password'] ]) + "\n")
+    pgpassfile.close()
+    os.chmod(pgpassfilepath, stat.S_IRUSR | stat.S_IWUSR)
+    environ['PGPASSFILE'] = pgpassfilepath
+    
+    # We must call "make" in the SAME environment that
+    # "perl Makefile.PL" left!
+
+    cmd = subprocess.Popen(self.options['perl_bin'] + '/perl Makefile.PL disable_check'
+                           + ' && make slapos-instantiation',
+                           env=environ, shell=True)
+    cmd.communicate()
+
+    # Apache configuration!
+    # Take the files that Mioga has prepared, and wrap some standard configuration around it.
+    # TODO: can't we squeeze this somehow into the generic apacheperl recipe?
+    apache_config_mioga = '''
+LoadModule alias_module modules/mod_alias.so
+LoadModule apreq_module modules/mod_apreq2.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+LoadModule authz_default_module modules/mod_authz_default.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule authz_user_module modules/mod_authz_user.so
+LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule dav_module modules/mod_dav.so
+LoadModule dav_fs_module modules/mod_dav_fs.so
+LoadModule dav_lock_module modules/mod_dav_lock.so
+LoadModule deflate_module modules/mod_deflate.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule env_module modules/mod_env.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule perl_module modules/mod_perl.so
+
+# Basic server configuration
+PidFile REPL_PID
+Listen [REPL_IPV6HOST]:REPL_IPV6PORT
+Listen REPL_IPV4HOST:REPL_IPV6PORT
+# Listen [REPL_IPV6]:443 # what about mod_ssl and all that stuff?
+# ServerAdmin someone@email
+
+# Log configuration
+ErrorLog REPL_ERRORLOG
+LogLevel debug
+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 REPL_ACCESSLOG common
+DocumentRoot REPL_DOCROOT
+DirectoryIndex index.html
+DavLockDB REPL_DAVLOCK
+
+Include conf/extra/httpd-autoindex.conf
+'''
+    apache_config_mioga = (apache_config_mioga
+     .replace('REPL_PID', self.options['pid_file'])
+     .replace('REPL_IPV6HOST', self.options['public_ipv6'])
+     .replace('REPL_IPV4HOST', self.options['private_ipv4'])
+     .replace('REPL_IPV6PORT', self.options['public_ipv6_port'])
+     .replace('REPL_ERRORLOG', self.options['error_log'])
+     .replace('REPL_ACCESSLOG', self.options['access_log'])
+     .replace('REPL_DOCROOT', self.options['htdocs'])
+     .replace('REPL_STATIC', os.path.join(mioga_base, 'static')) 
+     .replace('REPL_DAVLOCK', self.options['dav_locks']) )
+
+    mioga_prepared_apache_config_dir = os.path.join(mioga_base, 'conf', 'apache')
+    for filepath in os.listdir(mioga_prepared_apache_config_dir):
+      apache_config_mioga += ("# Read in from "+filepath+"\n" + 
+        open(os.path.join(mioga_prepared_apache_config_dir, filepath)).read() + "\n" )
+    # Internal DAV only accepts its own addresses
+    apache_config_mioga = re.sub(
+      'Allow from localhost', 
+      "Allow from "+self.options['private_ipv4']+"\n\tAllow from "+self.options['public_ipv6'],
+      apache_config_mioga)
+    
+    path_list = []
+    open(self.options['httpd_conf'], 'w').write(apache_config_mioga)
+    # TODO: if that all works fine, put it into a proper template
+    # httpd_conf = self.createFile(self.options['httpd_conf'],
+    #   self.substituteTemplate(self.getTemplateFilename('apache.in'),
+    #                           apache_config)
+    # )
+    path_list.append(os.path.abspath(self.options['httpd_conf']))
+
+    services_dir = self.options['services_dir']
+
+    httpd_wrapper = self.createPythonScript(
+      os.path.join(services_dir, 'httpd_wrapper'),
+      'slapos.recipe.librecipe.execute.execute',
+      [self.options['httpd_binary'], '-f', self.options['httpd_conf'],
+       '-DFOREGROUND']
+    )
+    path_list.append(httpd_wrapper)
+
+    for fifo in [notifier_fifo, searchengine_fifo]:
+      if os.path.exists(fifo):
+        if not stat.S_ISFIFO(os.stat(fifo).st_mode):
+          raise Exception("The file "+fifo+" exists but is not a FIFO.")
+      else:
+        os.mkfifo(fifo, 0600)
+
+    site_perl_bin = os.path.join(self.options['site_perl'], 'bin')
+    mioga_conf_path = os.path.join(mioga_base, 'conf', 'Mioga.conf')
+    notifier_wrapper = self.createPythonScript(
+      os.path.join(services_dir, 'notifier'),
+      'slapos.recipe.librecipe.execute.execute',
+      [ os.path.join(site_perl_bin, 'notifier.pl'),
+        mioga_conf_path ]
+    )
+    path_list.append(notifier_wrapper)
+
+    searchengine_wrapper = self.createPythonScript(
+      os.path.join(services_dir, 'searchengine'),
+      'slapos.recipe.librecipe.execute.execute',
+      [ os.path.join(site_perl_bin, 'searchengine.pl'),
+        mioga_conf_path ]
+    )
+    path_list.append(searchengine_wrapper)
+
+    crawl_fm = FileModifier( os.path.join('bin', 'search', 'crawl_sample.sh') )
+    # TODO: The crawl script will still call the shell command "date"
+    crawl_fm.modify(r'/var/tmp/crawl', self.options['log_dir'] + '/crawl')
+    crawl_fm.modify(r'/var/lib/Mioga2/conf', mioga_base + '/conf')
+    crawl_fm.modify(r'/usr/local/bin/(mioga2_(?:info|crawl|index).pl)', 
+                    site_perl_bin + r"/\g<1>")
+    crawl_path = os.path.join(self.options['bin_dir'], 'crawl.sh')
+    crawl_fm.save(crawl_path)
+    os.chmod(crawl_path, stat.S_IRWXU)
+
+    if os.path.exists(self.options['pid_file']):
+      # Reload apache configuration
+      with open(self.options['pid_file']) as pid_file:
+        pid = int(pid_file.read().strip(), 10)
+      try:
+        os.kill(pid, signal.SIGUSR1) # Graceful restart
+      except OSError:
+        pass
+
+    os.chdir(former_directory)
+    print "Mioga instantiate.py::install finished!"
+    return path_list
+
+
+
+# Copied and adapted from mioga-hooks.py - how to reuse code?
+class FileModifier:
+  def __init__(self, filename):
+    self.filename = filename
+    f = open(filename, 'rb')
+    self.content = f.read()
+    f.close()
+  
+  def modifyParameter(self, key, value):
+    (self.content, count) = re.subn(
+      r'(<parameter[^>]*\sname\s*=\s*"' + re.escape(key) + r'"[^>]*\sdefault\s*=\s*")[^"]*',
+      r"\g<1>" + value,
+      self.content)
+    return count
+
+  def modify(self, pattern, replacement):
+    (self.content, count) = re.subn(pattern, replacement, self.content)
+    return count
+      
+  def save(self, output=""):
+    if output == "":
+      output = self.filename
+    f = open(output, 'w')
+    f.write(self.content)
+    f.close()

slapos/recipe/mysql/__init__.py

@@ -34,9 +34,6 @@ from slapos.recipe.librecipe import filehash
 
 class Recipe(GenericBaseRecipe):
 
-  def _options(self, options):
-    options['password'] = self.generatePassword()
-
   def install(self):
     path_list = []
 

slapos/recipe/neoppod.py

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

slapos/recipe/pbs.py

@@ -25,8 +25,7 @@
 #
 ##############################################################################
 
-from hashlib import sha512
-import inspect
+import hashlib
 import json
 import os
 import signal
@@ -43,33 +42,14 @@ from slapos import slap as slapmodule
 
 def promise(args):
 
-  def failed_ssh(partition, ssh):
+  def failed_ssh():
     sys.stderr.write("SSH Connection failed\n")
-    try:
-      ssh.terminate()
-    except:
-      pass
+    partition = slap.registerComputerPartition(args['computer_id'],
+                                               args['partition_id'])
     partition.bang("SSH Connection failed. rdiff-backup is unusable.")
 
   def sigterm_handler(signum, frame):
-    # Walk up in the stack to get promise local
-    # variables
-    ssh = None
-    for upper_frame in inspect.getouterframes(frame):
-      # Use promise.func_name insteand of 'promise' in order to be
-      # detected by editor if promise func name change.
-      # Else, it's hard to debug this kind of error.
-      if upper_frame[3] == promise.func_name:
-        try:
-          partition = upper_frame[0].f_locals['partition']
-          ssh = upper_frame[0].f_locals['ssh']
-        except KeyError:
-          raise SystemExit("SIGTERM Send too soon.")
-        break
-    # If ever promise function wasn't found in the stack.
-    if ssh is None:
-      raise SystemExit
-    failed_ssh(partition, ssh)
+    failed_ssh()
 
   signal.signal(signal.SIGTERM, sigterm_handler)
 
@@ -78,9 +58,6 @@ def promise(args):
                             key_file=args.get('key_file'),
                             cert_file=args.get('cert_file'))
 
-  partition = slap.registerComputerPartition(args['computer_id'],
-                                             args['partition_id'])
-
   ssh = subprocess.Popen([args['ssh_client'], '%(user)s@%(host)s/%(port)s' % args],
                          stdin=subprocess.PIPE,
                          stdout=open(os.devnull, 'w'),
@@ -97,7 +74,7 @@ def promise(args):
   if ssh.poll() is None:
     return 1
   if ssh.returncode != 0:
-    failed_ssh(partition, ssh)
+    failed_ssh()
   return ssh.returncode
 
 
@@ -108,12 +85,12 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
     path_list = []
 
     url = entry.get('url')
-    if url is None:
-      url = ''
+    if not url:
+      raise ValueError('Missing URL parameter for PBS recipe')
 
     # We assume that thanks to sha512 there's no collisions
-    url_hash = sha512(url).hexdigest()
-    name_hash = sha512(entry['name']).hexdigest()
+    url_hash = hashlib.sha512(url).hexdigest()
+    name_hash = hashlib.sha512(entry['name']).hexdigest()
 
     promise_path = os.path.join(self.options['promises-directory'],
                                 url_hash)

slapos/recipe/postgres/__init__.py

@@ -154,7 +154,7 @@ class Recipe(GenericBaseRecipe):
                 '# TYPE  DATABASE        USER            ADDRESS                 METHOD',
                 '',
                 '# "local" is for Unix domain socket connections only (check unix_socket_permissions!)',
-                'local   all             all                                     ident',
+                'local   all             all                                     trust',
                 'host    all             all             127.0.0.1/32            md5',
                 'host    all             all             ::1/128                 md5',
             ]

slapos/recipe/postgres/backup.py

@@ -63,6 +63,7 @@ class ExportRecipe(GenericBaseRecipe):
                 umask 077
                 %(bin)s/pg_dump \\
                         --host=%(pgdata-directory)s \\
+                        --username postgres \\
                         --format=custom \\
                         --file=%(backup-directory)s/database.dump \\
                         %(dbname)s
@@ -102,6 +103,7 @@ class ImportRecipe(GenericBaseRecipe):
                 #!/bin/sh
                 %(bin)s/pg_restore \\
                         --host=%(pgdata-directory)s \\
+                        --username postgres \\
                         --dbname=%(dbname)s \\
                         --clean \\
                         --no-owner \\

slapos/recipe/publish.py

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

slapos/recipe/request.py

@@ -25,6 +25,8 @@
 #
 ##############################################################################
 import logging
+from slapos.recipe.librecipe import wrap, JSON_SERIALISED_MAGIC_KEY
+import json
 from slapos import slap as slapmodule
 import slapos.recipe.librecipe.generic as librecipe
 import traceback
@@ -87,67 +89,77 @@ class Recipe(object):
 
   def __init__(self, buildout, name, options):
     self.logger = logging.getLogger(name)
-
-    slap = slapmodule.slap()
-
     software_url = options['software-url']
     name = options['name']
-
-    slap.initializeConnection(options['server-url'],
-                              options.get('key-file'),
-                              options.get('cert-file'),
-                             )
-    request = slap.registerComputerPartition(
-      options['computer-id'], options['partition-id']).request
-
-    return_parameters = []
-    if 'return' in options:
-      return_parameters = [str(parameter).strip()
-                          for parameter in options['return'].split()]
-    else:
+    return_parameters = options.get('return', '').split()
+    if not return_parameters:
       self.logger.debug("No parameter to return to main instance."
         "Be careful about that...")
-
     software_type = options.get('software-type', DEFAULT_SOFTWARE_TYPE)
-
-    filter_kw = {}
-    if 'sla' in options:
-      for sla_parameter in options['sla'].split():
-        filter_kw[sla_parameter] = options['sla-%s' % sla_parameter]
-
-    partition_parameter_kw = {}
-    if 'config' in options:
-      for config_parameter in options['config'].split():
-        partition_parameter_kw[config_parameter] = \
-            options['config-%s' % config_parameter]
-
-    isSlave = options.get('slave', '').lower() in \
-        librecipe.GenericBaseRecipe.TRUE_VALUES
-
+    filter_kw = dict(
+      (x, options['sla-' + x]) for x in options.get('sla', '').split()
+      if options['sla-' + x]
+    )
+    partition_parameter_kw = self._filterForStorage(dict(
+      (x, options['config-' + x])
+      for x in options.get('config', '').split()
+    ))
+    slave = options.get('slave', 'false').lower() in \
+      librecipe.GenericBaseRecipe.TRUE_VALUES
+    slap = slapmodule.slap()
+    slap.initializeConnection(
+      options['server-url'],
+      options.get('key-file'),
+      options.get('cert-file'),
+    )
+    request = slap.registerComputerPartition(
+      options['computer-id'],
+      options['partition-id'],
+    ).request
     self._raise_request_exception = None
     self._raise_request_exception_formatted = None
     self.instance = None
+    # Try to do the request and fetch parameter dict...
     try:
       self.instance = request(software_url, software_type,
           name, partition_parameter_kw=partition_parameter_kw,
-          filter_kw=filter_kw, shared=isSlave)
-      # XXX what is the right way to get a global id?
-      options['instance_guid'] = self.instance.getId()
+          filter_kw=filter_kw, shared=slave)
+      return_parameter_dict = self._getReturnParameterDict(self.instance,
+          return_parameters)
+      if not slave:
+        try:
+          options['instance-guid'] = self.instance.getInstanceGuid()
+          # XXX: deprecated, to be removed
+          options['instance_guid'] = self.instance.getInstanceGuid()
+        except slapmodule.ResourceNotReady:
+          # Backward compatibility. Old SlapOS masters don't know this.
+          self.logger.warning("Impossible to fetch instance GUID.")
     except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady) as exc:
       self._raise_request_exception = exc
       self._raise_request_exception_formatted = traceback.format_exc()
+      return_parameter_dict = {}
 
+    # Then try to get all the parameters. In case of problem, put empty string.
     for param in return_parameters:
       options['connection-%s' % param] = ''
-      if not self.instance:
-        continue
       try:
-        options['connection-%s' % param] = str(
-          self.instance.getConnectionParameter(param))
-      except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady):
+        options['connection-%s' % param] = return_parameter_dict[param]
+      except KeyError:
         if self.failed is None:
           self.failed = param
 
+  def _filterForStorage(self, partition_parameter_kw):
+    return partition_parameter_kw
+
+  def _getReturnParameterDict(self, instance, return_parameter_list):
+    result = {}
+    for param in return_parameter_list:
+      try:
+        result[param] = str(instance.getConnectionParameter(param))
+      except slapmodule.NotFoundError:
+        pass
+    return result
+
   def install(self):
     if self._raise_request_exception:
       raise self._raise_request_exception
@@ -172,6 +184,7 @@ class Recipe(object):
 
   update = install
 
+
 class RequestOptional(Recipe):
   """
   Request a SlapOS instance. Won't fail if request failed or is not ready.
@@ -201,3 +214,14 @@ class RequestOptional(Recipe):
     return []
 
   update = install
+
+
+class Serialised(Recipe):
+  def _filterForStorage(self, partition_parameter_kw):
+    return wrap(partition_parameter_kw)
+
+  def _getReturnParameterDict(self, instance, return_parameter_list):
+    try:
+      return json.loads(instance.getConnectionParameter(JSON_SERIALISED_MAGIC_KEY))
+    except slapmodule.NotFoundError:
+      return {}

slapos/recipe/slapconfiguration.py

@@ -25,6 +25,7 @@
 #
 ##############################################################################
 import slapos.slap
+from slapos.recipe.librecipe import unwrap
 from ConfigParser import RawConfigParser
 from netaddr import valid_ipv4, valid_ipv6
 
@@ -95,9 +96,21 @@ class Recipe(object):
           options['partition'],
       ).getInstanceParameterDict()
       # XXX: those are not partition parameters, strictly speaking.
-      # Discard them, and make them available as separate section keys.
-      options['slap-software-type'] = parameter_dict.pop(
-          'slap_software_type')
+      # Make them available as individual section keys.
+      for his_key in (
+                  'slap_software_type',
+                  'slap_computer_partition_id',
+                  'slap_computer_id',
+                  'slap_software_release_url',
+                  'slave_instance_list',
+                  'timestamp',
+              ):
+          try:
+              value = parameter_dict.pop(his_key)
+          except KeyError:
+              pass
+          else:
+              options[his_key.replace('_', '-')] = value
       ipv4_set = set()
       v4_add = ipv4_set.add
       ipv6_set = set()
@@ -121,11 +134,23 @@ class Recipe(object):
           options['ipv6-random'] = list(ipv6_set)[0]
 
       options['tap'] = tap_set
-      options['configuration'] = parameter_dict
+      parameter_dict = self._expandParameterDict(options, parameter_dict)
       match = self.OPTCRE_match
       for key, value in parameter_dict.iteritems():
           if match(key) is not None:
               continue
           options['configuration.' + key] = value
 
+  def _expandParameterDict(self, options, parameter_dict):
+      options['configuration'] = parameter_dict
+      return parameter_dict
+
   install = update = lambda self: []
+
+class Serialised(Recipe):
+  def _expandParameterDict(self, options, parameter_dict):
+      options['configuration'] = parameter_dict = unwrap(parameter_dict)
+      if isinstance(parameter_dict, dict):
+          return parameter_dict
+      else:
+          return {}

slapos/recipe/softwaretype.py

@@ -114,10 +114,14 @@ class Recipe:
     if not buildout.has_section('slap-parameter'):
       buildout.add_section('slap-parameter')
     for parameter, value in self.parameter_dict.items():
-      if isinstance(value, str):
-        buildout.set('slap-parameter', parameter, value)
-      else:
-        buildout.set('slap-parameter', parameter, json.dumps(value))
+      # All parameters evaluating to False are... False, and shouldn't
+      # convey any information.
+      # Here, all those parameters are set to empty string.
+      if value:
+        if isinstance(value, str):
+          buildout.set('slap-parameter', parameter, value)
+        else:
+          buildout.set('slap-parameter', parameter, json.dumps(value))
 
     buildout.add_section('slap-network-information')
     buildout.set('slap-network-information', 'local-ipv4',

slapos/recipe/symbolic_link.py

@@ -43,6 +43,7 @@ class Recipe:
     """
     path_list = []
     target_directory = self.options['target-directory']
+    # XXX: breaks if any path contains spaces.
     for linkline in self.options['link-binary'].split():
       path, linkname = os.path.split(linkline)
 
@@ -50,7 +51,7 @@ class Recipe:
       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)
+              'Target %r already exists but is not a link' % link)
         os.unlink(link)
       os.symlink(linkline, link)
       self.logger.debug('Created link %r -> %r' % (link, linkline))

slapos/recipe/wrapper.py

@@ -42,10 +42,10 @@ class Recipe(GenericBaseRecipe):
 
         environment = self.options.get('environment')
         if environment is not None:
-            environment = {k.strip(): v.strip() for k, v in [
+            environment = dict((k.strip(), v.strip()) for k, v in [
                              line.split('=')
                              for line in environment.split('\n')
-                           ]}
+                           ])
 
         return [self.createPythonScript(
             self.options['output'],

slapos/recipe/zeo/__init__.py

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

software/MediaWiki/software.cfg

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

software/agent/instance-agent.cfg

@@ -6,8 +6,18 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+run = $${:etc}/run
+agentlog = $${buildout:directory}/var/log/agent
+srv = $${buildout:directory}/srv
+bin = $${buildout:directory}/bin
+
+
 [instance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
+recipe = slapos.cookbook:agent
 agent_binary = ${buildout:directory}/bin/agent
 pidfile = $${directory:srv}/agent.pid
 log = $${directory:agentlog}/agent.log
@@ -21,11 +31,3 @@ default_max_install_duration =  $${slap-parameter:default_max_install_duration}
 default_max_uninstall_duration = $${slap-parameter:default_max_uninstall_duration}
 default_max_request_duration = $${slap-parameter:default_max_request_duration}
 default_max_destroy_duration = $${slap-parameter:default_max_destroy_duration}
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-run = $${:etc}/run
-agentlog = $${buildout:directory}/var/log/agent
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin

software/agent/software.cfg

@@ -12,52 +12,32 @@ parts =
   template
   template-agent
   slapos.cookbook-repository
-  check-recipe
   slapos.toolbox-repository
-  check-recipe-toolbox
-  instance-recipe-egg
+  check-recipe
+  slapos-cookbook
   script
 
 # Local development
 [slapos.cookbook-repository]
-recipe = plone.recipe.command
-stop-on-error = true
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
 branch = agent
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = ${git:location}/bin/git clone --branch ${:branch} --quiet http://git.erp5.org/repos/slapos.git ${:location}
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
-
-[check-recipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+git-executable = ${git:location}/bin/git
 
 [slapos.toolbox-repository]
-recipe = plone.recipe.command
-stop-on-error = true
-branch = agent
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = ${git:location}/bin/git clone --branch ${:branch} --quiet http://git.erp5.org/repos/slapos.toolbox.git ${:location}
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.toolbox.git
+branch = agent3
+git-executable = ${git:location}/bin/git
+
 
-[check-recipe-toolbox]
+[check-recipe]
 recipe = plone.recipe.command
 stop-on-error = true
 update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
-
-[instance-recipe]
-# XXX-Cedric: it can use newest slapos.cfg to not have duplication
-egg = slapos.cookbook
-module = agent
-
-[instance-recipe-egg]
-# XXX-Cedric: it can use newest slapos.cfg to not have duplication
-recipe = zc.recipe.egg
-eggs =
-  ${lxml-python:egg}
-  ${instance-recipe:egg}
+command =
+  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link;
+  grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
 
 [template]
 recipe = slapos.recipe.template
@@ -70,7 +50,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-agent.cfg
 output = ${buildout:directory}/template-agent.cfg
-md5sum = fd9670d8473be402b10990398b553b00
+md5sum = 7c5c43eb98d5a11961d72fce97a8e67b
 mode = 0644
 
 [script]

software/apache-frontend/README.apache_frontend.txt

@@ -43,6 +43,25 @@ all slave instances.
 Finally, the slave instance will be accessible from:
 https://someidentifier.moulefrite.org.
 
+
+How to have custom configuration in frontend server
+===================================================
+
+In your instance directory, you, as sysadmin, can directly edit two
+configuration files that won't be overwritten by SlapOS to customize your
+instance:
+
+ * $PARTITION_PATH/srv/srv/apache-conf.d/apache_frontend.custom.conf
+ * $PARTITION_PATH/srv/srv/apache-conf.d/apache_frontend.virtualhost.custom.conf
+
+The first one is included in the end of the main apache configuration file.
+The second one is included in the virtualhost of the main apache configuration file.
+
+SlapOS will jsut create those two files for you, then completely forget them.
+
+Note: make sure that the UNIX user of the instance has read access to those
+files if you edit them.
+
 Instance Parameters
 ===================
 

software/apache-frontend/software.cfg

@@ -18,7 +18,7 @@ Flask = 0.9
 
 # Required by:
 # hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.71.1

software/b2evolution/software.cfg

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

software/cloudooo/instance-cloudoo.cfg.in

@@ -76,7 +76,6 @@ link-binary =
   {{ parameter_dict['poppler'] }}/bin/pdfinfo
   {{ parameter_dict['poppler'] }}/bin/pdftotext
   {{ parameter_dict['poppler'] }}/bin/pdftohtml
-  {{ parameter_dict['pdftk'] }}/bin/pdftk
 
 # rest of parts are candidates for some generic stuff
 [basedirectory]

software/cloudooo/instance.cfg.in

@@ -34,7 +34,6 @@ fonts = {{ fonts_location }}
 coreutils = {{ coreutils_location }}
 imagemagick = {{ imagemagick_location }}
 poppler = {{ poppler_location }}
-pdftk = {{ pdftk_location }}
 buildout-bin-directory = {{ buildout_bin_directory }}
 
 [dynamic-template-cloudooo]

software/cloudooo/software.cfg

 [buildout]
 extends =
-  ../../stack/shacache-client.cfg
+  ../../stack/slapos.cfg
   ../../stack/cloudooo.cfg
 
 versions = versions
@@ -69,7 +69,7 @@ context =
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = ea305baf481766227752e08d287c0bf8
+md5sum = 694205787e78c5d615d72d7b4b26d174
 extra-context =
     key buildout_bin_directory buildout:bin-directory
     key dcron_location dcron:location
@@ -90,7 +90,6 @@ extra-context =
     key libreoffice_bin_location libreoffice-bin:location
     key libxcb_location libxcb:location
     key openssl_location openssl:location
-    key pdftk_location pdftk:location
     key poppler_location poppler:location
     key template_cloudooo template-cloudooo:target
     key zlib_location zlib:location
@@ -99,7 +98,7 @@ extra-context =
 [template-cloudooo]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
-md5sum = fd5964a038613ea3e0b54f87564fe248
+md5sum = 4c8608f9525be0f01a09d60b240315a9
 mode = 640
 
 

software/cmsmadesimple/software.cfg

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

software/coppermine/software.cfg

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

software/davstorage/software.cfg

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

software/dokuwiki/instance.cfg

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

software/dokuwiki/mysql.conf.php.in

+<?php
+/*
+ * This is an example configuration for the mysql auth module.
+ *
+ * This SQL statements are optimized for following table structure.
+ * If you use a different one you have to change them accordingly.
+ * See comments of every statement for details.
+ *
+ * TABLE users
+ *     uid   login   pass   firstname   lastname   email
+ *
+ * TABLE groups
+ *     gid   name
+ *
+ * TABLE usergroup
+ *     uid   gid
+ *
+ * To use this configuration you have to copy them to local.protected.php
+ * or at least include this file in local.protected.php.
+ */
+
+/* Options to configure database access. You need to set up this
+ * options carefully, otherwise you won't be able to access you
+ * database.
+ */
+$conf['auth']['mysql']['server']   = '%(mysql_ip)s';
+$conf['auth']['mysql']['user']     = '%(mysql_user)s';
+$conf['auth']['mysql']['password'] = '%(mysql_password)s';
+$conf['auth']['mysql']['database'] = '%(mysql_database)s';
+
+/* This option enables debug messages in the mysql module. It is
+ * mostly usefull for system admins.
+ */
+$conf['auth']['mysql']['debug'] = 0;
+
+/* Normally password encryption is done by DokuWiki (recommended) but for
+ * some reasons it might be usefull to let the database do the encryption.
+ * Set 'forwardClearPass' to '1' and the cleartext password is forwarded to
+ * the database, otherwise the encrypted one.
+ */
+$conf['auth']['mysql']['forwardClearPass'] = 0;
+
+/* Multiple table operations will be protected by locks. This array tolds
+ * the module which tables to lock. If you use any aliases for table names
+ * these array must also contain these aliases. Any unamed alias will cause
+ * a warning during operation. See the example below.
+ */
+$conf['auth']['mysql']['TablesToLock']= array("users", "users AS u","groups", "groups AS g", "usergroup", "usergroup AS ug");
+
+/***********************************************************************/
+/*       Basic SQL statements for user authentication (required)       */
+/***********************************************************************/
+
+/* This statement is used to grant or deny access to the wiki. The result
+ * should be a table with exact one line containing at least the password
+ * of the user. If the result table is empty or contains more than one
+ * row, access will be denied.
+ *
+ * The module access the password as 'pass' so a alias might be necessary.
+ *
+ * Following patters will be replaced:
+ *   %%{user}    user name
+ *   %%{pass}    encrypted or clear text password (depends on 'encryptPass')
+ *   %%{dgroup}  default group name
+ */
+$conf['auth']['mysql']['checkPass']   = "SELECT pass
+                                         FROM usergroup AS ug
+                                         JOIN users AS u ON u.uid=ug.uid
+                                         JOIN groups AS g ON g.gid=ug.gid
+                                         WHERE login='%%{user}'
+                                         AND name='%%{dgroup}'";
+
+/* This statement should return a table with exact one row containing
+ * information about one user. The field needed are:
+ * 'pass'  containing the encrypted or clear text password
+ * 'name'  the user's full name
+ * 'mail'  the user's email address
+ *
+ * Keep in mind that Dokuwiki will access thise information through the
+ * names listed above so aliasses might be neseccary.
+ *
+ * Following patters will be replaced:
+ *   %%{user}    user name
+ */
+$conf['auth']['mysql']['getUserInfo'] = "SELECT pass, CONCAT(firstname,' ',lastname) AS name, email AS mail
+                                         FROM users
+                                         WHERE login='%%{user}'";
+
+/* This statement is used to get all groups a user is member of. The
+ * result should be a table containing all groups the given user is
+ * member of. The module access the group name as 'group' so a alias
+ * might be nessecary.
+ *
+ * Following patters will be replaced:
+ *   %%{user}    user name
+ */
+$conf['auth']['mysql']['getGroups']   = "SELECT name as `group`
+                                         FROM groups g, users u, usergroup ug
+                                         WHERE u.uid = ug.uid
+                                         AND g.gid = ug.gid
+                                         AND u.login='%%{user}'";
+
+/***********************************************************************/
+/*      Additional minimum SQL statements to use the user manager      */
+/***********************************************************************/
+
+/* This statement should return a table containing all user login names
+ * that meet certain filter criteria. The filter expressions will be added
+ * case dependend by the module. At the end a sort expression will be added.
+ * Important is that this list contains no double entries fo a user. Each
+ * user name is only allowed once in the table.
+ *
+ * The login name will be accessed as 'user' to a alias might be neseccary.
+ * No patterns will be replaced in this statement but following patters
+ * will be replaced in the filter expressions:
+ *   %%{user}    in FilterLogin  user's login name
+ *   %%{name}    in FilterName   user's full name
+ *   %%{email}   in FilterEmail  user's email address
+ *   %%{group}   in FilterGroup  group name
+ */
+$conf['auth']['mysql']['getUsers']    = "SELECT DISTINCT login AS user
+                                         FROM users AS u
+                                         LEFT JOIN usergroup AS ug ON u.uid=ug.uid
+                                         LEFT JOIN groups AS g ON ug.gid=g.gid";
+$conf['auth']['mysql']['FilterLogin'] = "login LIKE '%%{user}'";
+$conf['auth']['mysql']['FilterName']  = "CONCAT(firstname,' ',lastname) LIKE '%%{name}'";
+$conf['auth']['mysql']['FilterEmail'] = "email LIKE '%%{email}'";
+$conf['auth']['mysql']['FilterGroup'] = "name LIKE '%%{group}'";
+$conf['auth']['mysql']['SortOrder']   = "ORDER BY login";
+
+/***********************************************************************/
+/*   Additional SQL statements to add new users with the user manager  */
+/***********************************************************************/
+
+/* This statement should add a user to the database. Minimum information
+ * to store are: login name, password, email address and full name.
+ *
+ * Following patterns will be replaced:
+ *   %%{user}    user's login name
+ *   %%{pass}    password (encrypted or clear text, depends on 'encryptPass')
+ *   %%{email}   email address
+ *   %%{name}    user's full name
+ */
+$conf['auth']['mysql']['addUser']     = "INSERT INTO users
+                                         (login, pass, email, firstname, lastname)
+                                         VALUES ('%%{user}', '%%{pass}', '%%{email}',
+                                         SUBSTRING_INDEX('%%{name}',' ', 1),
+                                         SUBSTRING_INDEX('%%{name}',' ', -1))";
+
+/* This statement should add a group to the database.
+ * Following patterns will be replaced:
+ *   %%{group}   group name
+ */
+$conf['auth']['mysql']['addGroup']    = "INSERT INTO groups (name)
+                                         VALUES ('%%{group}')";
+
+/* This statement should connect a user to a group (a user become member
+ * of that group).
+ * Following patterns will be replaced:
+ *   %%{user}    user's login name
+ *   %%{uid}     id of a user dataset
+ *   %%{group}   group name
+ *   %%{gid}     id of a group dataset
+ */
+$conf['auth']['mysql']['addUserGroup']= "INSERT INTO usergroup (uid, gid)
+                                         VALUES ('%%{uid}', '%%{gid}')";
+
+/* This statement should remove a group fom the database.
+ * Following patterns will be replaced:
+ *   %%{group}   group name
+ *   %%{gid}     id of a group dataset
+ */
+$conf['auth']['mysql']['delGroup']    = "DELETE FROM groups
+                                         WHERE gid='%%{gid}'";
+
+/* This statement should return the database index of a given user name.
+ * The module will access the index with the name 'id' so a alias might be
+ * necessary.
+ * following patters will be replaced:
+ *   %%{user}    user name
+ */
+$conf['auth']['mysql']['getUserID']   = "SELECT uid AS id
+                                         FROM users
+                                         WHERE login='%%{user}'";
+
+/***********************************************************************/
+/*   Additional SQL statements to delete users with the user manager   */
+/***********************************************************************/
+
+/* This statement should remove a user fom the database.
+ * Following patterns will be replaced:
+ *   %%{user}    user's login name
+ *   %%{uid}     id of a user dataset
+ */
+$conf['auth']['mysql']['delUser']     = "DELETE FROM users
+                                         WHERE uid='%%{uid}'";
+
+/* This statement should remove all connections from a user to any group
+ * (a user quits membership of all groups).
+ * Following patterns will be replaced:
+ *   %%{uid}     id of a user dataset
+ */
+$conf['auth']['mysql']['delUserRefs'] = "DELETE FROM usergroup
+                                         WHERE uid='%%{uid}'";
+
+/***********************************************************************/
+/*   Additional SQL statements to modify users with the user manager   */
+/***********************************************************************/
+
+/* This statements should modify a user entry in the database. The
+ * statements UpdateLogin, UpdatePass, UpdateEmail and UpdateName will be
+ * added to updateUser on demand. Only changed parameters will be used.
+ *
+ * Following patterns will be replaced:
+ *   %%{user}    user's login name
+ *   %%{pass}    password (encrypted or clear text, depends on 'encryptPass')
+ *   %%{email}   email address
+ *   %%{name}    user's full name
+ *   %%{uid}     user id that should be updated
+ */
+$conf['auth']['mysql']['updateUser']  = "UPDATE users SET";
+$conf['auth']['mysql']['UpdateLogin'] = "login='%%{user}'";
+$conf['auth']['mysql']['UpdatePass']  = "pass='%%{pass}'";
+$conf['auth']['mysql']['UpdateEmail'] = "email='%%{email}'";
+$conf['auth']['mysql']['UpdateName']  = "firstname=SUBSTRING_INDEX('%%{name}',' ', 1),
+                                         lastname=SUBSTRING_INDEX('%%{name}',' ', -1)";
+$conf['auth']['mysql']['UpdateTarget']= "WHERE uid=%%{uid}";
+
+/* This statement should remove a single connection from a user to a
+ * group (a user quits membership of that group).
+ *
+ * Following patterns will be replaced:
+ *   %%{user}    user's login name
+ *   %%{uid}     id of a user dataset
+ *   %%{group}   group name
+ *   %%{gid}     id of a group dataset
+ */
+$conf['auth']['mysql']['delUserGroup']= "DELETE FROM usergroup
+                                         WHERE uid='%%{uid}'
+                                         AND gid='%%{gid}'";
+
+/* This statement should return the database index of a given group name.
+ * The module will access the index with the name 'id' so a alias might
+ * be necessary.
+ *
+ * Following patters will be replaced:
+ *   %%{group}   group name
+ */
+$conf['auth']['mysql']['getGroupID']  = "SELECT gid AS id
+                                         FROM groups
+                                         WHERE name='%%{group}'";
+
+

software/dokuwiki/software.cfg

 [buildout]
 versions = versions
 
-parts =
-  template
-  apache-php
-  mariadb
-  eggs
-  instance-recipe-egg
-  downloadcache-workaround
-  
 extends =
-  ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
+  ../../stack/lamp/buildout.cfg
 
 [application]
 recipe = hexagonit.recipe.download
-url = http://www.splitbrain.org/_media/projects/dokuwiki/dokuwiki-2011-05-25a.tgz
-md5sum = 6452eff54afa35e031e15fec9a737dd1
+url = http://www.splitbrain.org/_media/projects/dokuwiki/dokuwiki-2012-10-13.tgz
+md5sum = a910ebb2fcca13c0337ed672304c4ad4
 #If provided tarball does not contain top directory, option shall be changed to false
 strip-top-level-dir = true
   
-[instance-recipe]
-egg = slapos.cookbook
-module = lamp.simple
-
-[template]
-# Default template for the instance.
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-#md5sum = Student shall put md5 of instance.cfg here
-output = ${buildout:directory}/template.cfg
+[application-template]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/mysql.conf.php.in
+md5sum = 11c6793aa8c5bf7151886d1670796a22
+download-only = True
+filename = template.in
 mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-eggs = ${instance-recipe:egg}
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
-
-[downloadcache-workaround]
-# workaround irritating problem of hexagonit.recipe.cmmi which automatically
-# creates download cache, which in turn switches builout to "semi-offline" mode
-recipe = plone.recipe.command
-# in hexagonit.recipe.cmmi if there is no ${buildout:download-cache} set it resolves
-# to ${buildout:directory}/downloads but this variable is available late, that's
-# why it is hardcoded only for required case
-download-cache = ${buildout:directory}/downloads
-command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
-update-command = ${:command}
-stop-on-error = True
\ No newline at end of file
+[application-configuration]
+location = conf/mysql.conf.php
\ No newline at end of file

software/dotclear/software.cfg

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

software/dotproject/software.cfg

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

software/drupal/software.cfg

@@ -9,8 +9,8 @@ parts +=
 
 [application]
 recipe = slapos.recipe.build:download-unpacked
-url = http://ftp.drupal.org/files/projects/drupal-7.16.tar.gz
-md5sum = 352497b2df94b5308e31cb8da020b631
+url = http://ftp.drupal.org/files/projects/drupal-7.19.tar.gz
+md5sum = c1dd3960f1555df208c80ef612e0c53a
 
 [download-patch-hide-dbsetup]
 recipe = hexagonit.recipe.download

software/eSKUeL/software.cfg

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

software/erp5-util-testing/instance.cfg

@@ -40,7 +40,7 @@ environment = environment
 CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
 LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib
 PYTHONPATH = ${python-setuptools:location}
-LD_LIBRARY_PATH = ${libxslt:location}/lib
+LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:location}/lib
 
 [sh-environment]
 # Section exposes testing default environment as sh file. It is thus easy

software/erp5-util-testing/software.cfg

@@ -45,7 +45,7 @@ branch = master
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 0cdfaa1df03885bd6004755d285e69b5
+md5sum = 6b919dd280d6972afe0f50d389ba5fe6
 output =  ${buildout:directory}/template.cfg
 mode = 640
 
@@ -74,7 +74,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.65

software/erp5testnode/software.cfg

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

software/ezpublish/software.cfg

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

software/fengoffice/config-form.php.in

+?>
+<h1 class="pageTitle"><span>Step <?php echo $current_step->getStepNumber() ?>:</span> System settings</h1>
+<table class="formBlock">
+  <tr>
+    <th colspan="2">Database connection</th>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormDatabaseType">Database type:</label></td>
+    <td>
+      <select name="config_form[database_type]" id="configFormDatabaseType">
+        <option value="mysql">MySQL</option>
+        <option value="pdo_mysql">PDO MySQL</option>
+      </select>
+    </td>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormDatabaseHost">Host name:</label></td>
+    <td><input type="text" name="config_form[database_host]" id="configFormDatabaseHost" value="%(mysql_ip)s" readonly /></td>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormDatabaseUser">Username:</label></td>
+    <td><input type="text" name="config_form[database_user]" id="configFormDatabaseUser" value="%(mysql_user)s" readonly /></td>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormDatabasePass">Password:</label></td>
+    <td><input type="password" name="config_form[database_pass]" id="configFormDatabasePass" value="%(mysql_password)s" readonly /></td>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormDatabaseName">Database name:</label></td>
+    <td><input type="text" name="config_form[database_name]" id="configFormDatabaseName" value="%(mysql_database)s" readonly /></td>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormDatabasePrefix">Table prefix:</label></td>
+    <td><input type="text" name="config_form[database_prefix]" id="configFormDatabasePrefix" value="<?php echo array_var($config_form_data, 'database_prefix', 'fo_') ?>" /></td>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormDatabaseEngine">Database engine:</label></td>
+    <td>
+      <select name="config_form[database_engine]" id="configFormDatabaseEngine">
+	        <option value="InnoDB">InnoDB</option>
+	        <option value="MyISAM">MyISAM</option>
+	    </select>
+    </td>
+  </tr>
+  
+  <tr>
+    <td colspan="2">
+    <b>Note:</b> InnoDB engine is highly recommended. Use MyISAM only as a last resort, and at your own risk, if your database doesn't support InnoDB.<br /><br />
+    <b>Note:</b> If the database doesn't exist Feng Office will try to create it. However, if the database user you supply doesn't have permissions to create databases, you will have to manually create the database before you can continue.
+    </td>
+  </tr>
+</table>
+
+<table class="formBlock">
+  <tr>
+    <th colspan="2">Other settings</th>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormAbsoluteUrl">Absolute script URL:</label></td>
+    <td><input type="text" name="config_form[absolute_url]" id="configFormAbsoluteUrl" value="<?php echo array_var($config_form_data, 'absolute_url', $installation_url) ?>" /></td>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormPlugins">Plugins to install:</label></td>
+    <td class="pluginOptions">
+		<?php include_once 'plugins.php' ;?>
+    </td>
+  </tr>
+</table>
\ No newline at end of file

software/fengoffice/instance.cfg

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

software/fengoffice/software.cfg

 [buildout]
-versions = versions
 
-parts =
-  template
-  apache-php
-  mariadb
-  eggs
-  instance-recipe-egg
-  
 extends =
-  ../../stack/lamp.cfg
+  ../../stack/lamp/buildout.cfg
+  
 
 [application]
 recipe = slapos.recipe.build:download-unpacked
-url = http://freefr.dl.sourceforge.net/project/opengoo/fengoffice/fengoffice_2.0.0/fengoffice_2.0.0.zip
-md5sum = 2f673962ac377da7942ba8a09429ddbf
-  
-[instance-recipe]
-egg = slapos.cookbook
-module = lamp.simple
+url = http://freefr.dl.sourceforge.net/project/opengoo/fengoffice/fengoffice_2.2.3.1/fengoffice_2.2.3.1.zip
+md5sum = f3b15616e1111f0114b084cdaa0dc3cd
+strip-top-level-dir = false
 
-[template]
-# Default template for the instance.
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-#${:_profile_base_location_}/instance.cfg
-#md5sum = Student shall put md5 of instance.cfg here
-output = ${buildout:directory}/template.cfg
+[application-template]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/config-form.php.in
+md5sum = a32f1c8b14b8de2ecae40e71f710f384
+download-only = True
+filename = template.in
 mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-eggs = 
-    ${instance-recipe:egg}
\ No newline at end of file
+[application-configuration]
+location = public/install/installation/templates/system_config_form.php
\ No newline at end of file

software/html5as/software.cfg

@@ -158,7 +158,7 @@ zope.interface = 4.0.1
 
 # Required by:
 # hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 [networkcache]
 # signature certificates of the following uploaders.

software/kumofs/software.cfg

@@ -89,7 +89,7 @@ signature-certificate-list =
   
   # Required by:
   # hexagonit.recipe.cmmi==1.6
-  hexagonit.recipe.download = 1.6
+  hexagonit.recipe.download = 1.6nxd002
   
   # Required by:
   # slapos.cookbook==0.71.1

software/kvm/README.txt

@@ -12,43 +12,25 @@ For extensive parameters definition, please look at parameter-input-schema.json.
 Examples
 --------
 
-The following examples listhow to request different possible instances of KVM
+The following examples list how to request different possible instances of KVM
 Software Release from slap console or command line.
 
 KVM instance (1GB of RAM, 10GB of SSD, one core)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Note that the KVM instance will request a frontend slave instance in order
+Note that the KVM instance will try to request a frontend slave instance in order
 to be accessible from IPv4.
 
-KVM instance needs a NBD to fetch disk image at first boot. Working NBD IP/port
-has to be specified.
-
 ::
   myawesomekvm = request(
       software_release=kvm,
-      partition_reference="myawesomekvm",
+      partition_reference="My awesome KVM",
       partition_parameter_kw={
-          "ndb_ip":"2a01:e35:2e27:460:e2cb:4eff:fed9:48dc",
-          "ndb_port": 1024
+          "nbd-host":"ubuntu-1204.nbd.vifib.net",
       }
   )
 
-
-KVM+ instance (2GB of RAM, 20GB of SSD, two cores)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-::
-  myevenmoreawesomekvm = request(
-      software_release=kvm,
-      partition_reference="myevenmoreawesomekvm",
-      partition_parameter_kw={
-          "ndb_ip":"2a01:e35:2e27:460:e2cb:4eff:fed9:48dc",
-          "ndb_port": 1024
-      },
-      software_type="kvm+",
-  )
-
+See the instance-kvm-input-schema.json file for more instance parameters (cpu-count, ram-size, disk-size, etc).
 
 NBD instance
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

software/kvm/common.cfg

+[buildout]
+
+extends =
+  ../../component/curl/buildout.cfg
+  ../../component/dash/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/gzip/buildout.cfg
+  ../../component/qemu-kvm/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/noVNC/buildout.cfg
+  ../../component/openssl/buildout.cfg
+  ../../stack/nodejs.cfg
+  ../../stack/slapos.cfg
+
+parts =
+  template
+  eggs
+
+#XXX-Cedric : Currently, one can only access to KVM using noVNC.
+#             Ideally one should be able to access KVM by using either NoVNC or VNC.
+#             Problem is : no native crypto support in web browsers. So we have to disable ssl
+#             In qemu builtin vnc server, and make it available only for localhost
+#             so that only novnc can listen to it.
+
+#XXX-Cedric: Check status of https://github.com/kanaka/noVNC/issues/13 to see
+#            When qemu has builtin support for websockets in vnc server to get rid of
+#            Websockify (socket <-> websocket proxy server) when it is ready.
+#            May solve previous XXX depending on the implementation.
+
+#XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu
+
+[eggs]
+recipe = z3c.recipe.scripts
+eggs =
+  ${lxml-python:egg}
+  websockify
+  slapos.cookbook
+  slapos.toolbox
+
+[http-proxy]
+# https://github.com/nodejitsu/node-http-proxy
+recipe = slapos.recipe.build:download-unpacked
+#XXX-Cedric : use upstream when merged
+url = https://nodeload.github.com/desaintmartin/node-http-proxy/zipball/20120621
+md5sum = 20204d0b29c2cef26e1c91e99eedca6b
+
+[proxy-by-url]
+# https://github.com/dominictarr/proxy-by-url
+recipe = slapos.recipe.build:download-unpacked
+#XXX-Cedric : use upstream when merged
+url = https://nodeload.github.com/desaintmartin/proxy-by-url/zipball/20120621
+md5sum = c2609948aa708581f93b981b23880314
+
+[npm-modules]
+recipe = plone.recipe.command
+destination = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+command =
+  rm -fr ${:destination} &&
+  mkdir -p ${:destination} &&
+  cd ${:destination} &&
+  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install colors@0.6.0-1 &&
+  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install socket.io@0.8.7 &&
+  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install socket.io-client@0.8.7 &&
+  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install optimist@0.3.1 &&
+  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install pkginfo@0.2.3
+
+
+[template-kvm]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-kvm.cfg.in
+md5sum = c0320447308299ec9caaeece4187bc1f
+output = ${buildout:directory}/template-kvm.cfg
+mode = 0644
+
+[template-kvmplus]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-kvmplus.cfg.in
+md5sum = c8e92237eeda93caca1132b5202c3a02
+output = ${buildout:directory}/template-kvmplus.cfg
+mode = 0644
+
+[template-nbd]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-nbd.cfg.in
+md5sum = f634a5249b773658b7a7bc9fa9bb0368
+output = ${buildout:directory}/template-nbd.cfg
+mode = 0644
+
+[template-frontend]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-frontend.cfg.in
+md5sum = 73359b52013b1b65f75005e8698ed180
+output = ${buildout:directory}/template-frontend.cfg
+mode = 0644
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg.in
+md5sum = 68788763d23f70f24b9e575871c903a8
+output = ${buildout:directory}/template.cfg
+mode = 0644

software/kvm/development.cfg

+[buildout]
+extends =
+  ../../git/buildout.cfg
+  common.cfg
+
+parts +=
+  slapos.cookbook-repository
+  slapos.core-repository
+  slapos.toolbox-repository
+  check-recipe
+
+develop =
+  ${:parts-directory}/slapos.cookbook-repository
+
+[slapos.cookbook-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
+branch = slaprunner
+git-executable = ${git:location}/bin/git
+
+[check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command =
+  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&

software/kvm/instance-kvm-input-schema.json

@@ -55,7 +55,7 @@
       "title": "Second NBD hostname",
       "description": "hostname (or IP) of the second NBD server (containing drivers for example).",
       "type": "string",
-      "format": ["host-name", "ip-address", "ipv6"],
+      "format": ["host-name", "ip-address", "ipv6"]
     },
     "nbd2-port": {
       "title": "Second NBD port",

software/kvm/instance-kvm.cfg.in

@@ -6,8 +6,7 @@
 [buildout]
 parts =
   certificate-authority
-  publish-kvm-backend-connection-information
-  publish-kvm-frontend-connection-information
+  publish-kvm-connection-information
   kvm-promise
   websockify-sighandler
   novnc-promise
@@ -146,19 +145,18 @@ return = url resource port domainname
 sla = instance_guid
 sla-instance_guid = $${slap-parameter:frontend-instance-guid}
 
-[publish-kvm-backend-connection-information]
+
+[publish-kvm-connection-information]
 recipe = slapos.cookbook:publish
 backend-url = https://[$${novnc-instance:ip}]:$${novnc-instance:port}/vnc_auto.html?host=[$${novnc-instance:ip}]&port=$${novnc-instance:port}&encrypt=1
 password = $${kvm-instance:passwd}
-
-[publish-kvm-frontend-connection-information]
-<= publish-kvm-backend-connection-information
 url = $${request-slave-frontend:connection-url}/vnc_auto.html?host=$${request-slave-frontend:connection-domainname}&port=$${request-slave-frontend:connection-port}&encrypt=1&path=$${request-slave-frontend:connection-resource}
 
+
 [frontend-promise]
 recipe = slapos.cookbook:check_url_available
 path = $${directory:promises}/frontend_promise
-url = $${publish-kvm-frontend-connection-information:url}
+url = $${publish-kvm-connection-information:url}
 dash_path = ${dash:location}/bin/dash
 curl_path = ${curl:location}/bin/curl
 

software/kvm/instance-nbd.cfg.in

@@ -22,6 +22,7 @@ log = $${buildout:directory}/log
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
 services = $${rootdirectory:etc}/run
+watched-services = $${rootdirectory:etc}/service
 promises = $${rootdirectory:etc}/promise
 
 [nbd-instance]
@@ -53,7 +54,7 @@ image-path = $${rootdirectory:srv}/cdrom.iso
 log-path = $${rootdirectory:log}/onetimeupload.log
 shell-path = ${dash:location}/bin/dash
 onetimeupload-path = ${buildout:bin-directory}/onetimeupload
-path = $${basedirectory:services}/onetimeupload
+path = $${basedirectory:watched-services}/onetimeupload
 key = $${gen-passwd:passwd}
 
 [onetimeupload-promise]

software/kvm/software.cfg

 [buildout]
-
-extends =
-  ../../component/curl/buildout.cfg
-  ../../component/dash/buildout.cfg
-  ../../component/dcron/buildout.cfg
-  ../../component/git/buildout.cfg
-  ../../component/gnutls/buildout.cfg
-  ../../component/gzip/buildout.cfg
-  ../../component/libpng/buildout.cfg
-  ../../component/libuuid/buildout.cfg
-  ../../component/logrotate/buildout.cfg
-  ../../component/lxml-python/buildout.cfg
-  ../../component/noVNC/buildout.cfg
-  ../../component/openssl/buildout.cfg
-  ../../stack/nodejs.cfg
-  ../../stack/slapos.cfg
-
-develop =
-  ${:parts-directory}/websockify
-
-parts =
-  template
-  eggs
-  check-local-eggs
-
-#XXX-Cedric : Currently, one can only access to KVM using noVNC.
-#             Ideally one should be able to access KVM by using either NoVNC or VNC.
-#             Problem is : no native crypto support in web browsers. So we have to disable ssl
-#             In qemu builtin vnc server, and make it available only for localhost
-#             so that only novnc can listen to it.
-
-#XXX-Cedric: Check status of https://github.com/kanaka/noVNC/issues/13 to see
-#            When qemu has builtin support for websockets in vnc server to get rid of
-#            Websockify (socket <-> websocket proxy server) when it is ready.
-#            May solve previous XXX depending on the implementation.
-
-#XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu
-
-[kvm]
-recipe = hexagonit.recipe.cmmi
-url = http://downloads.sourceforge.net/project/kvm/qemu-kvm/1.1.1/qemu-kvm-1.1.1.tar.gz
-md5sum = f8f5629b00f48192cc0467e1d31c4dd2
-configure-options =
-  --disable-sdl
-  --disable-xen
-  --enable-vnc-tls
-  --disable-vnc-sasl
-  --disable-curses
-  --disable-curl
-  --enable-kvm
-  --disable-docs
-  --enable-vnc-png
-  --disable-vnc-jpeg
-  --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${zlib:location}/include -I${libpng:location}/include"
-  --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -L${gpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls"
-  --disable-werror
-environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${gnutls:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
-
-[websockify]
-# XXX-Cedric : use official egg from pypi when it is released
-recipe = plone.recipe.command
-stop-on-error = true
-commit = 301f3ae580557da47fa5ea2050aa671ce9c5a1a0
-repository = https://github.com/SlapOS/websockify.git
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-git-binary = ${git:location}/bin/git
-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]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/websockify.egg-link
-depends = ${eggs:dummy}
-
-[eggs]
-recipe = z3c.recipe.scripts
-dummy =
-  ${websockify:location}
-eggs =
-  ${lxml-python:egg}
-  websockify
-  slapos.cookbook
-  slapos.toolbox
-
-[http-proxy]
-# https://github.com/nodejitsu/node-http-proxy
-recipe = slapos.recipe.build:download-unpacked
-#XXX-Cedric : use upstream when merged
-url = https://nodeload.github.com/desaintmartin/node-http-proxy/zipball/20120621
-md5sum = 20204d0b29c2cef26e1c91e99eedca6b
-
-[proxy-by-url]
-# https://github.com/dominictarr/proxy-by-url
-recipe = slapos.recipe.build:download-unpacked
-#XXX-Cedric : use upstream when merged
-url = https://nodeload.github.com/desaintmartin/proxy-by-url/zipball/20120621
-md5sum = c2609948aa708581f93b981b23880314
-
-[npm-modules]
-recipe = plone.recipe.command
-destination = ${buildout:parts-directory}/${:_buildout_section_name_}
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command =
-  rm -fr ${:destination} &&
-  mkdir -p ${:destination} &&
-  cd ${:destination} &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install colors@0.6.0-1 &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install socket.io@0.8.7 &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install socket.io-client@0.8.7 &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install optimist@0.3.1 &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install pkginfo@0.2.3
-
-
-[template-kvm]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-kvm.cfg.in
-md5sum = 5607cb6b6af58694d55b87411880d368
-output = ${buildout:directory}/template-kvm.cfg
-mode = 0644
-
-[template-kvmplus]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-kvmplus.cfg.in
-md5sum = c8e92237eeda93caca1132b5202c3a02
-output = ${buildout:directory}/template-kvmplus.cfg
-mode = 0644
-
-[template-nbd]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-nbd.cfg.in
-md5sum = c030e7be231aba25ee0f51703e60ce67
-output = ${buildout:directory}/template-nbd.cfg
-mode = 0644
-
-[template-frontend]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-frontend.cfg.in
-md5sum = 73359b52013b1b65f75005e8698ed180
-output = ${buildout:directory}/template-frontend.cfg
-mode = 0644
-
-[template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 68788763d23f70f24b9e575871c903a8
-output = ${buildout:directory}/template.cfg
-mode = 0644
+extends = common.cfg
 
 [networkcache]
 # signature certificates of the following uploaders.
@@ -199,101 +49,98 @@ signature-certificate-list =
 
 
 [versions]
-lxml = 2.3.6
+numpy = 1.6.2
 Jinja2 = 2.6
 Werkzeug = 0.8.3
-apache-libcloud = 0.11.3
+apache-libcloud = 0.12.1
 async = 0.6.1
 buildout-versions = 1.7
 gitdb = 0.5.4
 hexagonit.recipe.cmmi = 1.6
-meld3 = 0.6.9
+lxml = 3.1.0
+meld3 = 0.6.10
 plone.recipe.command = 1.1
 pycrypto = 2.6
-slapos.cookbook = 0.70
-slapos.recipe.build = 0.11.5
+slapos.cookbook = 0.73.1
 slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.31.1
+slapos.toolbox = 0.33.1
 smmap = 0.8.2
+websockify = 0.3.0
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.core==0.32.2
-# slapos.toolbox==0.31.1
+# slapos.core==0.35.1
+# slapos.toolbox==0.33.1
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.31.1
+# slapos.toolbox==0.33.1
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.cookbook==0.70
-PyXML = 0.8.4
-
-# Required by:
-# slapos.toolbox==0.31.1
+# slapos.toolbox==0.33.1
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.31.1
-feedparser = 5.1.2
+# slapos.toolbox==0.33.1
+feedparser = 5.1.3
 
 # Required by:
 # hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
-# slapos.cookbook==0.70
+# slapos.cookbook==0.73.1
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.cookbook==0.70
+# slapos.cookbook==0.73.1
 netaddr = 0.7.10
 
 # Required by:
-# slapos.core==0.32.2
+# slapos.core==0.35.1
 netifaces = 0.8
 
 # Required by:
-# websockify==0.1-dev
-numpy = 1.6.2
+# slapos.toolbox==0.33.1
+paramiko = 1.10.0
 
 # Required by:
-# slapos.toolbox==0.31.1
-paramiko = 1.8.0
+# slapos.toolbox==0.33.1
+psutil = 0.6.1
 
 # Required by:
-# slapos.toolbox==0.31.1
-psutil = 0.6.1
+# slapos.core==0.35.1
+pyflakes = 0.6.1
 
 # Required by:
-# slapos.cookbook==0.70
-pytz = 2012f
+# slapos.cookbook==0.73.1
+pytz = 2012j
 
 # Required by:
-# slapos.cookbook==0.70
-# slapos.core==0.32.2
-# slapos.toolbox==0.31.1
+# slapos.cookbook==0.73.1
+# slapos.core==0.35.1
+# slapos.toolbox==0.33.1
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.70
-# slapos.toolbox==0.31.1
-slapos.core = 0.32.2
+# slapos.cookbook==0.73.1
+# slapos.toolbox==0.33.1
+slapos.core = 0.35.1
 
 # Required by:
-# slapos.core==0.32.2
+# slapos.core==0.35.1
 supervisor = 3.0b1
 
 # Required by:
-# slapos.cookbook==0.70
-# slapos.toolbox==0.31.1
-xml-marshaller = 0.9.7
+# slapos.core==0.35.1
+unittest2 = 0.5.1
 
 # Required by:
-# slapos.cookbook==0.70
-zc.recipe.egg = 1.3.2
+# slapos.cookbook==0.73.1
+# slapos.toolbox==0.33.1
+xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.core==0.32.2
-zope.interface = 4.0.1
+# slapos.core==0.35.1
+zope.interface = 4.0.5
\ No newline at end of file

software/lamp-template-static/software.cfg

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

software/maarch/development.cfg

@@ -35,7 +35,7 @@ git-executable = ${git:location}/bin/git
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/slapos.git
-branch = lapp-resilient3
+branch = master
 git-executable = ${git:location}/bin/git
 
 [slapos.core-repository]

software/maarch/instance-custom.cfg.in

@@ -3,13 +3,22 @@
 [maarch-configuration]
 recipe = slapos.recipe.maarch:default
 htdocs = $${apache-php:htdocs}
-db_host = $${postgres-urlparse:host}
-db_port = $${postgres-urlparse:port}
-db_dbname = $${postgres-urlparse:path}
-db_username = $${postgres-urlparse:username}
-db_password = $${postgres-urlparse:password}
+db-host = $${postgres-urlparse:host}
+db-port = $${postgres-urlparse:port}
+db-dbname = $${postgres-urlparse:path}
+db-username = $${postgres-urlparse:username}
+db-password = $${postgres-urlparse:password}
 language = en
-php_ini = $${directory:php-ini-dir}/php.ini
-root_docservers = $${buildout:directory}/srv/docservers
+php-ini = $${directory:php-ini-dir}/php.ini
+root-docservers = $${buildout:directory}/srv/docservers
 dependency = $${apache-php:recipe}
+maarch-sql-data-file = $${slap-parameter:maarch-sql-data-file}
+
+[publish-connection-informations]
+# XXX login should not be hardcoded
+login = superadmin
+password = $${maarch-configuration:db-password}
+
+[slap-parameter]
+maarch-sql-data-file =
 

software/maarch/software.cfg

@@ -5,48 +5,49 @@ extends =
   ../../stack/lapp/buildout.cfg
 
 
-develop =
-  ${:parts-directory}/slapos.cookbook-repository
-  ${:parts-directory}/slapos.recipe.maarch-repository
-
-
 # += since we need rdiff-backup and friends
 parts +=
-  slapos-cookbook
   apache-php-postgres
   pear-modules
   eggs
   instance
   instance-apache-php
+  slapos-recipe-maarch-egg
   slapos.cookbook-repository
-  slapos.recipe.maarch-repository
   check-recipe
 
 
-[versions]
-slapos.cookbook =
-slapos.recipe.maarch = 
+develop =
+  ${:parts-directory}/slapos.cookbook-repository
 
 
-[slapos.recipe.maarch-repository]
-recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.recipe.maarch.git
-branch = master
-git-executable = ${git:location}/bin/git
+extensions = buildout-versions
+
 
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/slapos.git
-branch = lapp-resilient3
+revision = 7dce435eca6fe2eeff60c865d41ee40db59257fa
 git-executable = ${git:location}/bin/git
 
+
 [check-recipe]
 recipe = plone.recipe.command
 stop-on-error = true
 update-command = ${:command}
 command =
-  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
-  grep parts ${buildout:develop-eggs-directory}/slapos.recipe.maarch.egg-link
+  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+
+
+#----------------
+#--
+#-- Explicitly provide the configuration egg,
+#-- otherwise instance.cfg won't be able to use it.
+#--
+[slapos-recipe-maarch-egg]
+recipe = zc.recipe.egg
+eggs =
+    slapos.recipe.maarch
 
 
 #----------------
@@ -72,7 +73,7 @@ part-list = maarch-configuration
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-custom.cfg.in
 output = ${buildout:directory}/instance-custom.cfg
-md5sum = 22d8e4d8bb1a5b1c42c6cfb42ee490a0
+md5sum = f86b311d443156e327a1b5f5acfb22b1
 mode = 0644
 
 
@@ -92,3 +93,6 @@ install_cmd =
 
 #----------------
 
+[versions]
+slapos.recipe.maarch = 0.4
+

software/magento/software.cfg

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

software/mariadb/instance-mariadb.cfg

@@ -18,7 +18,7 @@ offline = true
 
 [url]
 recipe = slapos.cookbook:publishurl
-url = mysqls://$${mariadb:user}:$${mariadb:password}@[$${stunnel:remote-address}]:$${stunnel:remote-port}/$${mariadb:database}
+url = mysqls://$${mariadb:user}:$${mariadb:password}@[$${stunnel:remote-host}]:$${stunnel:remote-port}/$${mariadb:database}
 
 [mariadb]
 recipe = slapos.cookbook:mysql
@@ -92,10 +92,11 @@ key-file = $${ca-stunnel:key-file}
 cert-file = $${ca-stunnel:cert-file}
 pid-file = $${basedirectory:run}/stunnel.pid
 local-port = $${mariadb:port}
-local-address = $${mariadb:ip}
-remote-address = $${slap-network-information:global-ipv6}
+local-host = $${mariadb:ip}
+remote-host = $${slap-network-information:global-ipv6}
 remote-port = 6446
 client = false
+post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate
 
 [logrotate]
 recipe = slapos.cookbook:logrotate
@@ -128,13 +129,13 @@ dcrond-binary = ${dcron:location}/sbin/crond
 cron-entries = $${directory:cron-entries}
 crontabs = $${directory:crontabs}
 cronstamps = $${directory:cronstamps}
-catcher = $${cron-simplelogger:binary}
+catcher = $${cron-simplelogger:wrapper}
 binary = $${basedirectory:services}/crond
 
 [cron-simplelogger]
 recipe = slapos.cookbook:simplelogger
-binary = $${rootdirectory:bin}/cron_simplelogger
-output = $${directory:cronoutput}
+wrapper = $${rootdirectory:bin}/cron_simplelogger
+log = $${basedirectory:log}/crond.log
 
 [cron-entry-logrotate]
 <= cron

software/mariadb/software.cfg

@@ -12,7 +12,6 @@ extends =
 
 parts =
 # Create instance template
-#TODO : list here all parts.
   template
   instance-remotebackuped
   instance-mariadb
@@ -49,14 +48,14 @@ mode = 0644
 [instance-mariadb]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
-md5sum = 135ad8e59a45e053f3aaf75deb35c5b0
+md5sum = d160bb15d8d3a3913706a4ed29c49388
 output = ${buildout:directory}/template-mariadb.cfg
 mode = 0644
 
 [instance-remotebackuped]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-remotebackuped.cfg
-md5sum = bf9e5aa9d63bda9c4aa87d9527fec3e8
+md5sum = 1bfe1b564def00726b6db46d27534210
 output = ${buildout:directory}/template-backuped.cfg
 mode = 0644
 
@@ -82,4 +81,72 @@ signature-certificate-list =
   M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
   5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
   x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
\ No newline at end of file
+  -----END CERTIFICATE-----
+
+[versions]
+Jinja2 = 2.6
+Werkzeug = 0.8.3
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.6
+hexagonit.recipe.download = 1.6nxd002
+meld3 = 0.6.10
+slapos.cookbook = 0.72.0
+slapos.recipe.build = 0.11.5
+slapos.recipe.template = 2.4.2
+
+# Required by:
+# slapos.core==0.35
+Flask = 0.9
+
+# Required by:
+# slapos.cookbook==0.72.0
+inotifyx = 0.2.0
+
+# Required by:
+# slapos.cookbook==0.72.0
+# slapos.core==0.35
+# xml-marshaller==0.9.7
+lxml = 3.1.0
+
+# Required by:
+# slapos.cookbook==0.72.0
+netaddr = 0.7.10
+
+# Required by:
+# slapos.core==0.35
+netifaces = 0.8
+
+# Required by:
+# slapos.core==0.35
+pyflakes = 0.6.1
+
+# Required by:
+# slapos.cookbook==0.72.0
+pytz = 2012j
+
+# Required by:
+# slapos.cookbook==0.72.0
+# slapos.core==0.35
+# zc.buildout==1.6.0-dev-SlapOS-010
+# zc.recipe.egg==1.3.2
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.72.0
+slapos.core = 0.35
+
+# Required by:
+# slapos.core==0.35
+supervisor = 3.0b1
+
+# Required by:
+# slapos.core==0.35
+unittest2 = 0.5.1
+
+# Required by:
+# slapos.cookbook==0.72.0
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.core==0.35
+zope.interface = 4.0.3

software/memcached/software.cfg

@@ -45,7 +45,7 @@ xml-marshaller = 0.9.7
 setuptools = 0.6c12dev-r88795
 
 hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 plone.recipe.command = 1.1
 
 Jinja2 = 2.6

stack/lamp/apache/instance-apache-backup.cfg.in → software/mioga/instance-apacheperl.cfg

 [buildout]
-
 parts =
-  urls
-  apache-proxy
-  logrotate
-  logrotate-entry-apache
-  cron
-  cron-entry-logrotate
-  sshkeys-authority
+  postgres-urlparse
+#  apacheperl-promise
+  mioga-instance
+  cron-entry-crawler
   sshkeys-dropbear
-  dropbear-server
-  dropbear-server-pbs-authorized-key
+  dropbear-server-add-authorized-key
+  sshkeys-authority
+  publish-connection-information
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-
-#----------------
-#--
-#-- Creation of all needed directories.
-
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
+bin = $${buildout:directory}/bin
 etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
 srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
-tmp = $${buildout:directory}/tmp
+log = $${buildout:directory}/log
+var = $${buildout:directory}/var
+buildinst = $${buildout:directory}/buildinst
 
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log
 services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-backup = $${rootdirectory:srv}/backup
 promises = $${rootdirectory:etc}/promise
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-htdocs = $${rootdirectory:srv}/www
-logrotate-entries = $${rootdirectory:etc}/logrotate.d
-logrotate-backup = $${basedirectory:backup}/logrotate
-cronstamps = $${rootdirectory:etc}/cronstamps
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
-ssh = $${rootdirectory:etc}/ssh
+htdocs = $${rootdirectory:srv}/htdocs
+cronstamps = $${rootdirectory:etc}/cronstamps/
+cron-entries = $${rootdirectory:etc}/cron.d/
+crontabs = $${rootdirectory:etc}/crontabs/
 sshkeys = $${rootdirectory:srv}/sshkeys
-httpd-log = $${basedirectory:log}/apache
-
+ssh = $${rootdirectory:etc}/ssh
 
-#----------------
-#--
-#-- Deploy cron.
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = $${rootdirectory:bin}/cron_simplelogger
+log = $${rootdirectory:log}/crond.log
 
 [cron]
 recipe = slapos.cookbook:cron
 dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${directory:cron-entries}
-crontabs = $${directory:crontabs}
-cronstamps = $${directory:cronstamps}
+cronstamps = $${basedirectory:cronstamps}
+cron-entries = $${basedirectory:cron-entries}
+crontabs = $${basedirectory:crontabs}
 catcher = $${cron-simplelogger:wrapper}
 binary = $${basedirectory:services}/crond
 
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/crond.log
-
-
-#----------------
-#--
-#-- Deploy logrotate.
-
-[cron-entry-logrotate]
+[cron-entry-crawler]
 <= cron
 recipe = slapos.cookbook:cron.d
 name = logrotate
-frequency = 0 0 * * *
-command = $${logrotate:wrapper}
-
-[logrotate]
-recipe = slapos.cookbook:logrotate
-# Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = ${gzip:location}/bin/gzip
-gunzip-binary = ${gzip:location}/bin/gunzip
-# Directories
-wrapper = $${rootdirectory:bin}/logrotate
-conf = $${rootdirectory:etc}/logrotate.conf
-logrotate-entries = $${directory:logrotate-entries}
-backup = $${directory:logrotate-backup}
-state-file = $${rootdirectory:srv}/logrotate.status
-
-
-#----------------
-#--
-#-- sshkeys
+frequency = 23 50 * * *
+command = $${mioga-instance:bin_dir}/crawl.sh
+
+[apacheperl-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${basedirectory:promises}/httpd_promise
+hostname = $${apacheperl-instance:ip}
+port = $${apacheperl-instance:port}
+
+[publish-connection-information]
+recipe = slapos.cookbook:publish
+direct_url = $${mioga-url:direct_url}
+ssh_command = ssh $${dropbear-server:host} -p $${dropbear-server:port}
+url = $${request-frontend:connection-site_url}
+
+# Request POSTGRES INSTANCE and parse its URL
+
+[request-postgres]
+<= slap-connection
+recipe = slapos.cookbook:request
+name = Postgres
+software-url = $${slap-connection:software-release-url}
+software-type = postgres
+return = url
+sla = computer_guid
+sla-computer_guid = $${slap-connection:computer-id}
+
+[postgres-urlparse]
+recipe = slapos.cookbook:urlparse
+url = $${request-postgres:connection-url}
+
+[symlinks]
+recipe = cns.recipe.symlink
+symlink_target = $${rootdirectory:bin}
+symlink_base = ${postgresql:location}/bin
+
+# SSH SERVER
 
 [sshkeys-directory]
 recipe = slapos.cookbook:mkdirectory
-requests = $${directory:sshkeys}/requests
-keys = $${directory:sshkeys}/keys
+requests = $${basedirectory:sshkeys}/requests/
+keys = $${basedirectory:sshkeys}/keys/
 
 [sshkeys-authority]
 recipe = slapos.cookbook:sshkeys_authority
@@ -110,6 +101,16 @@ keys-directory = $${sshkeys-directory:keys}
 wrapper = $${basedirectory:services}/sshkeys_authority
 keygen-binary = ${dropbear:location}/bin/dropbearkey
 
+[dropbear-server]
+recipe = slapos.cookbook:dropbear
+host = $${slap-network-information:global-ipv6}
+port = 2222
+home = $${basedirectory:ssh}
+wrapper = $${rootdirectory:bin}/raw_sshd
+shell = /bin/bash
+rsa-keyfile = $${basedirectory:ssh}/server_key.rsa
+dropbear-binary = ${dropbear:location}/sbin/dropbear
+
 [sshkeys-dropbear]
 <= sshkeys-authority
 recipe = slapos.cookbook:sshkeys_authority.request
@@ -120,78 +121,67 @@ public-key = $${dropbear-server:rsa-keyfile}.pub
 private-key = $${dropbear-server:rsa-keyfile}
 wrapper = $${basedirectory:services}/sshd
 
-
-#----------------
-#--
-#-- Dropbear.
-
-[dropbear-server]
-recipe = slapos.cookbook:dropbear
-host = $${slap-network-information:global-ipv6}
-port = 2222
-home = $${directory:ssh}
-wrapper = $${rootdirectory:bin}/raw_sshd
-shell = $${rdiff-backup-server:wrapper}
-rsa-keyfile = $${directory:ssh}/server_key.rsa
-dropbear-binary = ${dropbear:location}/sbin/dropbear
-
-[dropbear-server-pbs-authorized-key]
+[dropbear-server-add-authorized-key]
 <= dropbear-server
 recipe = slapos.cookbook:dropbear.add_authorized_key
 key = $${slap-parameter:authorized-key}
 
-
-#----------------
-#--
-#-- rdiff
-
-[rdiff-backup-server]
-recipe = slapos.cookbook:pbs
-client = false
-path = $${directory:htdocs}
-wrapper = $${rootdirectory:bin}/rdiffbackup-server
-rdiffbackup-binary = ${buildout:bin-directory}/rdiff-backup
-
-
-#----------------
-#--
-#-- Apache Proxy.
-
-[apache-proxy]
-recipe = slapos.cookbook:apacheproxy
-url = $${slap-parameter:proxy-url}
-pid-file = $${basedirectory:run}/apache.pid
-lock-file = $${basedirectory:run}/apache.lock
-ip = $${slap-network-information:global-ipv6}
-port = 8080
-error-log = $${directory:httpd-log}/error.log
-access-log = $${directory:httpd-log}/access.log
-httpd-conf = $${rootdirectory:etc}/apache.conf
-wrapper = $${basedirectory:services}/apache
-
-promise = $${basedirectory:promises}/apache
-
-httpd-binary = ${apache:location}/bin/httpd
-
-[logrotate-entry-apache]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = apache
-log = $${apache-proxy:error-log} $${apache-proxy:access-log}
-frequency = daily
-rotate-num = 30
-sharedscripts = true
-notifempty = true
-create = true
-
-
-#----------------
-#--
-#-- Publish instance parameters.
-
-[urls]
-recipe = slapos.cookbook:publish
-url = http://[$${apache-proxy:ip}]:$${apache-proxy:port}/
-ssh-public-key = $${sshkeys-dropbear:public-key-value}
-ssh-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path}
-
+[slap-parameter]
+# Default value if no ssh key is specified
+authorized-key =
+
+# IPv4 AND PORT 80 FRONTEND
+
+[request-frontend]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = Frontend
+# XXX We have hardcoded SR URL here.
+software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+slave = true
+config = url
+config-url = $${mioga-url:direct_url}
+return = site_url
+
+# MIOGA INSTANCE
+
+[mioga-instance]
+recipe = slapos.cookbook:mioga.instantiate
+# mioga_compile_dir = ${template-apacheperl:compile-directory}
+# Pity that the following line does not work. Or does it?
+# mioga_compile_env = ${mioga:environment}
+mioga_location = ${mioga:location}
+mioga_buildinst = ${mioga:buildinst}
+libxslt_bin = ${libxslt:location}/bin
+libxml2_bin = ${libxml2:location}/bin
+rsync_bin = ${rsync:location}/bin
+var_directory = $${rootdirectory:var}
+buildinst_directory = $${rootdirectory:buildinst}
+instance_root = $${buildout:directory}
+perl_bin = ${perl:location}/bin
+postgres_bin = ${postgresql:location}/bin
+htdocs = $${apacheperl-instance:htdocs}
+db_host = $${postgres-urlparse:host}
+db_port = $${postgres-urlparse:port}
+db_dbname = $${postgres-urlparse:path}
+db_username = $${postgres-urlparse:username}
+db_password = $${postgres-urlparse:password}
+public_ipv6 = $${slap-network-information:global-ipv6}
+public_ipv6_port = 8080
+private_ipv4 = $${slap-network-information:local-ipv4}
+httpd_binary = ${apache-2.2:location}/bin/httpd
+path = $${basedirectory:services}/apacheperl
+htdocs = $${basedirectory:htdocs}
+httpd_conf = $${rootdirectory:etc}/httpd.conf
+pid_file = $${basedirectory:services}/apache.pid
+lock_file = $${basedirectory:services}/apache.lock
+dav_locks = $${buildout:directory}/var/dav_locks
+services_dir = $${basedirectory:services}
+error_log = $${rootdirectory:log}/error.log
+access_log = $${rootdirectory:log}/access.log
+bin_dir = $${rootdirectory:bin}
+log_dir = $${rootdirectory:log}
+site_perl = ${perl:siteprefix}
+
+[mioga-url]
+direct_url = http://[$${slap-network-information:global-ipv6}]:$${mioga-instance:public_ipv6_port}
\ No newline at end of file

software/mioga/instance-postgres.cfg

+[buildout]
+parts =
+  symlinks
+  publish
+  postgres-instance
+  postgres-promise
+
+
+# Define egg directories to be the one from Software Release
+# (/opt/slapgrid/...)
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+
+[instance-parameters]
+# Fetches parameters defined in SlapOS Master for this instance
+recipe = slapos.cookbook:slapconfiguration
+computer = $${slap-connection:computer-id}
+partition = $${slap-connection:partition-id}
+url = $${slap-connection:server-url}
+key = $${slap-connection:key-file}
+cert = $${slap-connection:cert-file}
+
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+bin = $${buildout:directory}/bin
+etc = $${buildout:directory}/etc
+services = $${rootdirectory:etc}/run/
+promises = $${rootdirectory:etc}/promise/
+var = $${buildout:directory}/var
+
+
+[symlinks]
+recipe = cns.recipe.symlink
+symlink_target = $${rootdirectory:bin}
+symlink_base = ${postgresql:location}/bin
+
+[postgres-instance]
+# create cluster, configuration files and a database
+recipe = slapos.cookbook:postgres
+
+# Options
+ipv6_host = $${slap-network-information:global-ipv6}
+user = mioga
+port = 5432
+dbname = mioga2
+# pgdata_directory is created by initdb, and should not exist beforehand.
+pgdata-directory = $${rootdirectory:var}/data
+services = $${rootdirectory:services}
+bin = $${rootdirectory:bin}
+
+
+# Deploy promises scripts
+[postgres-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${rootdirectory:promises}/postgres
+hostname = $${slap-network-information:global-ipv6}
+port = $${postgres-instance:port}
+
+
+[publish]
+recipe = slapos.cookbook:publishurl
+url = $${postgres-instance:url}

software/mioga/instance.cfg

 [buildout]
+parts =
+  switch-softwaretype
+
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
 
-parts = instance
-
-[instance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
-source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${template-apacheperl:output}
+postgres = ${template-postgres:output}
 
-httpd_binary = ${apache:location}/bin/httpd
-mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
-mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld

software/mioga/mioga-hooks.py

+
+import fnmatch
+import grp
+import os
+import pprint
+import pwd
+import re
+import shutil
+import sys
+
+class FileModifier:
+  def __init__(self, filename):
+    self.filename = filename
+    f = open(filename, 'rb')
+    self.content = f.read()
+    f.close()
+  
+  def modify(self, key, value):
+    (self.content, count) = re.subn(
+      r'(<parameter[^>]*\sname\s*=\s*"' + re.escape(key) + r'"[^>]*\sdefault\s*=\s*")[^"]*',
+      r"\g<1>" + value,
+      self.content)
+    return count
+      
+  def save(self):
+    f = open(self.filename, 'w')
+    f.write(self.content)
+    f.close()
+
+
+def pre_configure_hook(options, bo, env):
+  location = options['location']
+
+  # TODO: double-check which one of these values must be set
+  # at instantiation time!
+
+  fm = FileModifier('conf/Config.xml')
+  fm.modify('apache_user',  pwd.getpwuid(os.getuid())[0])
+  fm.modify('apache_group', grp.getgrgid(os.getgid())[0])
+  mioga_base = os.path.join(location, 'var', 'lib', 'Mioga2')
+  fm.modify('install_dir', mioga_base)
+  fm.modify('tmp_dir', os.path.join(mioga_base, 'tmp'))
+  fm.modify('search_tmp_dir', os.path.join(mioga_base, 'mioga_search'))
+  fm.modify('maildir', os.path.join(location, 'var', 'spool', 'mioga', 'maildir'))
+  fm.modify('maildirerror', os.path.join(location, 'var', 'spool', 'mioga', 'error'))
+  fm.modify('mailfifo', os.path.join(location, 'var', 'spool', 'mioga', 'fifo'))
+  fm.save()
+
+  # TODO: mail settings are certainly wrong, what is the domain name?
+
+  # Correct shebangs to the right Perl
+  for root, dirnames, filenames in os.walk('.'):
+    for filename in fnmatch.filter(filenames, '*.pl'):
+      with open(os.path.join(root, filename), "r+") as f:
+        lines = f.readlines()
+        (lines[0], count) = re.subn(r'^#!/usr/bin/perl',
+                                    '#!' + options['perl-binary'],
+                                    lines[0], 1)
+        if count > 0:
+          f.seek(0)
+          f.writelines(lines)
+          print "Corrected interpreter for script "+filename
+
+
+
+# def post_make_hook(options, buildout):
+#   location = options['location']
+#   print "Mioga - postmakehook"
+#   print "We are currently in", os.getcwd()
+#   shutil.move("var", location)
+#   return None

software/mioga/mioga-patch

+diff --git a/INSTALL b/INSTALL
+index ef0f369..b275a48 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -382,6 +382,8 @@ A default init script is provided in file web/conf/mioga2.init.d. This script wo
+ Additional configuration for the Search engine
+ ----------------------------------------------
+ 
++The default init script starts the search engine daemon.
++
+ You must edit the crawl_sample.sh to specify default location for configuration files and rename it to crawl.sh.
+ This script must be run by cron in a day basis with apache user (www-data for Debian)
+ 
+diff --git a/Makefile.PL b/Makefile.PL
+index 3582d20..c24e217 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -20,8 +20,10 @@
+ # ============================================================================
+ 
+ 
++use Cwd;
+ use ExtUtils::MakeMaker;
+ use ExtUtils::MakeMaker::Config;
++use File::Find;
+ 
+ # ****************************************************************************
+ # 
+@@ -67,6 +69,7 @@ sub CheckPreDepends {
+ 
+ my $disable_check = grep {lc($_) eq 'disable_check'} @ARGV;
+ 
++if (! $disable_check) {
+ CheckPreDepends({ # 'Data::Dumper' => '2.101',
+ 		  # 'DBI'          => '1.13',
+ 		  # 'DBD::Pg'      => '1.01',
+@@ -75,7 +78,8 @@ CheckPreDepends({ # 'Data::Dumper' => '2.101',
+ 		  'Error'        => '0.15',
+ 		  # 'Net::LDAP'    => '0.25',
+ 		  # 'Unicode::String' => '2.06',
+-	      });
++          })
++}
+     
+ require MiogaConf;
+     
+@@ -115,7 +119,7 @@ my $docsubdirs = "docs";
+ # ----------------------------------------------------------------------------
+ sub MY::processPL {
+ return '
+-# Not realy in the good section, but at a good place:
++# Not really in the good section, but at a good place:
+ # between "all" and next "tardist"
+ 
+ include config.mk
+@@ -124,10 +128,7 @@ tardist: doc
+ dist: doc
+ install ::
+ 	if test -e $(TMP_DIR) ; then \
+-            if test -d $(TMP_DIR) ; then \
+-                ( su - $(APACHE_USER) -c "id" -s /bin/sh || \
+-                    ( echo "===> Problem with \"$(APACHE_USER)\" user" ; exit 1 ) ) \
+-            else \
++            if ! test -d $(TMP_DIR) ; then \
+                 echo "===> File $(TMP_DIR) exists but is not a directory ..." ; \
+                 exit 1 ; \
+             fi \
+@@ -156,6 +157,31 @@ install-all ::
+ 
+ 	(cd web && $(MAKE) setperms) || exit 1;
+ 
++slapos-compilation :: install
++	for i in bin locales web ; \
++	do \
++		(cd $$i && $(MAKE) install) || exit 1;\
++	done
++	# Create symlinks for static content that can be shared among all SlapOS instances	
++	for i in var/lib/Mioga2/static var/lib/Mioga2/conf/themes/default var/lib/Mioga2/conf/xsl; do \
++		mkdir -p `dirname "$(MIOGA_STATIC)/$$i"` && \
++		mv "$(MIOGA_BASE)/$$i" "$(MIOGA_STATIC)/$$i" && \
++		ln -s "$(MIOGA_STATIC)/$$i" "$(MIOGA_BASE)/$$i"; \
++	done
++	# copy a minimal build system into mioga/build
++	mkdir -p "$(MIOGA_BUILDINST)"
++	cp -R --parents \
++		Makefile.PL sql web/conf web/skel conf bin/search/crawl_sample.sh \
++		"$(MIOGA_BUILDINST)"
++
++slapos-instantiation ::
++	rm -Rf web/conf/apache; (cd web/conf && $(MAKE) apache)
++
++	for i in web/conf conf web/skel sql ; \
++	do \
++		(cd $$i && $(MAKE) install) || exit 1;\
++	done
++
+ doc:
+ 	for i in ' . $docsubdirs . ' ; \
+ 	do \
+@@ -176,9 +202,18 @@ installall: install install-all
+ # 
+ # ----------------------------------------------------------------------------
+ 
++my $Mioga2_pm = 'lib/Mioga2.pm';
++if ((not -e $Mioga2_pm) and exists($ENV{MIOGA_SITEPERL})) {
++    my $findfile = sub {
++        if ($_ eq 'Mioga2.pm') {
++            $Mioga2_pm = $File::Find::name;
++        }
++    };
++    find($findfile, $ENV{MIOGA_SITEPERL});
++}; 
+ WriteMakefile(
+    'NAME'  => 'Mioga',
+    'DIR'   => ['bin', 'web',  'locales', 'docs', 'sql'],
+-   'VERSION_FROM' => 'lib/Mioga2.pm',
++   'VERSION_FROM' => $Mioga2_pm,
+ );
+ 
+diff --git a/bin/mailinglist/miogamailinglist.pl b/bin/mailinglist/miogamailinglist.pl
+index 80668e2..fa1603a 100755
+--- a/bin/mailinglist/miogamailinglist.pl
++++ b/bin/mailinglist/miogamailinglist.pl
+@@ -205,11 +205,11 @@ sub MsgSendStock
+ sub CheckUTF8 {
+     my ($str) = @_;
+     
+-    my $conv    = Text::Iconv->new('utf8', 'utf8');
++    my $conv    = Text::Iconv->new('UTF-8', 'UTF-8');
+     my $tmp_str = $conv->convert($str);
+     unless ($tmp_str) {
+         my $charset = detect($str) || 'iso-8859-15'; # defaults to latin9
+-        $conv = Text::Iconv->new($charset, "utf8");
++        $conv = Text::Iconv->new($charset, "UTF-8");
+         $str  = $conv->convert($str);
+     }
+     return $str;
+diff --git a/bin/notifier/searchengine.pl b/bin/notifier/searchengine.pl
+index efd1ca2..fc5ba67 100755
+--- a/bin/notifier/searchengine.pl
++++ b/bin/notifier/searchengine.pl
+@@ -39,8 +39,7 @@ if (!open(FIFO, "+>$fifo")) {
+     syslog('err', "Can't open fifo: $!. Exiting...");
+ }
+ my $flags   = fcntl(FIFO, F_GETFL, 0);
+-
+-
++my $crawler = $config->GetBinariesDir()."/crawl.sh";
+ # MAIN LOOP
+ 
+ my %instances;
+@@ -53,7 +52,7 @@ while (1) {
+ 		$instances{$line} += 1;
+     }
+ 	foreach my $inst (keys(%instances)) {
+-		system("/usr/local/bin/crawl.sh $inst");
++		system("$crawler $inst");
+ 	}
+     fcntl(FIFO, F_SETFL, $flags);
+ }
+diff --git a/conf/Config.xml b/conf/Config.xml
+index e614cda..3a9b7e3 100644
+--- a/conf/Config.xml
++++ b/conf/Config.xml
+@@ -3,6 +3,9 @@
+   <version module="Mioga2"/>
+ 
+   <config>
++    <parameter name="init_sql" question="Initialize database ?"
++	       type="bool" default="no" xpath="/init_sql"/>
++
+     <parameter name="instance_ident" question="First Mioga instance Identifier ?"
+                type="text" default="Mioga"
+                xpath="/instance_ident"/>
+@@ -35,8 +38,18 @@
+     <parameter name="authentication" question="Authentification method ?" 
+                type="enum" default="Mioga2" values="Mioga2"
+                xpath="/authentication"/>
+-    
++
++    <parameter name="bin_dir" question="Directory for helper scripts and binaries ?" 
++               type="text" default="/usr/local/bin"
++               xpath="/bin_dir"/>
++
+     <parameter name="Database settings" type="submenu">
++      <parameter name="db_host" question=" Mioga database server name or address ?" 
++                 type="text" default="localhost"
++                 xpath="/database/DBhost"/>              
++      <parameter name="db_port" question=" Mioga database server port ?" 
++                 type="text" default="5432"
++                 xpath="/database/DBport"/>              
+       <parameter name="db_name" question=" Name of Mioga database ?" 
+                  type="text" default="mioga2"
+                  xpath="/database/DBname"/>              
+@@ -462,7 +475,6 @@
+ 	<app ident="Portal" package="Mioga2::Portal"/>
+   	<app ident="Search" package="Mioga2::Search"/>
+     <app ident="Magellan" package="Mioga2::Magellan"/>
+-    <app ident="Mermoz" package="Mioga2::Mermoz"/>
+     <app ident="RSS" package="Mioga2::RSS"/>
+     <app ident="Narkissos" package="Mioga2::Narkissos"/>
+     <app ident="Colbert" package="Mioga2::Colbert"/>
+@@ -476,7 +488,7 @@
+   	<mioglet ident="Workspace" package="Mioga2::Portal::WSMioglet"/>
+   	<mioglet ident="Organizer" package="Mioga2::Portal::OrgMioglet"/>
+   	<mioglet ident="News" package="Mioga2::Portal::NewsMioglet"/>
+-  	<mioglet ident="File" package="Mioga2::Portal::FileMioglet"/>
++  	<mioglet ident="File" package="Miorouga2::Portal::FileMioglet"/>
+   	<mioglet ident="Articles" package="Mioga2::Portal::ArticlesMioglet"/>
+     <mioglet ident="Poll" package="Mioga2::Portal::PollMioglet"/>
+ 	<mioglet ident="Search" package="Mioga2::Portal::SearchMioglet"/>
+diff --git a/lib/Mioga2/Bottin.pm b/lib/Mioga2/Bottin.pm
+index ba4cd8d..0db5651 100644
+--- a/lib/Mioga2/Bottin.pm
++++ b/lib/Mioga2/Bottin.pm
+@@ -1742,11 +1742,11 @@ sub InitSuperAdminMode {
+ sub CheckUTF8 {
+     my ($str) = @_;
+     
+-    my $conv    = Text::Iconv->new('utf8', 'utf8');
++    my $conv    = Text::Iconv->new('UTF-8', 'UTF-8');
+     my $tmp_str = $conv->convert($str);
+     unless ($tmp_str) {
+-        my $charset = detect($str) || 'iso-8859-15'; # defaults to latin9
+-        $conv = Text::Iconv->new($charset, "utf8");
++        my $charset = detect($str) || 'ISO-8859-15'; # defaults to latin9
++        $conv = Text::Iconv->new($charset, "UTF-8");
+         $str  = $conv->convert($str);
+     }
+     return $str;
+diff --git a/lib/Mioga2/Classes/URI.pm b/lib/Mioga2/Classes/URI.pm
+index 8678b33..bf97e71 100644
+--- a/lib/Mioga2/Classes/URI.pm
++++ b/lib/Mioga2/Classes/URI.pm
+@@ -75,15 +75,16 @@ sub new {
+   
+   # convert uri to UTF-8
+   my $uri     = uri_unescape($options{uri});
++    
+   
+   # attempt to see if uri is utf8 to avoid detection
+-  my $conv    = Text::Iconv->new('utf8', 'utf8');
++  my $conv    = Text::Iconv->new('UTF-8', 'UTF-8');
+   my $tmp_uri = $conv->convert($uri);
+-  
++
+   unless ($tmp_uri) {
+-    my $charset = detect($uri) || 'iso-8859-15'; # defaults to latin9
++    my $charset = detect($uri) || 'ISO-8859-15'; # defaults to latin9
+     warn "charset = '$charset' for uri = '$uri'" if $debug;
+-    $conv = Text::Iconv->new($charset, "utf8");
++    $conv = Text::Iconv->new($charset, "UTF-8");
+     $uri  = $conv->convert($uri);
+     warn "==> converted uri = '$uri'" if $debug;
+   }
+diff --git a/lib/Mioga2/Config.pm b/lib/Mioga2/Config.pm
+index b088823..4edac62 100644
+--- a/lib/Mioga2/Config.pm
++++ b/lib/Mioga2/Config.pm
+@@ -28,7 +28,7 @@ Config.pm: Access class to the current Mioga instance configuration.
+ This module permits to access to the current Mioga instance
+ configuration parameters.
+ 
+-=head1 METHODS DESRIPTION
++=head1 METHODS DESCRIPTION
+ 
+ =cut
+ 
+diff --git a/lib/Mioga2/DAVFS.pm b/lib/Mioga2/DAVFS.pm
+index b56c4ad..7810f82 100644
+--- a/lib/Mioga2/DAVFS.pm
++++ b/lib/Mioga2/DAVFS.pm
+@@ -141,10 +141,11 @@ use Mioga2::tools::APIAuthz;
+ use Mioga2::tools::database;
+ use Mioga2::tools::string_utils;
+ use Mioga2::tools::Convert;
++use Net::INET6Glue::INET_is_INET6;
+ use XML::LibXML ();
+ use Mioga2::Constants;
+ 
+-my $debug = 0;
++my $debug = 5;
+ 
+ my $MULTI_STATUS	= 207;	# code DAV for the Multi-status response
+ 
+@@ -756,13 +757,17 @@ sub make_request {
+ 	my $host = $self->{host};
+ 	my $port = $self->{port};
+ 
++    my $hostport = $host;
++    $hostport = '['.$hostport.']' if $host =~ /:.*:/;
++    $hostport .= ':'.$port;
++
+ 	my $dav_uri   = $config->GetDAVBasePath;
+ 	my $mioga_uri = $config->GetBasePath;
+ 
+ 	my $orig_uri = Mioga2::Classes::URI->new( uri => $callbacks->{uri}->() );
+ 	my $uri      = $orig_uri->as_string;
+ 	$uri =~ s/^$mioga_uri/$dav_uri/;
+-	$uri = Mioga2::Classes::URI->new( uri => "$protocol://$host:$port$uri" )
++	$uri = Mioga2::Classes::URI->new( uri => "$protocol://$hostport$uri" )
+ 	  ->as_string;
+ 	print STDERR "[Mioga2::DAVFS::make_request] uri = $uri\n" if $debug;
+ 
+@@ -774,7 +779,7 @@ sub make_request {
+ 
+ 		# process headers
+ 		if ( $header =~ /^destination/i && $value !~ $dav_uri ) {
+-			$value =~ s!(//)[^/]+$mioga_uri!$1$host$dav_uri!;
++			$value =~ s!(//)[^/]+$mioga_uri!$1$hostport$dav_uri!; # was only $host before!
+ 			$value = Mioga2::Classes::URI->new( uri => $value )->as_string;
+ 			$value = $self->escapeSpecialChars($value);
+ 		}
+diff --git a/lib/Mioga2/Database.pm b/lib/Mioga2/Database.pm
+index 4afa54b..ca8368c 100644
+--- a/lib/Mioga2/Database.pm
++++ b/lib/Mioga2/Database.pm
+@@ -61,7 +61,7 @@ sub new {
+ 	my $self = { };
+ 	bless($self, $class);
+ 
+-	for my $attr (qw/DBIlogin DBIpasswd DBIdriver DBname/) {
++	for my $attr (qw/DBhost DBport DBIlogin DBIpasswd DBIdriver DBname/) {
+ 		if (!defined ($attributes{$attr})) {
+ 			throw Mioga2::Exception::DB ("[Mioga2::Database::new]", "Cannot connect to database: " . $DBI::errstr);
+ 		}
+@@ -72,8 +72,10 @@ sub new {
+ 	my $dbiPassword = $self->{database}->{DBIpasswd};
+ 	my $dbDriver = $self->{database}->{DBIdriver};
+ 	my $dbName = $self->{database}->{DBname};
++    my $dbHost = $self->{database}->{DBhost};
++    my $dbPort = $self->{database}->{DBport};
+ 
+-	my $datasource = "dbi:$dbDriver:dbname=$dbName";
++	my $datasource = "dbi:$dbDriver:dbname=$dbName;host=$dbHost;port=$dbPort";
+ 
+ 	$self->{dbh} = DBI->connect($datasource, $dbiUser, $dbiPassword);
+ 
+diff --git a/lib/Mioga2/Exception/DB.pm b/lib/Mioga2/Exception/DB.pm
+index 7ce5020..dd29d83 100644
+--- a/lib/Mioga2/Exception/DB.pm
++++ b/lib/Mioga2/Exception/DB.pm
+@@ -1,3 +1,4 @@
++
+ # ============================================================================
+ # Mioga2 Project (C) 2003-2007 The Mioga2 Project
+ #
+@@ -53,6 +54,7 @@ sub new {
+     my($class, $function, $errDB, $errStr, $sql) = @_;
+ 	my $self = $class->SUPER::new(-text => "$errStr : $errDB");
+ 	$self->{errDB} = $errDB;
++    $self->{errStr} =  $errStr;
+ 	$self->{sql} = $sql;
+ 	$self->{function} = $function;
+ 	return $self;
+@@ -76,6 +78,27 @@ sub as_string
+ 	return $string;
+ }
+ 
++# ----------------------------------------------------------------------------
++=head2 getDBerr ()
++Return the error code as sent by the database connector.
++=cut 
++# ----------------------------------------------------------------------------
++sub getDBerr {
++    my ($self) = @_;
++    return $self->{errDB};
++}
++
++# ----------------------------------------------------------------------------
++=head2 getDBerrstr ()
++Return the error string as sent by the database connector.
++=cut 
++# ----------------------------------------------------------------------------
++sub getDBerrstr {
++    my ($self) = @_;
++    return $self->{errStr};
++}
++
++
+ # ============================================================================
+ 
+ =head1 PRIVATE METHODS DESCRIPTION
+diff --git a/lib/Mioga2/InstanceList.pm b/lib/Mioga2/InstanceList.pm
+index 3e2cf7a..a676a1b 100644
+--- a/lib/Mioga2/InstanceList.pm
++++ b/lib/Mioga2/InstanceList.pm
+@@ -423,7 +423,9 @@ sub Store {
+ 		$conf->RunHooks($self->{config}->{miogaconf});
+ 
+ 		# Run crawl.sh to initialize search engine database
+-		my $crawlcmd = $self->{config}->{miogaconf}->GetMiogaPrefix () . "/bin/mioga2_index.pl --conf=" . $self->{config}->GetMiogaConfPath () . ' --search_conf=' . $self->{config}->GetInstallPath . "/conf/search_conf.xml" . ' ' . $self->Get ('ident');
++		my $crawlcmd = $self->{config}->{miogaconf}->GetMiogaPrefix () . "/bin/mioga2_index.pl --conf=" . $self->{config}->GetMiogaConfPath () 
++			. ' --search_conf=' . $self->{config}->{miogaconf}->GetInstallDir()."/conf/search_conf.xml" 
++                	. ' '. $self->Get ('ident');
+ 		system ("$crawlcmd");
+ 	}
+ 	elsif (scalar (keys (%{$self->{update}}))) {
+diff --git a/lib/Mioga2/Magellan.pm b/lib/Mioga2/Magellan.pm
+index 86e2e42..4b3814a 100644
+--- a/lib/Mioga2/Magellan.pm
++++ b/lib/Mioga2/Magellan.pm
+@@ -327,10 +327,13 @@ sub GetNodes {
+ 			$mygroup = $group;
+ 		}
+ 
++        my $host = $config->GetMiogaConf()->GetDAVHost();
++        $host = "[${host}]" if $host =~ /:.*?:/;
++
+         my $resources = Mioga2::Magellan::DAV::GetCollection(
+             $context,
+             $context->GetSessionToken,
+-            $config->GetMiogaConf ()->GetDAVProtocol () . "://" . $config->GetMiogaConf ()->GetDAVHost () . ":" . $config->GetMiogaConf ()->GetDAVPort (), $node
++            $config->GetMiogaConf ()->GetDAVProtocol () . "://" . $host . ":" . $config->GetMiogaConf ()->GetDAVPort (), $node
+         );
+ 
+ 		$inconsistent = pop (@$resources);
+@@ -853,7 +856,7 @@ sub GetResource {
+ 			);
+ 			print STDERR "mime = $mime\n content= $content\n" if ($debug);
+ 			if ($mime) {
+-				#my $conv = Text::Iconv->new( 'utf8', 'utf8' );
++				#my $conv = Text::Iconv->new( 'UTF-8', 'UTF-8' );
+ 				#my $encoding = $conv->convert($content);
+ 				#if ($encoding) {
+ 				if ($mime =~ /(application\/xml)|(text\/)|(application\/xsl)/)
+diff --git a/lib/Mioga2/Magellan/Archive.pm b/lib/Mioga2/Magellan/Archive.pm
+index 842ae90..3b9e7f7 100644
+--- a/lib/Mioga2/Magellan/Archive.pm
++++ b/lib/Mioga2/Magellan/Archive.pm
+@@ -163,7 +163,7 @@ sub Content
+         return undef;
+     }
+ 
+-    my $conv  = Text::Iconv->new('utf8', 'utf8');
++    my $conv  = Text::Iconv->new('UTF-8', 'UTF-8');
+     my %folders;
+     while(my $file = <PRG>) {
+       chomp($file);
+diff --git a/lib/Mioga2/Magellan/DAV.pm b/lib/Mioga2/Magellan/DAV.pm
+index cdf77f1..116ebf4 100644
+--- a/lib/Mioga2/Magellan/DAV.pm
++++ b/lib/Mioga2/Magellan/DAV.pm
+@@ -106,7 +106,7 @@ sub ExecuteRequest
+ 	}
+ 
+ 	if ($response->code >= 500) {
+-		warn "Mioga2::Magellan::ExecuteRequest Failed: " . $response->content;
++		warn "Mioga2::Magellan::DAV::ExecuteRequest Failed: " . $response->content;
+ 	}
+ 
+ 	return  $response;
+diff --git a/lib/Mioga2/MailingList.pm b/lib/Mioga2/MailingList.pm
+index c7d631c..3a92466 100644
+--- a/lib/Mioga2/MailingList.pm
++++ b/lib/Mioga2/MailingList.pm
+@@ -749,11 +749,11 @@ sub MailDeleteMsg
+ sub CheckUTF8 {
+     my ($str) = @_;
+     
+-    my $conv    = Text::Iconv->new('utf8', 'utf8');
++    my $conv    = Text::Iconv->new('UTF-8', 'UTF-8');
+     my $tmp_str = $conv->convert($str);
+     unless ($tmp_str) {
+-        my $charset = detect($str) || 'iso-8859-15'; # defaults to latin9
+-        $conv = Text::Iconv->new($charset, "utf8");
++        my $charset = detect($str) || 'ISO-8859-15'; # defaults to latin9
++        $conv = Text::Iconv->new($charset, "UTF-8");
+         $str  = $conv->convert($str);
+     }
+     return $str;
+diff --git a/lib/Mioga2/MiogaConf.pm b/lib/Mioga2/MiogaConf.pm
+index 5b74a96..a46e27c 100644
+--- a/lib/Mioga2/MiogaConf.pm
++++ b/lib/Mioga2/MiogaConf.pm
+@@ -258,7 +258,7 @@ sub GetFilenameEncoding {
+ sub GetBinariesDir {
+ 	my ($self) = @_;
+ 
+-	return $self->{binaries_dir};
++	return $self->{bin_dir};
+ }
+ 
+ # ============================================================================
+diff --git a/lib/Mioga2/Search.pm b/lib/Mioga2/Search.pm
+index 2c20259..292f864 100644
+--- a/lib/Mioga2/Search.pm
++++ b/lib/Mioga2/Search.pm
+@@ -447,13 +447,13 @@ sub CheckArgs
+ 	elsif (exists($context->{args}->{query})) {
+ 		$query_string = $context->{args}->{query};
+ 	}
+-	my $conv    = Text::Iconv->new('utf8', 'utf8');
++	my $conv    = Text::Iconv->new('UTF-8', 'UTF-8');
+  	my $tmp_query = $conv->convert($query_string);
+   
+ 	unless ($tmp_query) {
+-		my $charset = detect($query_string) || 'iso-8859-15'; # defaults to latin9
++		my $charset = detect($query_string) || 'ISO-8859-15'; # defaults to latin9
+ 		warn "charset = '$charset' for query_string = '$query_string'" if $debug;
+-		$conv = Text::Iconv->new($charset, "utf8");
++		$conv = Text::Iconv->new($charset, "UTF-8");
+ 		$query_string  = $conv->convert($query_string);
+ 		warn "==> converted query_string = '$query_string'" if $debug;
+ 	}
+diff --git a/lib/Mioga2/tools/string_utils.pm b/lib/Mioga2/tools/string_utils.pm
+index c56cc3b..36bfa5a 100644
+--- a/lib/Mioga2/tools/string_utils.pm
++++ b/lib/Mioga2/tools/string_utils.pm
+@@ -46,6 +46,7 @@ use Mioga2::Content::XSLT;
+ use Mioga2::XML::Simple;
+ use Exporter;
+ use Text::Iconv;
++use Encode;
+ use Encode::Detect::Detector;
+ use Data::Dumper;
+ use HTML::TokeParser::Simple;
+@@ -715,11 +716,11 @@ Check if string is UTF8 and convert it if needed
+ sub st_CheckUTF8 {
+     my ($str) = @_;
+     
+-    my $conv    = Text::Iconv->new('utf8', 'utf8');
++    my $conv    = Text::Iconv->new('UTF-8', 'UTF-8');
+     my $tmp_str = $conv->convert($str);
+     unless ($tmp_str) {
+-        my $charset = detect($str) || 'iso-8859-15'; # defaults to latin9
+-        $conv = Text::Iconv->new($charset, "utf8");
++        my $charset = detect($str) || 'ISO-8859-15'; # defaults to latin9
++        $conv = Text::Iconv->new($charset, "UTF-8");
+         $str  = $conv->convert($str);
+ 		utf8::decode ($str);
+     }
+diff --git a/lib/MiogaConf.pm b/lib/MiogaConf.pm
+index 0870174..bbcc80a 100644
+--- a/lib/MiogaConf.pm
++++ b/lib/MiogaConf.pm
+@@ -836,6 +836,10 @@ sub CheckDepends
+ 	my @missing;
+ 	my @missing_clib;
+ 
++	# Some modules rewrite $ENV{PATH} without hesitation when "require"d,      
++	# we need to put the old one back in place.                                
++	my $oldpath = $ENV{PATH}; 
++
+ 	foreach my $dep (@{$self->{CONFIG}->{dependencies}->[0]->{dep}}) {
+ 		my $version;
+ 		if(exists $dep->{version}) {
+@@ -858,6 +862,7 @@ sub CheckDepends
+ 		}
+ 	}
+ 	
++	$ENV{PATH} = $oldpath;
+ 
+ 	foreach my $dep (@{$self->{CONFIG}->{dependencies}->[0]->{clib}}) {
+ 		my $version;
+diff --git a/sql/Makefile b/sql/Makefile
+index 07b26f5..3d79b1b 100644
+--- a/sql/Makefile
++++ b/sql/Makefile
+@@ -15,19 +15,21 @@ install:
+ 	cp upgradeMiogletDesc.pl $(DESTDIR)$(INSTALL_DIR)/conf/Config.hook.d
+ 	chmod a+x $(DESTDIR)$(INSTALL_DIR)/conf/Config.hook.d/upgradeMiogletDesc.pl
+ 
+-	if [ $(INIT_SQL) = 'yes' ] ; \
++	DB_STATE=`perl -w testdb.pl`; \
++	if [ "$$DB_STATE" = "nodb" -o "$$DB_STATE" = "empty" ] ; \
+ 	then \
+ 		echo "Initialize database"; \
+-		su - $(POSTGRES_USER) -c "dropdb $(DB_NAME)" ; \
+-		su - $(POSTGRES_USER) -c "createdb --encoding UTF8 $(DB_NAME)" && \
+-		su $(POSTGRES_USER) -c "psql $(DB_NAME) < create_lang.sql" && \
+-		perl -w -I../lib initdb.pl ; \
+-	elif [ $(INIT_SQL) != 'noupdate' ]; then \
++        dropdb -h $(DB_HOST) -p $(DB_PORT) -U $(DBI_LOGIN) $(DB_NAME) ; \
++		createdb --encoding UTF8 -h $(DB_HOST) -p $(DB_PORT) -U $(DBI_LOGIN) $(DB_NAME) && \
++		psql -h $(DB_HOST) -p $(DB_PORT) -U $(DBI_LOGIN) $(DB_NAME) < create_lang.sql && \
++		perl -w -I../lib initdb.pl force_init_sql=1; \
++	elif [ "$$DB_STATE" = "present" ]; then \
+ 		echo "Update database"; \
+ 		perl -w -I../lib updatedb.pl configxml=$(DESTDIR)$(INSTALL_DIR)/conf/Config.xml; \
++	elif [ "$$DB_STATE" = "noserver" ]; then \
++		echo "ERROR: Cannot connect to the database server!"; \
+ 	fi
+ 
+-
+ clean:
+ 	rm -f *~
+ 
+diff --git a/sql/schema_base.sql b/sql/schema_base.sql
+index b7d8cc2..88d5e2d 100644
+--- a/sql/schema_base.sql
++++ b/sql/schema_base.sql
+@@ -429,10 +429,6 @@ CREATE OR REPLACE FUNCTION check_group_base_default_profile_id () RETURNS trigge
+     END;
+ ' LANGUAGE 'plpgsql';
+ 
+-CREATE TRIGGER m_group_base_default_profile_id_check
+-     BEFORE DELETE ON m_profile FOR EACH ROW
+-     EXECUTE PROCEDURE check_group_base_default_profile_id ();
+-
+ 
+ CREATE OR REPLACE FUNCTION check_group_base_mioga_id () RETURNS trigger AS '
+     DECLARE
+@@ -839,6 +835,10 @@ create table m_profile (
+ );
+ create unique index m_profile_ident_group_index on m_profile (ident, group_id);
+ 
++CREATE TRIGGER m_group_base_default_profile_id_check
++     BEFORE DELETE ON m_profile FOR EACH ROW
++     EXECUTE PROCEDURE check_group_base_default_profile_id ();
++
+ 
+ --
+ -- Add referencial integrity on default_profile_id in m_group_base
+diff --git a/sql/testdb.pl b/sql/testdb.pl
+new file mode 100755
+index 0000000..1952891
+--- /dev/null
++++ b/sql/testdb.pl
+@@ -0,0 +1,64 @@
++#!/usr/bin/perl -w
++
++# Tests the availability of the Mioga2 database.
++# Returns on stdout one of:
++# 'present'  - The Mioga2 database has been found and contains data.
++# 'empty'    - The Mioga2 database exists but the table "m_mioga" is empty or nonexistent.
++# 'nodb'     - There is no Mioga2 database but the database server is working fine
++#              (i.e. one can try to create the database)
++# 'noserver' - Connection to the database server failed.
++
++# This has been written for Mioga2/SlapOS, to avoid overwriting the database
++# when re-instantiating the Apache/mod_perl partition.
++
++use strict;
++use lib "../lib";
++
++use Data::Dumper;
++use DBI;
++use Error qw(:try);
++use Mioga2::Exception::DB;
++use Mioga2::MiogaConf;
++
++# TODO: get this through a parameter?
++# my $configxml = "../conf/Config.xml";
++my $miogaconf = "../web/conf/Mioga.conf";
++
++my $result = 'undefined';
++try {
++    my $config = new Mioga2::MiogaConf($miogaconf);
++    my $dbh = $config->GetDBH();
++    my $sql = 'SELECT COUNT(*) FROM m_mioga';
++    my $sth = $dbh->prepare($sql);
++    my $exec_result = $sth->execute();
++    if (not defined($exec_result)) {
++        throw Mioga2::Exception::DB("testdb.pl 0", $sth->err, $sth->errstr, $sql);
++    }
++    my $res = $sth->fetchrow_arrayref();
++    if (not defined($res)) {
++        throw Mioga2::Exception::DB("testdb.pl 1", $sth->err, $sth->errstr, $sql);
++    }
++    my $count = $res->[0];
++    if (not defined($count)) {
++        throw Mioga2::Exception::DB("testdb.pl 2", $sth->err, $sth->errstr, $sql);
++    } elsif ($count == 0) {
++        $result = 'empty';
++    } else {
++        $result = 'present';
++    }   
++} catch Mioga2::Exception::DB with {
++    my $err = shift;
++    my $errstr = $err->getDBerrstr();
++    if ($errstr =~ m#database "mioga2" does not exist#) {
++        $result = 'nodb';
++    } elsif ($errstr =~ m#relation "m_mioga" does not exist#) {
++        $result = 'empty';
++    } else {
++        $result = 'noserver';
++    }
++} otherwise {
++    my $err = shift;
++    $result = 'noserver';
++};
++
++print $result;
+diff --git a/sql/updatedb.pl b/sql/updatedb.pl
+index 67921e7..bb4db1a 100644
+--- a/sql/updatedb.pl
++++ b/sql/updatedb.pl
+@@ -25,7 +25,7 @@ foreach my $var qw(configxml miogaconf timezonexml dir) {
+ 
+ my $config = new Mioga2::MiogaConf($miogaconf);
+ 
+-my $conf = new MiogaConf( dir => $dir, config => $configxml);
++my $conf = new MiogaConf( dir => $dir, config => $configxml, force_init_sql => 0);
+ $conf->Install($config);
+ 
+ 
+diff --git a/web/Makefile b/web/Makefile
+index 66af45f..9649a02 100644
+--- a/web/Makefile
++++ b/web/Makefile
+@@ -16,11 +16,11 @@ all ::
+ 
+ 
+ install ::
+-	if [ $(INIT_SQL) = 'yes' -a -d $(INSTALL_DIR) ] ; \
+-	then \
+-	     su - $(POSTGRES_USER) -c "pg_dump -b -Ft --column-inserts $(DB_NAME) | gzip" > ${INSTALL_DIR}/db_dump.tar.gz ; \
+-	     mv $(INSTALL_DIR) $(BACKUP_DIR) ; \
+-        fi
++#	if [ $(INIT_SQL) = 'yes' -a -d $(INSTALL_DIR) ] ; \
++#	then \
++#	     su - $(POSTGRES_USER) -c "pg_dump -b -Ft --column-inserts $(DB_NAME) | gzip" > ${INSTALL_DIR}/db_dump.tar.gz ; \
++#	     mv $(INSTALL_DIR) $(BACKUP_DIR) ; \
++#       fi
+ 
+ 	mkdir -p $(TMP_DIR)
+ 	mkdir -p $(DESTDIR)$(INSTALL_DIR)/$(INSTANCE_IDENT)/$(MIOGA_FILES)
+diff --git a/web/conf/Makefile b/web/conf/Makefile
+index 1573e5c..189f2fd 100644
+--- a/web/conf/Makefile
++++ b/web/conf/Makefile
+@@ -14,5 +14,6 @@ install:
+ # is done in ../Makefile
+ 
+ clean:
++	echo "VHH DEBUG: web/conf make clean, deleting apache/ !"
+ 	rm -Rf apache Mioga.conf .memdump
+ 
+diff --git a/web/conf/startup.pl b/web/conf/startup.pl
+index a9dc968..6558061 100644
+--- a/web/conf/startup.pl
++++ b/web/conf/startup.pl
+@@ -29,6 +29,7 @@ use MIME::Entity ();
+ use MIME::Parser ();
+ use MIME::QuotedPrint ();
+ use MiogaConf ();
++use Net::INET6Glue::INET_is_INET6;
+ use Net::LDAP ();
+ use Parse::Yapp::Driver ();
+ use Storable ();
+diff --git a/web/skel/Makefile b/web/skel/Makefile
+index e604e7d..fbaad2d 100644
+--- a/web/skel/Makefile
++++ b/web/skel/Makefile
+@@ -33,7 +33,7 @@ fr_FR : $(SRC_FR_FILES)
+ install:
+ 	rsync $(RSYNC_OPTS) $(SUBDIRS) $(DESTDIR)$(INSTALL_DIR)/conf/skel/
+ 	# Update instance default skeletons
+-	for i in `mioga2_info.pl --conf=$(DESTDIR)$(INSTALL_DIR)/conf/Mioga.conf instances`; do if [ ! -d /var/lib/Mioga2/$$i/MiogaFiles/skel/ ]; then mkdir $(DESTDIR)$(INSTALL_DIR)/$$i/MiogaFiles/skel/; fi; cp -R $(DESTDIR)$(INSTALL_DIR)/conf/skel/* $(DESTDIR)$(INSTALL_DIR)/$$i/MiogaFiles/skel/; done
++#	for i in `mioga2_info.pl --conf=$(DESTDIR)$(INSTALL_DIR)/conf/Mioga.conf instances`; do if [ ! -d /var/lib/Mioga2/$$i/MiogaFiles/skel/ ]; then mkdir $(DESTDIR)$(INSTALL_DIR)/$$i/MiogaFiles/skel/; fi; cp -R $(DESTDIR)$(INSTALL_DIR)/conf/skel/* $(DESTDIR)$(INSTALL_DIR)/$$i/MiogaFiles/skel/; done
+ 
+ clean:
+ 	rm -rf $(SUBDIRS)
+diff --git a/web/skel/src/en_US/group/50-standard.xml b/web/skel/src/en_US/group/50-standard.xml
+index 6cf89e5..e1ef140 100644
+--- a/web/skel/src/en_US/group/50-standard.xml
++++ b/web/skel/src/en_US/group/50-standard.xml
+@@ -12,7 +12,6 @@
+ 	<applications>
+ 		<application ident="AnimGroup" active="1"/>
+ 		<application ident="Magellan" active="1"/>
+-		<application ident="Mermoz" active="1"/>
+ 		<application ident="Organizer"/>
+ 		<application ident="Contact"/>
+ 		<application ident="Tasks"/>
+@@ -38,9 +37,6 @@
+ 			<application ident="Magellan">
+ 				<all_functions/>
+ 			</application>
+-			<application ident="Mermoz">
+-				<all_functions/>
+-			</application>
+ 			<application ident="Portal">
+ 				<all_functions/>
+ 			</application>
+@@ -53,10 +49,6 @@
+ 			<application ident="Magellan">	
+ 				<function>Read</function>
+ 			</application>
+-			<application ident="Mermoz">	
+-				<function>Base</function>
+-				<function>Standard</function>
+-			</application>
+ 			<application ident="Portal">
+ 				<function>Portal</function>
+ 			</application>
+@@ -69,9 +61,6 @@
+ 			<application ident="Magellan">	
+ 				<function>Read</function>
+ 			</application>
+-			<application ident="Mermoz">	
+-				<function>Base</function>
+-			</application>
+ 			<application ident="Portal">
+ 				<function>Portal</function>
+ 			</application>
+diff --git a/web/skel/src/en_US/group/60-admin.xml b/web/skel/src/en_US/group/60-admin.xml
+index c73b700..d3f368b 100644
+--- a/web/skel/src/en_US/group/60-admin.xml
++++ b/web/skel/src/en_US/group/60-admin.xml
+@@ -12,7 +12,6 @@
+ 	<applications>
+ 		<application ident="AnimGroup" active="1"/>
+ 		<application ident="Magellan" active="1"/>
+-		<application ident="Mermoz" active="1"/>
+ 		<application ident="Colbert" active="1"/>
+ 		<application ident="Organizer"/>
+ 		<application ident="Contact"/>
+@@ -39,9 +38,6 @@
+ 			<application ident="Magellan">
+ 				<all_functions/>
+ 			</application>
+-			<application ident="Mermoz">
+-				<all_functions/>
+-			</application>
+ 			<application ident="Colbert">
+ 				<all_functions/>
+ 			</application>
+@@ -57,10 +53,6 @@
+ 			<application ident="Magellan">	
+ 				<function>Read</function>
+ 			</application>
+-			<application ident="Mermoz">	
+-				<function>Base</function>
+-				<function>Standard</function>
+-			</application>
+ 			<application ident="Colbert">
+ 				<function>UsersWrite</function>
+ 				<function>GroupsWrite</function>
+@@ -79,9 +71,6 @@
+ 			<application ident="Magellan">	
+ 				<function>Read</function>
+ 			</application>
+-			<application ident="Mermoz">	
+-				<function>Base</function>
+-			</application>
+ 			<application ident="Colbert">
+ 				<function>UsersRead</function>
+ 				<function>GroupsRead</function>
+diff --git a/web/skel/src/en_US/instance/50-standard.xml b/web/skel/src/en_US/instance/50-standard.xml
+index cdb1e88..82a125b 100644
+--- a/web/skel/src/en_US/instance/50-standard.xml
++++ b/web/skel/src/en_US/instance/50-standard.xml
+@@ -102,10 +102,6 @@
+ 		</application>
+ 		<application ident="MailingList">
+ 		</application>
+-		<application ident="Mermoz">
+-			<all_users/>
+-			<all_groups/>
+-		</application>
+ 		<application ident="Narkissos">
+ 			<all_users/>
+ 		</application>
+diff --git a/web/skel/src/en_US/user/50-standard.xml b/web/skel/src/en_US/user/50-standard.xml
+index c8983bb..256400d 100644
+--- a/web/skel/src/en_US/user/50-standard.xml
++++ b/web/skel/src/en_US/user/50-standard.xml
+@@ -92,7 +92,6 @@
+ 		<application ident="FileBrowser"/>
+ 		<application ident="Portal"/>
+ 		<application ident="Search" active="1"/>
+-		<application ident="Mermoz"/>
+ 		<application ident="RSS" active="1"/>
+ 	</applications>
+ 
+diff --git a/web/skel/src/en_US/user/60-admin.xml b/web/skel/src/en_US/user/60-admin.xml
+index 9083b6f..e246d19 100644
+--- a/web/skel/src/en_US/user/60-admin.xml
++++ b/web/skel/src/en_US/user/60-admin.xml
+@@ -101,7 +101,6 @@
+ 		<application ident="FileBrowser"/>
+ 		<application ident="Portal"/>
+ 		<application ident="Search" active="1"/>
+-		<application ident="Mermoz"/>
+ 		<application ident="RSS" active="1"/>
+ 	</applications>
+ 
+diff --git a/web/skel/src/fr_FR/group/50-standard.xml b/web/skel/src/fr_FR/group/50-standard.xml
+index 954f71d..dfc79b1 100644
+--- a/web/skel/src/fr_FR/group/50-standard.xml
++++ b/web/skel/src/fr_FR/group/50-standard.xml
+@@ -35,9 +35,6 @@
+ 		<!-- Le navigateur de fichiers est accessible et actif. -->
+ 		<application ident="Magellan" active="1"/>
+ 
+-		<!-- L'application de rédaction d'e-mails est accessible et active. -->
+-		<application ident="Mermoz" active="1"/>
+-
+ 		<!-- Le portail est accessible et actif. -->
+ 		<application ident="Portal" active="1"/>
+ 
+@@ -77,11 +74,6 @@
+ 				<all_functions/>
+ 			</application>
+ 
+-			<!-- Le profil "Animation" donne accès à toutes les fonctions de l'application Mermoz d'envoi d'e-mail. -->
+-			<application ident="Mermoz">
+-				<all_functions/>
+-			</application>
+-
+ 			<!-- Le profil "Animation" donne accès à toutes les fonctions du portail de groupe. -->
+ 			<application ident="Portal">
+ 				<all_functions/>
+@@ -102,12 +94,6 @@
+ 				<function>Read</function>
+ 			</application>
+ 
+-			<!-- Le profil "Membre" donne accès uniquement à l'envoi d'e-mail au groupe ou indépendamment aux différentes équipes du groupe via l'application d'envoi d'e-mail Mermoz. -->
+-			<application ident="Mermoz">	
+-				<function>Base</function>
+-				<function>Standard</function>
+-			</application>
+-
+ 			<!-- Le profil "Membre" donne accès uniquement à la consultation du portail de groupe. -->
+ 			<application ident="Portal">
+ 				<function>Portal</function>
+@@ -128,11 +114,6 @@
+ 				<function>Read</function>
+ 			</application>
+ 
+-			<!-- Le profil "Invité" donne accès uniquement à l'envoi d'e-mail au groupe via l'application d'envoi d'e-mail Mermoz. -->
+-			<application ident="Mermoz">	
+-				<function>Base</function>
+-			</application>
+-
+ 			<!-- Le profil "Invité" donne accès uniquement à la consultation du portail de groupe. -->
+ 			<application ident="Portal">
+ 				<function>Portal</function>
+@@ -151,6 +132,7 @@
+ 		<space type="private">
+ 			
+ 			<!-- La balise "acls" contient les définitions de droits d'accès à la racine de l'espace privé du groupe. -->
++
+ 			<acls>
+ 
+ 				<!-- Les profils "Animation" et "Membre" ont accès en lecture et écriture. -->
+diff --git a/web/skel/src/fr_FR/group/60-admin.xml b/web/skel/src/fr_FR/group/60-admin.xml
+index d9bd724..1c97ca5 100644
+--- a/web/skel/src/fr_FR/group/60-admin.xml
++++ b/web/skel/src/fr_FR/group/60-admin.xml
+@@ -12,7 +12,6 @@
+ 	<applications>
+ 		<application ident="AnimGroup" active="1"/>
+ 		<application ident="Magellan" active="1"/>
+-		<application ident="Mermoz" active="1"/>
+ 		<application ident="Colbert" active="1"/>
+ 		<application ident="Organizer"/>
+ 		<application ident="Contact"/>
+@@ -39,9 +38,6 @@
+ 			<application ident="Magellan">
+ 				<all_functions/>
+ 			</application>
+-			<application ident="Mermoz">
+-				<all_functions/>
+-			</application>
+ 			<application ident="Colbert">
+ 				<all_functions/>
+ 			</application>
+@@ -57,10 +53,6 @@
+ 			<application ident="Magellan">	
+ 				<function>Read</function>
+ 			</application>
+-			<application ident="Mermoz">	
+-				<function>Base</function>
+-				<function>Standard</function>
+-			</application>
+ 			<application ident="Colbert">
+ 				<function>UsersWrite</function>
+ 				<function>GroupsWrite</function>
+@@ -79,9 +71,6 @@
+ 			<application ident="Magellan">	
+ 				<function>Read</function>
+ 			</application>
+-			<application ident="Mermoz">	
+-				<function>Base</function>
+-			</application>
+ 			<application ident="Colbert">
+ 				<function>UsersRead</function>
+ 				<function>GroupsRead</function>
+diff --git a/web/skel/src/fr_FR/instance/50-standard.xml b/web/skel/src/fr_FR/instance/50-standard.xml
+index 34a8536..f7d1eb1 100644
+--- a/web/skel/src/fr_FR/instance/50-standard.xml
++++ b/web/skel/src/fr_FR/instance/50-standard.xml
+@@ -215,12 +215,6 @@
+ 		<application ident="MailingList">
+ 		</application>
+ 
+-		<!-- L'application d'envoi d'e-mail est accessible à tous les utilisateurs et à tous les groupes. -->
+-		<application ident="Mermoz">
+-			<all_users/>
+-			<all_groups/>
+-		</application>
+-
+ 		<!-- L'application de gestion des données personnelles est accessible à tous les utilisateurs. -->
+ 		<application ident="Narkissos">
+ 			<all_users/>
+diff --git a/web/skel/src/fr_FR/user/50-standard.xml b/web/skel/src/fr_FR/user/50-standard.xml
+index c7da5e8..d07b180 100644
+--- a/web/skel/src/fr_FR/user/50-standard.xml
++++ b/web/skel/src/fr_FR/user/50-standard.xml
+@@ -138,7 +138,6 @@
+ 		<!-- L'afficheur de fichiers, le portail utilisateur et l'application d'envoi d'e-mails Mermoz sont accessible mais ne sont pas actives. L'utilisateur pourra les activer s'il le souhaite. -->
+ 		<application ident="FileBrowser"/>
+ 		<application ident="Portal"/>
+-		<application ident="Mermoz"/>
+ 
+ 	</applications>
+ 
+diff --git a/web/skel/src/fr_FR/user/60-admin.xml b/web/skel/src/fr_FR/user/60-admin.xml
+index afff18d..4d4df04 100644
+--- a/web/skel/src/fr_FR/user/60-admin.xml
++++ b/web/skel/src/fr_FR/user/60-admin.xml
+@@ -101,7 +101,6 @@
+ 		<application ident="FileBrowser"/>
+ 		<application ident="Portal"/>
+ 		<application ident="Search" active="1"/>
+-		<application ident="Mermoz"/>
+ 		<application ident="RSS" active="1"/>
+ 	</applications>
+ 

software/mioga/software.cfg

 [buildout]
-extends = 
-  ../../component/postgresql/buildout.cfg
+develop =
+  /srv/slapgrid/slappart9/srv/runner/project/slapos
+  /opt/slapdev_build
+
+extends =
+  ../../component/rsync/buildout.cfg
   ../../component/apache-perl/buildout.cfg
+  ../../component/perl-Crypt-SSLeay/buildout.cfg
+  ../../component/perl-XML-Parser/buildout.cfg
+  ../../component/perl-XML-LibXML/buildout.cfg
+  ../../component/perl-XML-LibXSLT/buildout.cfg
+  ../../component/perl-Term-ReadLine-Gnu/buildout.cfg
+  ../../component/perl-Text-Iconv/buildout.cfg
+  ../../component/perl-Image-Magick/buildout.cfg
+  ../../component/postgresql/buildout.cfg
+  ../../component/perl-DBD-Pg/buildout.cfg
+  ../../component/perl-Search-Xapian/buildout.cfg
+  ../../component/libxslt/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/dropbear/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
   ../../stack/slapos.cfg
 
+parts = 
+  eggs
+  apache-perl
+  perl-Apache2-Request
+  perl-Crypt-SSLeay
+  perl-DBD-Pg
+  perl-XML-Parser
+  perl-XML-LibXML
+  perl-XML-LibXSLT
+  perl-Term-ReadLine-Gnu
+  perl-Text-Iconv
+  perl-Image-Magick
+  perl-String-Checker-mioga
+  perl-Search-Xapian
+  cpan-simple-modules
+  rsync
+  mioga
+  template
+  template-apacheperl
+  template-postgres
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  slapos.cookbook
+  cns.recipe.symlink
+
+# override perl here to keep using 5.14.x.
+[perl]
+recipe = hexagonit.recipe.cmmi
+depends =
+  ${gdbm:version}
+version = 5.14.2
+url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
+md5sum = 04a4c5d3c1f9f19d77daff8e8cd19a26
+siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
+patch-options = -p1
+patches =
+  ${perl-keep-linker-flags-in-ldflags.patch:location}/${perl-keep-linker-flags-in-ldflags.patch:filename}
+# Viktor has adapted the following commands for AMD64 compilation
+# TODO: find out how we can write a generic code that suits all architectures
+configure-command =
+  sh Configure -des \
+    -A ccflags=-fPIC \
+    -Dprefix=${buildout:parts-directory}/${:_buildout_section_name_} \
+    -Dsiteprefix=${:siteprefix} \
+    -Dcflags=-I${gdbm:location}/include \
+    -Dldflags="-L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib" \
+    -Ui_db \
+    -Dnoextensions=ODBM_File \
+    -Dusethreads
+environment =
+  PATH=${patch:location}/bin:%(PATH)s
+  CFLAGS='-m64 -mtune=nocona'
+post-make-hook = ${perl-postmakehook-download:location}/${perl-postmakehook-download:filename}:post_make_hook
+
+[cpan-simple-modules]
+recipe = slapos.recipe.build:cpan
+modules =
+  S/ST/STBEY/Date-Calc-6.3.tar.gz
+  D/DC/DCOPPIT/Benchmark-Timer-0.7102.tar.gz
+  R/RB/RBOW/Date-ICal-2.678.tar.gz
+  S/SB/SBECK/Date-Manip-6.37.tar.gz
+  G/GB/GBARR/TimeDate-1.20.tar.gz
+  S/SH/SHLOMIF/Error-0.17018.tar.gz
+  P/PA/PARDUS/File-MimeInfo/File-MimeInfo-0.16.tar.gz
+  O/OV/OVID/HTML-TokeParser-Simple-3.15.tar.gz
+  D/DS/DSKOLL/MIME-tools-5.503.tar.gz
+  D/DS/DSKOLL/IO-stringy-2.110.tar.gz
+  C/CO/COSIMO/HTTP-DAV-0.47.tar.gz
+  M/MA/MARSCHAP/perl-ldap-0.48.tar.gz
+  F/FD/FDESAR/Parse-Yapp-1.05.tar.gz
+  S/SN/SNOWHARE/Unicode-MapUTF8-1.11.tar.gz
+  G/GA/GAAS/Unicode-String-2.09.tar.gz
+  T/TY/TYEMQ/Algorithm-Diff-1.1902.tar.gz
+  J/JG/JGMYERS/Encode-Detect-1.01.tar.gz
+  G/GU/GUIDO/libintl-perl-1.20.tar.gz
+  K/KE/KEN/XML-XML2JSON-0.06.tar.gz
+  A/AR/ARISTOTLE/XML-Atom-SimpleFeed-0.86.tar.gz
+  P/PE/PETDANCE/Test-WWW-Mechanize-1.44.tar.gz
+  G/GR/GRANTM/XML-Simple-2.20.tar.gz
+  A/AD/ADAMK/Archive-Zip-1.30.tar.gz
+  D/DU/DURIST/Proc-ProcessTable-0.45.tar.gz
+  S/SU/SULLR/Net-INET6Glue-0.5.tar.gz
+perl = perl
+cpan-configuration =
+  makepl_arg=''
+  make_arg=''
+
+[perl-String-Checker-mioga]
+recipe = hexagonit.recipe.cmmi
+depends =
+  ${perl:version}
+url = http://packages.alixen.org/contribs/String-Checker-0.03.tar.gz
+md5sum = c750a33505609544f95eace7a2896c84
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL
+
+[mioga]
+recipe = hexagonit.recipe.cmmi
+version = 2.4.16
+# No use re-using "version", the whole URL will change for the next one
+url = http://www.alixen.org/attachments/download/89/Mioga2-2.4.16.tar.gz
+md5sum = 1d2e76c798ee6d5f233011997200e125
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+buildinst = ${mioga:location}/buildinst
+static = ${mioga:location}/static
+environment =
+  MIOGA_BASE=${mioga:location}
+  MIOGA_BUILDINST=${mioga:buildinst}
+  MIOGA_STATIC=${mioga:static}
+  MIOGA_SITEPERL=${perl:siteprefix}
+  PATH=${libxslt:location}/bin:${libxml2:location}/bin:${perl:location}/bin:${perl:siteprefix}/bin:${rsync:location}/bin:%(PATH)s
+patch-options = -p1
+patches =
+  ${mioga-patch:location}/${mioga-patch:filename}
+# post-make-hook = ${mioga-postmakehook:location}/${mioga-postmakehook:filename}:post_make_hook
+pre-configure-hook = ${mioga-hooks:location}/${mioga-hooks:filename}:pre_configure_hook
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL
+make-targets =
+  slapos-compilation
+keep-compile-dir = true
+perl-binary = ${perl:location}/bin/perl
+
+[mioga-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+# md5sum = b836ad89902d1ea68b091a5b9800edd8
+download-only = true
+filename = ${:_buildout_section_name_}
+
+[mioga-hooks]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+# md5sum = c7ceec7788749238cb5fbe09beb647b1
+download-only = true
+filename = mioga-hooks.py
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+# md5sum = 
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[template-apacheperl]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-apacheperl.cfg
+# md5sum = 
+output = ${buildout:directory}/template-apacheperl.cfg
+mode = 0644
+compile-directory = ${mioga:compile-directory}/Mioga2-${mioga:version}
+
+
+[template-postgres]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-postgres.cfg
+# md5sum = 
+output = ${buildout:directory}/template-postgres.cfg
+mode = 0644
+
 [networkcache]
 # Cedric de Saint Martin signature certificate
 # Test agent
@@ -33,4 +214,4 @@ signature-certificate-list =
   M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
   5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
   x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
\ No newline at end of file
+  -----END CERTIFICATE-----

software/mysql-5.1/software.cfg

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

software/neoppod/README.txt

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

software/neoppod/cluster.cfg.in

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

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

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

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

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

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

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

software/neoppod/instance.cfg.in

+{% set admin_software_type = 'neo-admin' -%}
+{% set mysql_storage_software_type = 'neo-storage-mysql' -%}
+[buildout]
+parts = switch-softwaretype
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[slap-connection]
+computer-id = ${slap_connection:computer_id}
+partition-id = ${slap_connection:partition_id}
+server-url = ${slap_connection:server_url}
+software-release-url = ${slap_connection:software_release_url}
+key-file = ${slap_connection:key_file}
+cert-file = ${slap_connection:cert_file}
+
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration.serialised
+computer = ${slap-connection:computer-id}
+partition = ${slap-connection:partition-id}
+url = ${slap-connection:server-url}
+key = ${slap-connection:key-file}
+cert = ${slap-connection:cert-file}
+
+[neo-cluster]
+recipe = slapos.recipe.template:jinja2
+template = {{ cluster }}
+rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/cluster.cfg
+extensions = jinja2.ext.do
+context =
+    key eggs_directory buildout:eggs-directory
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key slap_software_type slap-configuration:slap-software-type
+    key slapparameter_dict slap-configuration:configuration
+    raw admin_software_type {{ admin_software_type }}
+    raw mysql_storage_software_type {{ mysql_storage_software_type }}
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${neo-cluster:rendered}
+{{ admin_software_type }} = {{ neo_admin }}
+{{ mysql_storage_software_type }} = {{ neo_storage_mysql }}

software/neoppod/software.cfg

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

software/net2ftp/software.cfg

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

software/openX/software.cfg

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

software/opengoo/config-form.php.in

+<h1 class="pageTitle"><span>Step <?php echo $current_step->getStepNumber() ?>:</span> System settings</h1>
+<table class="formBlock">
+  <tr>
+    <th colspan="2">Database connection</th>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormDatabaseType">Database type:</label></td>
+    <td>
+      <select name="config_form[database_type]" id="configFormDatabaseType">
+        <option value="mysql">MySQL</option>
+        <option value="pdo_mysql">PDO MySQL</option>
+      </select>
+    </td>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormDatabaseHost">Host name:</label></td>
+    <td><input type="text" name="config_form[database_host]" id="configFormDatabaseHost" value="%(mysql_ip)s" readonly /></td>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormDatabaseUser">Username:</label></td>
+    <td><input type="text" name="config_form[database_user]" id="configFormDatabaseUser" value="%(mysql_user)s" readonly /></td>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormDatabasePass">Password:</label></td>
+    <td><input type="password" name="config_form[database_pass]" id="configFormDatabasePass" value="%(mysql_password)s" readonly /></td>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormDatabaseName">Database name:</label></td>
+    <td><input type="text" name="config_form[database_name]" id="configFormDatabaseName" value="%(mysql_database)s" readonly /></td>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormDatabasePrefix">Table prefix:</label></td>
+    <td><input type="text" name="config_form[database_prefix]" id="configFormDatabasePrefix" value="<?php echo array_var($config_form_data, 'database_prefix', 'og_') ?>" /></td>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormDatabaseEngine">Database engine:</label></td>
+    <td>
+      <select name="config_form[database_engine]" id="configFormDatabaseEngine">
+	        <option value="InnoDB">InnoDB</option>
+	        <option value="MyISAM">MyISAM</option>
+	    </select>
+    </td>
+  </tr>
+  
+  <tr>
+    <td colspan="2">
+    <b>Note:</b> InnoDB engine is highly recommended. Use MyISAM only as a last resort, and at your own risk, if your database doesn't support InnoDB.<br /><br />
+    <b>Note:</b> If the database doesn't exist OpenGoo will try to create it. However, if the database user you supply doesn't have permissions to create databases, you will have to manually create the database before you can continue.
+    </td>
+  </tr>
+</table>
+
+<table class="formBlock">
+  <tr>
+    <th colspan="2">Other settings</th>
+  </tr>
+  
+  <tr>
+    <td class="optionLabel"><label for="configFormAbsoluteUrl">Absolute script URL:</label></td>
+    <td><input type="text" name="config_form[absolute_url]" id="configFormAbsoluteUrl" value="<?php echo array_var($config_form_data, 'absolute_url', $installation_url) ?>" /></td>
+  </tr>
+</table>
\ No newline at end of file

software/opengoo/software.cfg

+[buildout]
+
+extends =
+  ../../stack/lamp/buildout.cfg
+  
+
+[application]
+recipe = slapos.recipe.build:download-unpacked
+url = http://heanet.dl.sourceforge.net/project/opengoo/opengoo/opengoo_1.6/opengoo_1.6.zip
+md5sum = 79ddfc24f01bc843a8275463e63e96b0
+strip-top-level-dir = true
+
+[application-template]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/config-form.php.in
+md5sum = 5d6ee1a23e1a5e762412a4867095b9e1
+download-only = True
+filename = template.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[application-configuration]
+location = public/install/installation/templates/system_config_form.php
\ No newline at end of file

software/os-commerce/software.cfg

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

software/phpbb/software.cfg

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

software/phpmyadmin/software.cfg

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

software/phpnuke/software.cfg

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

software/pimcore/software.cfg

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

software/piwigo/software.cfg

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

software/piwik/software.cfg

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

software/postgres/software.cfg

@@ -20,6 +20,122 @@ output = ${buildout:directory}/instance.cfg
 md5sum = d8b833a2054b82b6031a9420008b58fd
 mode = 0644
 
+[networkcache]
+# signature certificates of the following uploaders.
+#   Romain Courteaud
+#   Sebastien Robin
+#   Kazuhiko Shiozaki
+#   Cedric de Saint Martin
+#   Yingjie Xu
+#   Gabriel Monnerat
+#   Łukasz Nowak
+#   Test Agent (Automatic update from tests)
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
+  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
+  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
+  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
+  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
+  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
+  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
+  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
+  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
+  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
+  QUUGLQ==
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
+  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
+  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
+  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
+  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
+  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
+  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
+  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
+  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
+  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
+  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
+  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
+  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
+  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
+  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
+  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
+  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
+  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
+  vaZhjNYKWQf79l6zXfOvphzJ
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
+  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
+  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
+  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
+  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
+  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
+  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
+  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
+  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
+  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
+  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
+  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
+  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
+  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
+  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
+  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
+  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
+  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
+  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
+  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
+  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
+  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
+  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
+  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
+  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
+  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
+  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
+  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
+  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
+  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
+  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
+  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
+  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
+  -----END CERTIFICATE-----
+
 
 [versions]
 Jinja2 = 2.6
@@ -31,7 +147,7 @@ lxml = 3.1beta1
 meld3 = 0.6.10
 netaddr = 0.7.10
 pytz = 2012j
-slapos.cookbook = 0.71.2
+slapos.cookbook = 0.73.1
 slapos.core = 0.34
 slapos.recipe.template = 2.4.2
 xml-marshaller = 0.9.7
@@ -42,7 +158,7 @@ Flask = 0.9
 
 # Required by:
 # hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.core==0.34
@@ -53,7 +169,7 @@ netifaces = 0.8
 pyflakes = 0.6.0
 
 # Required by:
-# slapos.cookbook==0.71.2
+# slapos.cookbook==0.73.1
 # slapos.core==0.34
 # supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-010

software/prestashop/software.cfg

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

software/pulse/software.cfg

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

software/punbb/software.cfg

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

software/seleniumrunner/software.cfg

@@ -81,7 +81,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.42

software/simpleMachineForum/software.cfg

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

software/slapos-testing/instance.cfg

@@ -49,6 +49,7 @@ environment = environment
 [environment]
 CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
 LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${python2.7:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${libxslt:location}/lib -Wl,-rpath=${zlib:location}/lib
+LD_LIBRARY_PATH = ${python2.7:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib:${libxslt:location}/lib:${zlib:location}/lib
 PYTHONPATH = ${python-setuptools:location}
 
 [sh-environment]

software/slapos-testing/software.cfg

@@ -61,10 +61,42 @@ branch = master
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 47f5a8cf4d134a35b7f36a7442e5798a
+md5sum = 1dba62d737ef76dfac50febd61357041
 output =  ${buildout:directory}/template.cfg
 mode = 640
 
+[networkcache]
+# signature certificates of the following uploaders.
+#   Cedric de Saint Martin
+#   Test Agent
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
+  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
+  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
+  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
+  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
+  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
+  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
+  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
+  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
+  -----END CERTIFICATE-----
+
 [versions]
 Jinja2 = 2.6
 Werkzeug = 0.8.3
@@ -90,7 +122,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.65

software/slaprunner/README.txt

-kvm
-===
+slaprunner
+==========
 
 Introduction
 ------------
@@ -21,3 +21,10 @@ Example of parameter XML::
   <instance>
   <parameter id="authorized-key">ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdNp7qZMVAzNc07opHshiIFDmJpYXQpetfcSgUj39a409d42PpsJElp7WsAE/x0nN6gUIoWIl7UiAlMzf6bKEJGJVSOZEPTmiJVlgK1Gp+kE0x9yNcncYg7p38Jny0daVA/NkkpAFyRsAm5kLGzyLtaCcktSvy0cJuy7WSSHU05pd1f8Y8thofE9g5t+/JA2VZvipxPkRfkFAG3aOAGLULlTImTSDFSDFGSDFG5F6mMnl7yvY2d6vEHVBu+K+aKmAwZVfCUwtSpa/tq3i2Lppjrw3UfrxbQSFHZCkzefr+u+l4YYe+tJrX7rYJYXD7LIfZfdSeFTlHFaN/yI1 user@host.local</parameter>
   </instance>
+
+instance-amount
+~~~~~~~~~~~~~~~
+
+Optional parameter.
+
+Default: 10

software/slaprunner/software.cfg

@@ -61,42 +61,42 @@ slapos.core = 0.34
 slapos.libnetworkcache = 0.13.3
 slapos.recipe.build = 0.11.5
 slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.33
+slapos.toolbox = 0.33.1
 smmap = 0.8.2
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
 # slapos.core==0.34
-# slapos.toolbox==0.33
+# slapos.toolbox==0.33.1
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.33
+# slapos.toolbox==0.33.1
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.33
+# slapos.toolbox==0.33.1
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.33
+# slapos.toolbox==0.33.1
 feedparser = 5.1.3
 
 # Required by:
 # hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.core==0.34
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.33
+# slapos.toolbox==0.33.1
 paramiko = 1.9.0
 
 # Required by:
-# slapos.toolbox==0.33
+# slapos.toolbox==0.33.1
 psutil = 0.6.1
 
 # Required by:
@@ -108,7 +108,7 @@ pyflakes = 0.5.0
 # slapos.cookbook==0.71.1
 # slapos.core==0.34
 # slapos.libnetworkcache==0.13.3
-# slapos.toolbox==0.33
+# slapos.toolbox==0.33.1
 # supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-010
 # zope.interface==4.0.3

software/spip/software.cfg

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

software/statusnet/software.cfg

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

software/sugar-crm/software.cfg

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

software/tiki/software.cfg

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

software/wordpress/software.cfg

@@ -3,8 +3,8 @@ extends =
   ../../stack/lamp/buildout.cfg
 
 [application]
-url = http://wordpress.org/wordpress-3.5.tar.gz
-md5sum = 105b5baff67344528bb5d8b71c050b0d
+url = http://wordpress.org/wordpress-3.5.1.tar.gz
+md5sum = 409889c98b13cbdbb9fd121df859ae3e
 
 [application-template]
 recipe = slapos.recipe.download

software/xoops/software.cfg

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

software/xwiki/software.cfg

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

software/zabbix-agent/software.cfg

@@ -68,7 +68,7 @@ Flask = 0.9
 
 # Required by:
 # hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.59

software/zencart/software.cfg

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

stack/cloudooo.cfg

@@ -43,7 +43,6 @@ extends =
   ../component/git/buildout.cfg
   ../component/poppler/buildout.cfg
   ../component/imagemagick/buildout.cfg
-  ../component/pdftk/buildout.cfg
   ../component/ffmpeg/buildout.cfg
   ../component/file/buildout.cfg
   ../component/stunnel/buildout.cfg
@@ -76,7 +75,6 @@ parts =
   imagemagick
   file
   poppler
-  pdftk
   ffmpeg
 
   bootstrap2.6
@@ -93,7 +91,3 @@ python = python2.6
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.6.0-dev-SlapOS-006
-
-# Use patched hexagonit.recipe.download from
-# https://github.com/SlapOS/hexagonit.recipe.download
-hexagonit.recipe.download = 1.5.1-dev-slapos-001

stack/erp5/buildout.cfg

@@ -15,9 +15,11 @@ find-links =
     http://www.nexedi.org/static/packages/source/
     http://www.owlfish.com/software/wsgiutils/download.html
 
+allow-hosts += pybrary.net
+
 extends =
 # Exact version of Zope
-  http://svn.zope.org/repos/main/Zope/tags/2.12.25/versions.cfg
+  http://svn.zope.org/repos/main/Zope/tags/2.12.26/versions.cfg
   ../../stack/slapos.cfg
   ../../component/logrotate/buildout.cfg
   ../../component/dcron/buildout.cfg
@@ -38,9 +40,7 @@ extends =
   ../../component/lxml-python/buildout.cfg
   ../../component/percona-toolkit/buildout.cfg
   ../../component/mariadb/buildout.cfg
-  ../../component/memcached/buildout.cfg
   ../../component/mysql-python/buildout.cfg
-  ../../component/pdftk/buildout.cfg
   ../../component/pil-python/buildout.cfg
   ../../component/pycrypto-python/buildout.cfg
   ../../component/pysvn-python/buildout.cfg
@@ -48,7 +48,6 @@ extends =
   ../../component/python-2.7/buildout.cfg
   ../../component/python-ldap-python/buildout.cfg
   ../../component/rdiff-backup/buildout.cfg
-  ../../component/stunnel/buildout.cfg
   ../../component/subversion/buildout.cfg
   ../../component/tesseract/buildout.cfg
   ../../component/varnish/buildout.cfg
@@ -74,10 +73,8 @@ parts =
   apache-antiloris
   file
   graphviz
-  memcached
   haproxy
   varnish-3.0
-  stunnel
   w3m
   poppler
   libpng
@@ -97,7 +94,6 @@ parts =
   perl-DBI
   percona-toolkit
   zabbix-agent
-  pdftk
   dcron
   dash
   wget
@@ -131,6 +127,7 @@ parts =
   fix-products-paths
 # some additional utils
   slapos-toolbox
+  zodbanalyze
 
 # Local development
   slapos.cookbook-repository
@@ -142,13 +139,10 @@ parts =
 
 # Local development
 [slapos.cookbook-repository]
-recipe = plone.recipe.command
-stop-on-error = true
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
 branch = erp5
-revision =
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet http://git.erp5.org/repos/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
-update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi
+git-executable = ${git:location}/bin/git
 
 [check-recipe]
 recipe = plone.recipe.command
@@ -161,7 +155,7 @@ recipe = zc.recipe.egg
 eggs = slapos.cookbook
 scripts =
 python = python2.6
-ugly-depend-on = ${slapos.cookbook-repository:command} ${slapos.cookbook-repository:update-command}
+ugly-depend-on = ${slapos.cookbook-repository:repository} ${slapos.cookbook-repository:branch}
 
 [slapos.recipe.template-python2.6]
 recipe = zc.recipe.egg
@@ -185,7 +179,7 @@ context =
 [template-mariadb]
 < = template-jinja2-base
 filename = instance-mariadb.cfg
-md5sum = 867bd8e3c4f56db2aab2fcad59f2efd8
+md5sum = 49ae6f1bf97d3755978fe08b8e29fb5a
 extra-context =
     key coreutils_location coreutils:location
     key dcron_location dcron:location
@@ -202,13 +196,13 @@ extra-context =
 [template-zope]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-zope.cfg.in
-md5sum = de2918c8ca604f452a69108f6e31e78d
+md5sum = 918b972679d5c06082363d41483324a7
 mode = 640
 
 [template-kumofs]
 < = template-jinja2-base
 filename = instance-kumofs.cfg
-md5sum = 7e13d689de7163dcab64e8df4711cdd7
+md5sum = 90a321be12ee977800d590bf941021ef
 extra-context =
     key dash_location dash:location
     key dcron_location dcron:location
@@ -219,7 +213,7 @@ extra-context =
 [template-tidstorage]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
-md5sum = 1f3e7cfc719d3c2eee4860678f6a67df
+md5sum = bd5872108f812c6823a8915670e51c4c
 mode = 640
 
 [template-cloudooo]
@@ -239,7 +233,7 @@ mode = 640
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 700b8729a4d9a8423ab2a99de486cc31
+md5sum = 2576de300d1a74fd1a99388af9723d42
 extra-context =
     key apache_location apache:location
     key aspell_location aspell:location
@@ -275,12 +269,11 @@ extra-context =
     key logrotate_location logrotate:location
     key mariadb_location mariadb:location
     key openssl_location openssl:location
-    key pdftk_location pdftk:location
     key poppler_location poppler:location
     key sed_location sed:location
     key template_cloudooo template-cloudooo:target
     key template_erp5_single template-erp5-single:target
-    key template_erp5_cluster template-erp5-cluster:rendered
+    key template_erp5_cluster template-erp5-cluster:target
     key template_kumofs template-kumofs:rendered
     key template_mariadb template-mariadb:rendered
     key template_memcached template-memcached:rendered
@@ -297,10 +290,13 @@ extra-context =
 [template-memcached]
 < = template-jinja2-base
 filename = instance-memcached.cfg
-md5sum = 44c507e9eec1003beb99f9063b5e09be
+md5sum = 2de1801236eb78651ecfd50ada46dd3b
 extra-context =
     key dash_location dash:location
-    key memcached_location memcached:location
+    key dcron_location dcron:location
+    key gzip_location gzip:location
+    key kumo_location kumo:location
+    key logrotate_location logrotate:location
 
 [template-erp5-single]
 recipe = slapos.recipe.build:download
@@ -309,11 +305,10 @@ md5sum = 2a4312202a3160f874c4fa3ee9155a1d
 mode = 640
 
 [template-erp5-cluster]
-< = template-jinja2-base
-filename = instance-erp5-cluster.cfg
-md5sum = b4a9688ca7983fac5dd573e66c6e4263
-extra-context =
-    key local_bt5_repository local-bt5-repository:list
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-erp5-cluster.cfg.in
+md5sum = eecde68b9a266d8883042540ac077839
+mode = 640
 
 [template-varnish]
 recipe = slapos.recipe.build:download
@@ -349,24 +344,17 @@ python = python2.6
 repository_id_list = erp5
 
 [erp5]
-# Recipe zerokspot.recipe.git is disabled, as is not possible to change its
-# environment to use localy delivered git.
-# plone.recipe.command can do same job, but it is controllable which binary
-# will be used
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
+recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/erp5.git
 branch = master
-revision =
-command = "${git:location}/bin/git" clone --quiet --branch "${:branch}" "${:repository}" "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
-update-command = cd "${:location}" && "${git:location}/bin/git" fetch && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --hard @{upstream} ; fi
+git-executable = ${git:location}/bin/git
 
 [fix-products-paths]
 recipe = plone.recipe.command
 stop-on-error = true
+dir = ${erp5:location}
 command =
-  for DIR in "${erp5:location}"; do cd "$DIR"; rm -f Products ; ln -s product Products; touch product/__init__.py; done
+  rm -f "${:dir}/Products" && ln -s product "${:dir}/Products" && touch "${:dir}/product/__init__.py"
 update-command = ${:command}
 
 [testrunner]
@@ -401,6 +389,9 @@ initialization =
   sys.path[:0] = sum((
     glob.glob(os.path.join(x, 'Products', '*', 'tests'))
     for x in extra_path_list), [])
+  sys.path[:0] = sum((
+    glob.glob(os.path.join(x, 'Products', '*', 'tests'))
+    for x in os.getenv('INSERT_PRODUCTS_PATH', '').split(os.pathsep)), [])
 
 [test_suite_runner]
 # XXX: Workaround for fact ERP5Type is not an distribution and does not
@@ -447,6 +438,7 @@ eggs =
   ordereddict
   paramiko
   ply
+  pyPdf # should be replaced by PyPDF2, but it is not installable
   python-magic
   python-memcached
   pytz
@@ -463,6 +455,7 @@ eggs =
   erp5.util
   huBarcode
   qrcode
+  spyne
 
 # Zope
   ZODB3
@@ -515,9 +508,19 @@ scripts =
 extra-paths =
   ${erp5:location}
 
+[zodbanalyze]
+recipe = zc.recipe.egg
+python = python2.6
+eggs =
+  ZODB3
+  erp5.util
+entry-points =
+  zodbanalyze=erp5.util.zodbanalyze:main
+scripts = zodbanalyze
+
 [cloudooo-repository]
 branch = master
-revision = 4cdfffb3f81a0fdbb7b372d92de664e716f12d4b
+revision = 6629837c96ae58e96cac019044ce95d19cb7a659
 
 [mysql-python]
 python = python2.6
@@ -552,18 +555,42 @@ scripts =
 Acquisition = 2.13.7nxd001
 Products.DCWorkflow = 2.2.3nxd002
 
+# specify dev version to be sure that an old released version is not used
+cloudooo = 1.2.5-dev
+
+# use newer version than specified in ZTK
+lxml = 2.3.6
+
 # Known version with works
 numpy = 1.6.2
+
+# test_UserManagerInterfaces in testERP5Security fails with 1.10.0.
+Products.PluggableAuthService = 1.9.0
+
+# official pysvn egg does not supports --include-dirs and
+# --library-dirs, so we use our modified version
+pysvn = 1.7.4nxd006
+
+# modified version to support ipv6
+python-memcached = 1.47-ipv6-1
+
+# use newest version of pytz
+pytz =
+
 # Patched version which support python 2.6
 PyXML = 0.8.4nxd001
-# modified version that works fine for buildout installation
-SOAPpy = 0.12.0nxd001
+
 # we are still using this old stable version.
 rdiff-backup = 1.0.5
 
-# official pysvn egg does not supports --include-dirs and
-# --library-dirs, so we use our modified version
-pysvn = 1.7.4nxd006
+# use dev version
+setuptools = 0.6c12dev-r88846
+
+# use newest version of slapos.cookbook
+slapos.cookbook =
+
+# modified version that works fine for buildout installation
+SOAPpy = 0.12.0nxd001
 
 # CMF 2.3 requries Zope 2.13.
 Products.CMFCalendar = 2.2.2
@@ -572,12 +599,14 @@ Products.CMFDefault = 2.2.2
 Products.CMFTopic = 2.2.1
 Products.CMFUid = 2.2.1
 
-slapos.cookbook =
-
 # Pinned versions
+Flask = 0.9
+GitPython = 0.3.2.RC1
+Jinja2 = 2.6
 MySQL-python = 1.2.4
 PIL = 1.1.7
 Paste = 1.7.5.1
+PasteDeploy = 1.5.0
 PasteScript = 1.7.5
 Products.CMFActionIcons = 2.1.3
 Products.DCWorkflowGraph = 0.4.1
@@ -585,72 +614,66 @@ Products.ExternalEditor = 1.1.0
 Products.GenericSetup = 1.7.3
 Products.LongRequestLogger = 1.1.0
 Products.MimetypesRegistry = 2.0.4
-Products.PluggableAuthService = 1.9.0
 Products.PluginRegistry = 1.3
 Products.TIDStorage = 5.4.8
+Pygments = 1.6
 StructuredText = 2.11.1
 WSGIUtils = 0.7
-WebOb = 1.2.3
 Werkzeug = 0.8.3
-apache-libcloud = 0.11.4
+apache-libcloud = 0.12.1
+argparse = 1.2.1
 async = 0.6.1
-buildout-versions = 1.7
+atomize = 0.1.1
 cElementTree = 1.0.5-20051216
 chardet = 2.1.1
 coverage = 3.6
 csp-eventlet = 0.7.0
 elementtree = 1.2.7-20070827-preview
 erp5.recipe.cmmiforcei686 = 0.1.3
-erp5.util = 0.4.22
+erp5.util = 0.4.33
 erp5diff = 0.8.1.5
 eventlet = 0.12.1
+feedparser = 5.1.3
 five.localsitemanager = 2.0.5
+fpconst = 0.7.2
 gitdb = 0.5.4
 greenlet = 0.4.0
 hexagonit.recipe.cmmi = 1.6
-http-parser = 0.7.12
+http-parser = 0.8.1
 huBarcode = 0.63
+inotifyx = 0.2.0
 ipdb = 0.7
 ipython = 0.13.1
 meld3 = 0.6.10
+mr.developer = 1.24
+netaddr = 0.7.10
+netifaces = 0.8
 ordereddict = 1.1
+paramiko = 1.10.0
 plone.recipe.command = 1.1
 ply = 3.4
-polib = 1.0.2
+polib = 1.0.3
+psutil = 0.6.1
+pyPdf = 1.13
+pyflakes = 0.6.1
 python-ldap = 2.4.10
 python-magic = 0.4.3
-python-memcached = 1.47-ipv6-1
 qrcode = 2.4.2
 requests = 1.1.0
-restkit = 4.2.0
+restkit = 4.2.1
 rtjp-eventlet = 0.3.2
-slapos.recipe.build = 0.11.5
+slapos.core = 0.35.1
+slapos.recipe.build = 0.11.6
 slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.33
+slapos.toolbox = 0.33.1
 smmap = 0.8.2
 socketpool = 0.5.2
+spyne = 2.9.4
+supervisor = 3.0b1
 threadframe = 0.2
 timerserver = 2.0.2
 urlnorm = 1.1.2
 uuid = 1.30
 validictory = 0.9.0
-xupdate-processor = 0.4
-Flask = 0.9
-GitPython = 0.3.2.RC1
-PasteDeploy = 1.5.0
-argparse = 1.2.1
-atomize = 0.1.1
-feedparser = 5.1.3
-fpconst = 0.7.2
-hexagonit.recipe.download = 1.6
-inotifyx = 0.2.0
-netaddr = 0.7.10
-netifaces = 0.8
-nose = 1.2.1
-paramiko = 1.9.0
-psutil = 0.6.1
-pyflakes = 0.6.1
-slapos.core = 0.34
-supervisor = 3.0b1
 xml-marshaller = 0.9.7
-setuptools = 0.6c12dev-r88846
+xupdate-processor = 0.4

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

+{% if slap_software_type == software_type -%}
 #############################
 #
 # Request erp5 production environnment
@@ -104,3 +105,4 @@ smtp-url = smtp://localhost:25/
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
 etc = ${buildout:directory}/etc/run
+{% endif %}

stack/erp5/instance-kumofs.cfg.in

@@ -118,22 +118,25 @@ command = ${logrotate:wrapper}
 # Deploy zope promises scripts
 [promise-template]
 recipe = slapos.cookbook:check_port_listening
-path = ${basedirectory:promise}/kumofs
 hostname = ${kumofs-instance:ip}
 port = ${kumofs-instance:server-listen-port}
 
 [promise-kumofs-server]
 <= promise-template
+path = ${basedirectory:promise}/kumofs-server
 port = ${kumofs-instance:server-port}
 
 [promise-kumofs-server-listen]
 <= promise-template
+path = ${basedirectory:promise}/kumofs-server-listen
 port = ${kumofs-instance:server-listen-port}
 
 [promise-kumofs-gateway]
 <= promise-template
+path = ${basedirectory:promise}/kumofs-gateway
 port = ${kumofs-instance:gateway-port}
 
 [promise-kumofs-manager]
 <= promise-template
+path = ${basedirectory:promise}/kumofs-manager
 port = ${kumofs-instance:manager-port}

stack/erp5/instance-mariadb.cfg.in

@@ -62,26 +62,38 @@ mysql-binary = {{ mariadb_location }}/bin/mysql
 mysql-install-binary = {{ mariadb_location }}/scripts/mysql_install_db
 mysql-upgrade-binary = {{ mariadb_location }}/bin/mysql_upgrade
 mysqld-binary = {{ mariadb_location }}/bin/mysqld
+pt-align-binary = {{ perl_siteprefix }}/bin/pt-align
 pt-archiver-binary = {{ perl_siteprefix }}/bin/pt-archiver
+pt-collect-binary = {{ perl_siteprefix }}/bin/pt-collect
 pt-config-diff-binary = {{ perl_siteprefix }}/bin/pt-config-diff
 pt-deadlock-logger-binary = {{ perl_siteprefix }}/bin/pt-deadlock-logger
+pt-diskstats-binary = {{ perl_siteprefix }}/bin/pt-diskstats
 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-fingerprint-binary = {{ perl_siteprefix }}/bin/pt-fingerprint
 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-ioprofile-binary = {{ perl_siteprefix }}/bin/pt-ioprofile
 pt-kill-binary = {{ perl_siteprefix }}/bin/pt-kill
 pt-log-player-binary = {{ perl_siteprefix }}/bin/pt-log-player
+pt-mext-binary = {{ perl_siteprefix }}/bin/pt-mext
+pt-mysql-summary-binary = {{ perl_siteprefix }}/bin/pt-mysql-summary
 pt-online-schema-change-binary = {{ perl_siteprefix }}/bin/pt-online-schema-change
+pt-pmp-binary = {{ perl_siteprefix }}/bin/pt-pmp
 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-sift-binary = {{ perl_siteprefix }}/bin/pt-sift
 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-stalk-binary = {{ perl_siteprefix }}/bin/pt-stalk
+pt-summary-binary = {{ perl_siteprefix }}/bin/pt-summary
 pt-table-checksum-binary = {{ perl_siteprefix }}/bin/pt-table-checksum
 pt-table-sync-binary = {{ perl_siteprefix }}/bin/pt-table-sync
+pt-table-usage-binary = {{ perl_siteprefix }}/bin/pt-table-usage
 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

stack/erp5/instance-memcached.cfg.in

-#############################
-#
-# Instanciate memcached
-#
-# No slapos parameter needed
-#
-#############################
+# memcached-compatible volatile cache using kumofs
+# that has no limitation for key length and data size
+
 [buildout]
 parts =
-  memcached-instance
-  publish-memcached-connection-information
-  promise
+  publish-kumofs-connection-information
+  kumofs-instance
+  logrotate
+  logrotate-entry-kumofs
+  cron
+  cron-entry-logrotate
+  promise-kumofs-server
+  promise-kumofs-server-listen
+  promise-kumofs-gateway
+  promise-kumofs-manager
 
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
+[publish-kumofs-connection-information]
+recipe = slapos.cookbook:publishurl
+url = memcached://${kumofs-instance:ip}:${kumofs-instance:gateway-port}/
+
+[kumofs-instance]
+recipe = slapos.cookbook:generic.kumofs
+
+# Network options
+ip = ${slap-network-information:local-ipv4}
+manager-port = 13101
+server-port = 13201
+server-listen-port = 13202
+# previous memcached configuration
+gateway-port = 11000
+# previous memcached configuration
+storage-size = 64m
+
+# Paths: Running wrappers
+gateway-wrapper = ${basedirectory:services}/volatile_kumofs_gateway
+manager-wrapper = ${basedirectory:services}/volatile_kumofs_manager
+server-wrapper = ${basedirectory:services}/volatile_kumofs_server
+
+# Paths: Data
+data-path = *#capsiz=${:storage-size}
+
+# Paths: Logs
+kumo-gateway-log = ${basedirectory:log}/kumo-gateway.log
+kumo-manager-log = ${basedirectory:log}/kumo-manager.log
+kumo-server-log = ${basedirectory:log}/kumo-server.log
+
+# Binary information
+kumo-gateway-binary = {{ kumo_location }}/bin/kumo-gateway
+kumo-manager-binary = {{ kumo_location }}/bin/kumo-manager
+kumo-server-binary = {{ kumo_location }}/bin/kumo-server
+shell-path = {{ dash_location }}/bin/dash
+
+[logrotate-entry-kumofs]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = kumofs
+log = ${kumofs-instance:kumo-gateway-log} ${kumofs-instance:kumo-manager-log}
+  ${kumofs-instance:kumo-server-log}
+
+# rest of parts are candidates for some generic stuff
+
+[logrotate]
+recipe = slapos.cookbook:logrotate
+# Binaries
+logrotate-binary = {{ logrotate_location }}/usr/sbin/logrotate
+gzip-binary = {{ gzip_location }}/bin/gzip
+gunzip-binary = {{ gzip_location }}/bin/gunzip
+# Directories
+wrapper = ${rootdirectory:bin}/logrotate
+conf = ${rootdirectory:etc}/logrotate.conf
+logrotate-entries = ${directory:logrotate-entries}
+backup = ${directory:logrotate-backup}
+state-file = ${rootdirectory:srv}/logrotate.status
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = ${rootdirectory:var}/log
+services = ${rootdirectory:etc}/run
+promise = ${rootdirectory:etc}/promise
+run = ${rootdirectory:var}/run
+backup = ${rootdirectory:srv}/backup
+
 [directory]
 recipe = slapos.cookbook:mkdirectory
+cron-entries = ${rootdirectory:etc}/cron.d
+crontabs = ${rootdirectory:etc}/crontabs
+cronstamps = ${rootdirectory:etc}/cronstamps
+logrotate-backup = ${basedirectory:backup}/logrotate
+logrotate-entries = ${rootdirectory:etc}/logrotate.d
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
 etc = ${buildout:directory}/etc
+var = ${buildout:directory}/var
+srv = ${buildout:directory}/srv
 bin = ${buildout:directory}/bin
-service = ${:etc}/run
-promise = ${:etc}/promise
 
-[memcached-instance]
-recipe = slapos.cookbook:generic.memcached
-wrapper_path = ${directory:service}/memcached
-binary_path = {{ memcached_location }}/bin/memcached
-shell-path = {{ dash_location }}/bin/dash
-ip = ${slap-network-information:local-ipv4}
-port = 11000
+[cron]
+recipe = slapos.cookbook:cron
+dcrond-binary = {{ dcron_location }}/sbin/crond
+cron-entries = ${directory:cron-entries}
+crontabs = ${directory:crontabs}
+cronstamps = ${directory:cronstamps}
+catcher = ${cron-simplelogger:wrapper}
+binary = ${basedirectory:services}/crond
 
-[publish-memcached-connection-information]
-recipe = slapos.cookbook:publishurl
-url = memcached://${memcached-instance:ip}:${memcached-instance:port}/
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = ${rootdirectory:bin}/cron_simplelogger
+log = ${basedirectory:log}/cron.log
+
+[cron-entry-logrotate]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+command = ${logrotate:wrapper}
 
 # Deploy zope promises scripts
-[promise]
+[promise-template]
 recipe = slapos.cookbook:check_port_listening
-path = ${directory:promise}/memcache
-hostname = ${memcached-instance:ip}
-port = ${memcached-instance:port}
+hostname = ${kumofs-instance:ip}
+port = ${kumofs-instance:server-listen-port}
+
+[promise-kumofs-server]
+<= promise-template
+path = ${basedirectory:promise}/kumofs-server
+port = ${kumofs-instance:server-port}
+
+[promise-kumofs-server-listen]
+<= promise-template
+path = ${basedirectory:promise}/kumofs-server-listen
+port = ${kumofs-instance:server-listen-port}
+
+[promise-kumofs-gateway]
+<= promise-template
+path = ${basedirectory:promise}/kumofs-gateway
+port = ${kumofs-instance:gateway-port}
+
+[promise-kumofs-manager]
+<= promise-template
+path = ${basedirectory:promise}/kumofs-manager
+port = ${kumofs-instance:manager-port}

stack/erp5/instance-tidstorage.cfg.in

@@ -134,10 +134,10 @@ link-binary =
   {{ parameter_dict['imagemagick'] }}/bin/identify
   {{ parameter_dict['mariadb'] }}/bin/mysql
   {{ parameter_dict['mariadb'] }}/bin/mysqldump
-  {{ parameter_dict['pdftk'] }}/bin/pdftk
   {{ parameter_dict['sed'] }}/bin/sed
   {{ parameter_dict['tesseract'] }}/bin/tesseract
   {{ parameter_dict['w3m'] }}/bin/w3m
+  {{ parameter_dict['openssl'] }}/bin/openssl
   {{ parameter_dict['poppler'] }}/bin/pdfinfo
   {{ parameter_dict['poppler'] }}/bin/pdfseparate
   {{ parameter_dict['poppler'] }}/bin/pdftotext

stack/erp5/instance-zope.cfg.in

@@ -196,10 +196,10 @@ link-binary =
   {{ librsvg_location }}/bin/rsvg-convert
   {{ mariadb_location }}/bin/mysql
   {{ mariadb_location }}/bin/mysqldump
-  {{ pdftk_location }}/bin/pdftk
   {{ sed_location }}/bin/sed
   {{ tesseract_location }}/bin/tesseract
   {{ w3m_location }}/bin/w3m
+  {{ openssl_location }}/bin/openssl
   {{ poppler_location }}/bin/pdfinfo
   {{ poppler_location }}/bin/pdfseparate
   {{ poppler_location }}/bin/pdftotext

stack/erp5/instance.cfg.in

@@ -39,7 +39,6 @@ grep = {{ grep_location }}
 imagemagick = {{ imagemagick_location }}
 librsvg = {{ librsvg_location }}
 mariadb = {{ mariadb_location }}
-pdftk = {{ pdftk_location }}
 sed = {{ sed_location }}
 tesseract = {{ tesseract_location }}
 w3m = {{ w3m_location }}
@@ -129,7 +128,6 @@ librsvg = {{ librsvg_location }}
 logrotate = {{ logrotate_location }}
 mariadb = {{ mariadb_location }}
 openssl = {{ openssl_location }}
-pdftk = {{ pdftk_location }}
 poppler = {{ poppler_location }}
 sed = {{ sed_location }}
 tesseract = {{ tesseract_location }}
@@ -159,7 +157,6 @@ extra-context =
     key logrotate_location dynamic-template-zope-parameters:logrotate
     key mariadb_location dynamic-template-zope-parameters:mariadb
     key openssl_location dynamic-template-zope-parameters:openssl
-    key pdftk_location dynamic-template-zope-parameters:pdftk
     key poppler_location dynamic-template-zope-parameters:poppler
     key sed_location dynamic-template-zope-parameters:sed
     key tesseract_location dynamic-template-zope-parameters:tesseract
@@ -187,11 +184,30 @@ extra-context =
     key template_zope dynamic-template-zope:rendered
     key local_bt5_repository template-erp5-single-parameters:local_bt5_repository
 
+[dynamic-template-cluster-parameters]
+local-bt5-repository = {{ local_bt5_repository }}
+
+[dynamic-template-cluster]
+< = jinja2-template-base
+template = {{ template_erp5_cluster }}
+filename = instance-erp5-cluster.cfg
+extra-context =
+    key local_bt5_repository dynamic-template-cluster-parameters:local-bt5-repository
+# Must match the key id in [switch-softwaretype] which uses this section.
+# XXX: it is dangerous to use buildout-style expansion in jinja context declaration
+    raw software_type ${:software-type}
+software-type = cluster
+
+# BBB: use "cluster" software type instead
+[dynamic-template-production]
+< = dynamic-template-cluster
+software-type = production
+
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype
 default = ${template-erp5-single:rendered}
-production = {{ template_erp5_cluster }}
-cluster = {{ template_erp5_cluster }}
+production = ${dynamic-template-production:rendered}
+cluster = ${dynamic-template-cluster:rendered}
 kumofs = {{ template_kumofs }}
 memcached = {{ template_memcached }}
 cloudooo = ${dynamic-template-cloudooo:rendered}

stack/lamp/apache/instance-apache-export.cfg.jinja2

+# This file is responsible of three things:
+# 1/ Act as "Apache exporter"
+# 2/ Act as "Mariadb backup infrastructure requester"
+# 3/ Act as "Apache" instance
+
+{% import 'parts' as parts %}
+{% import 'replicated' as replicated %}
+
+[buildout]
+extends = {{templateapache}}
+          {{templatepbsreadyexport}}
+
+parts +=
+    {{ parts.replicate("mariadb", "3") }}
+
+# Repeating parts from instance-apache-php.
+# XXX-Cedric: how to simplify this?
+    certificate-authority
+    ca-stunnel
+    logrotate
+    logrotate-entry-apache
+    logrotate-entry-stunnel
+    cron
+    cron-entry-logrotate
+    promise
+    frontend-promise
+    content-promise
+    publish-connection-informations
+
+{{ replicated.replicate("mariadb", "3", "mariadb-export", "mariadb-import") }}
+
+# Nothing to do for the exporter. This wrapper is intended
+# to produce the "dump" files that have to be backed up.
+# So, in case of binary DB data, we would back up the ASCII dump
+# files, or a similar data format that can be restored on any machine
+# (i.e. postgres 'custom')
+# In the case of an httpd instance, the src/www directory can be directly
+# pulled from the PBS, we don't need to prepare anything.
+[exporter]
+wrapper = /bin/true
+
+# State that we want to backup srv/www directory, not srv/backup.
+# XXX-Cedric: works well, but doesn't work with big data.
+[rdiff-backup-server]
+path = ${directory:www}
+
+# Add "exporter" parameters to list of published connection parameters
+[publish-connection-informations]
+# XXX-Cedric: Long term goal: could be a recipe that requests an instance and
+# bubbles ALL
+# parameters of the requested instance. Requirement: aggregated publish.
+<= resilient-publish-connection-parameter
+
+# XXX-Cedric: resilient overwrites what's returned from request-mariadb
+# XXX-Cedric: change the request method to return everything from
+#             getConnectionParameterDict()
+[request-mariadb]
+return = ssh-public-key ssh-url notification-id ip url

stack/lamp/apache/instance-apache-import.cfg

-[buildout]
-extends = ${instance-apache-php:output}
-          ${pbsready-export:output}
-
-parts =
-  apache-proxy
-  logrotate
-  logrotate-entry-apache
-  cron
-  cron-entry-logrotate
-  sshkeys-authority
-  sshkeys-dropbear
-  dropbear-server
-  dropbear-server-pbs-authorized-key
-
-
-[apache-proxy]
-recipe = slapos.cookbook:apacheproxy
-url = $${slap-parameter:proxy-url}
-pid-file = $${basedirectory:run}/apache.pid
-lock-file = $${basedirectory:run}/apache.lock
-ip = $${slap-network-information:global-ipv6}
-port = 8080
-error-log = $${directory:httpd-log}/error.log
-access-log = $${directory:httpd-log}/access.log
-httpd-conf = $${rootdirectory:etc}/apache.conf
-wrapper = $${basedirectory:services}/apache
-
-promise = $${basedirectory:promises}/apache
-
-httpd-binary = ${apache:location}/bin/httpd
-
-
-#----------------
-#--
-#-- Creation of all needed directories.
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
-tmp = $${buildout:directory}/tmp
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log
-services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-backup = $${rootdirectory:srv}/backup
-promises = $${rootdirectory:etc}/promise
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-htdocs = $${rootdirectory:srv}/www
-logrotate-entries = $${rootdirectory:etc}/logrotate.d
-logrotate-backup = $${basedirectory:backup}/logrotate
-cronstamps = $${rootdirectory:etc}/cronstamps
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
-ssh = $${rootdirectory:etc}/ssh
-sshkeys = $${rootdirectory:srv}/sshkeys
-httpd-log = $${basedirectory:log}/apache
-
-
-#----------------
-#--
-#-- Deploy cron.
-
-[cron]
-recipe = slapos.cookbook:cron
-dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${directory:cron-entries}
-crontabs = $${directory:crontabs}
-cronstamps = $${directory:cronstamps}
-catcher = $${cron-simplelogger:wrapper}
-binary = $${basedirectory:services}/crond
-
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/crond.log
-
-
-#----------------
-#--
-#-- Deploy logrotate.
-
-[cron-entry-logrotate]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = logrotate
-frequency = 0 0 * * *
-command = $${logrotate:wrapper}
-
-[logrotate]
-recipe = slapos.cookbook:logrotate
-# Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = ${gzip:location}/bin/gzip
-gunzip-binary = ${gzip:location}/bin/gunzip
-# Directories
-wrapper = $${rootdirectory:bin}/logrotate
-conf = $${rootdirectory:etc}/logrotate.conf
-logrotate-entries = $${directory:logrotate-entries}
-backup = $${directory:logrotate-backup}
-state-file = $${rootdirectory:srv}/logrotate.status
-
-[logrotate-entry-apache]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = apache
-log = $${apache-proxy:error-log} $${apache-proxy:access-log}
-frequency = daily
-rotate-num = 30
-sharedscripts = true
-notifempty = true
-create = true
-
-
-#----------------
-#--
-#-- sshkeys
-
-[sshkeys-directory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:sshkeys}/requests
-keys = $${directory:sshkeys}/keys
-
-[sshkeys-authority]
-recipe = slapos.cookbook:sshkeys_authority
-request-directory = $${sshkeys-directory:requests}
-keys-directory = $${sshkeys-directory:keys}
-wrapper = $${basedirectory:services}/sshkeys_authority
-keygen-binary = ${dropbear:location}/bin/dropbearkey
-
-[sshkeys-dropbear]
-<= sshkeys-authority
-recipe = slapos.cookbook:sshkeys_authority.request
-name = dropbear
-type = rsa
-executable = $${dropbear-server:wrapper}
-public-key = $${dropbear-server:rsa-keyfile}.pub
-private-key = $${dropbear-server:rsa-keyfile}
-wrapper = $${basedirectory:services}/sshd
-
-
-#----------------
-#--
-#-- Dropbear.
-
-[dropbear-server]
-recipe = slapos.cookbook:dropbear
-host = $${slap-network-information:global-ipv6}
-port = 2222
-home = $${directory:ssh}
-wrapper = $${rootdirectory:bin}/raw_sshd
-shell = $${rdiff-backup-server:wrapper}
-rsa-keyfile = $${directory:ssh}/server_key.rsa
-dropbear-binary = ${dropbear:location}/sbin/dropbear
-
-[dropbear-server-pbs-authorized-key]
-<= dropbear-server
-recipe = slapos.cookbook:dropbear.add_authorized_key
-key = $${slap-parameter:authorized-key}
-
-
-#----------------
-#--
-#-- rdiff
-
-[rdiff-backup-server]
-recipe = slapos.cookbook:pbs
-client = false
-path = $${directory:htdocs}
-wrapper = $${rootdirectory:bin}/rdiffbackup-server
-rdiffbackup-binary = ${buildout:bin-directory}/rdiff-backup
-

stack/lamp/apache/instance-apache-import.cfg.in

+[buildout]
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+extends = ${pbsready-import:output}
+
+[directory]
+srv = $${buildout:directory}/srv
+www = $${:srv}/www/
+
+# Nothing to do for the import. Just dummy part that does nothing.
+# For httpd instance, PBS will directly push data to srv/www.
+# XXX-Cedric: write a real backup system.
+[importer]
+wrapper = /bin/true
+
+# State that we want to push to srv/www directory, not srv/backup.
+[rdiff-backup-server]
+path = $${directory:www}

stack/lamp/apache/instance-apache-php.cfg.in

@@ -9,8 +9,6 @@ parts =
   cron
   cron-entry-logrotate
   promise
-  slapmonitor
-  slapmonitor-xml
 
   frontend-promise
   content-promise
@@ -55,6 +53,7 @@ logrotate-backup = $${basedirectory:backup}/logrotate
 report = $${rootdirectory:etc}/report
 stunnel-conf = $${rootdirectory:etc}/stunnel
 xml-report = $${rootdirectory:var}/xml_report
+www = $${rootdirectory:srv}/www/
 
 [cadirectory]
 recipe = slapos.cookbook:mkdirectory
@@ -120,7 +119,7 @@ stunnel-binary = ${stunnel:location}/bin/stunnel
 remote-host = $${mariadb-urlparse:host}
 remote-port = $${mariadb-urlparse:port}
 local-host = $${slap-network-information:local-ipv4}
-local-port = 33060
+local-port = 3306
 log-file = $${basedirectory:log}/stunnel.log
 config-file = $${directory:stunnel-conf}/stunnel.conf
 key-file = $${directory:stunnel-conf}/stunnel.key
@@ -194,7 +193,7 @@ source = ${application:location}
 template = ${application-template:location}/${application-template:filename}
 configuration = ${application-configuration:location}
 
-htdocs = $${rootdirectory:srv}/www/
+htdocs = $${directory:www}
 pid-file = $${basedirectory:run}/apache.pid
 lock-file = $${basedirectory:run}/apache.lock
 ip = $${slap-network-information:global-ipv6}
@@ -248,18 +247,18 @@ config-custom_domain = $${slap-parameter:domain}
 #--
 #-- Deploy slapmonitor.
 
-[slapmonitor]
-recipe = slapos.cookbook:slapmonitor
-pid-file = $${basedirectory:run}/apache.pid
-database-path = $${basedirectory:log}/slapmonitor.db
-slapmonitor-path = ${buildout:bin-directory}/slapmonitor
-path = $${basedirectory:services}/slapmonitor
-
-[slapmonitor-xml]
-recipe = slapos.cookbook:slapmonitor-xml
-database-path = $${basedirectory:log}/slapmonitor.db
-slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
-path = $${directory:report}/slapmonitor-xml
+#[slapmonitor]
+#recipe = slapos.cookbook:slapmonitor
+#pid-file = $${basedirectory:run}/apache.pid
+#database-path = $${basedirectory:log}/slapmonitor.db
+#slapmonitor-path = ${buildout:bin-directory}/slapmonitor
+#path = $${basedirectory:services}/slapmonitor
+#
+#[slapmonitor-xml]
+#recipe = slapos.cookbook:slapmonitor-xml
+#database-path = $${basedirectory:log}/slapmonitor.db
+#slapmonitor-xml-path = ${buildout:bin-directory}/slapmonitor-xml
+#path = $${directory:report}/slapmonitor-xml
 
 
 #----------------

stack/lamp/buildout.cfg

@@ -20,32 +20,35 @@ parts =
   instance-mariadb-import
   instance-mariadb-export
 
-  instance-default-root
+#Contains the importer and exporter recipes for apache
+  instance-apache-import
+  instance-apache-export
 
 
 extends =
-  ../resilient/buildout.cfg
-  ../../component/mariadb/buildout.cfg
-  ../../component/apache/buildout.cfg
   ../../component/apache-php/buildout.cfg
+  ../../component/apache/buildout.cfg
+  ../../component/curl/buildout.cfg
+  ../../component/dash/buildout.cfg
   ../../component/dash/buildout.cfg
   ../../component/dcron/buildout.cfg
+  ../../component/dropbear/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/glib/buildout.cfg
+  ../../component/gzip/buildout.cfg
   ../../component/logrotate/buildout.cfg
-  ../../component/perl/buildout.cfg
-  ../../component/sqlite3/buildout.cfg
   ../../component/lxml-python/buildout.cfg
-  ../../component/zlib/buildout.cfg
-  ../../component/rdiff-backup/buildout.cfg
-  ../../component/gzip/buildout.cfg
-  ../../component/stunnel/buildout.cfg
+  ../../component/mariadb/buildout.cfg
   ../../component/mydumper/buildout.cfg
   ../../component/mysql-python/buildout.cfg
-  ../../component/dropbear/buildout.cfg
+  ../../component/perl/buildout.cfg
+  ../../component/rdiff-backup/buildout.cfg
+  ../../component/sqlite3/buildout.cfg
+  ../../component/stunnel/buildout.cfg
+  ../../component/zlib/buildout.cfg
+  ../resilient/buildout.cfg
   ../slapos.cfg
-  ../../component/dash/buildout.cfg
-  ../../component/curl/buildout.cfg
+
 
 [mariadb]
 # Compile dir is for plugins, there's no plugin in LAMP
@@ -64,66 +67,71 @@ strip-top-level-dir = true
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
-md5sum = 38bdcf0a8263d4a19bd6a35c0cd00340
+md5sum = 650cd2527158734fd6ccd9ec374b5e69
 mode = 0644
 
 [instance-apache-php]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
 output = ${buildout:directory}/instance-apache-php.cfg
-md5sum = bf3219cd7d318e02e39c462fbb530715
+md5sum = af0d52de4c10d5a3a64f7c92283ad959
 mode = 0644
 
-[instance-apache-backup]
+[instance-apache-import]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/apache/instance-apache-backup.cfg.in
-output = ${buildout:directory}/instance-apache-backup.cfg
-md5sum = 48f969d82319a9d145570f5f0fd27672
+url = ${:_profile_base_location_}/apache/instance-apache-import.cfg.in
+output = ${buildout:directory}/instance-apache-import.cfg
+md5sum = f1dc2a71d362b5d2d36481ffefdd2293
 mode = 0644
 
-[template-resilient-lamp]
+[instance-apache-export]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/template-resilient.cfg.in
-rendered = ${buildout:directory}/instance-resilient.cfg
+template = ${:_profile_base_location_}/apache/instance-apache-export.cfg.jinja2
+rendered = ${buildout:directory}/instance-apache-export.cfg
 
 context = key templateapache instance-apache-php:output
-          key dropbear dropbear:location
-          key buildout buildout:bin-directory
+          key templatepbsreadyexport pbsready-export:output
+
+import-list = file parts template-parts:destination
+              file replicated template-replicated:destination
+
+md5sum = 4704f2788f096c7494694db72a9f6193
+mode = 0644
+
+[instance-resilient]
+recipe = slapos.recipe.template:jinja2
+template = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
+rendered = ${buildout:directory}/instance-resilient.cfg
+
+context = key buildout buildout:bin-directory
+          key develop_eggs_directory buildout:develop-eggs-directory
+          key eggs_directory buildout:eggs-directory
 
 import-list = file parts template-parts:destination
               file replicated template-replicated:destination
 
-md5sum = 5605ad8896c2718854bf26148c4ae940
+md5sum = f6dc9290194ad1fbe1ced553f5668922
 mode = 0644
- 
 
 [instance-mariadb]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/mariadb/instance-mariadb.cfg.in
 output = ${buildout:directory}/instance-mariadb.cfg
-md5sum = fafb873323c0084c522360f94ebe1df7
+md5sum = c328d11f76373f8c5928afedf2178afd
 mode = 0644
 
 [instance-mariadb-import]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/mariadb/instance-mariadb-import.cfg.in
 output = ${buildout:directory}/instance-mariadb-import.cfg
-md5sum = 8009627bb669d1fee0df030daa8d3bdc
+md5sum = faf5826f4b27e362f34ad17db54b8c9a
 mode = 0644
 
 [instance-mariadb-export]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/mariadb/instance-mariadb-export.cfg.in
 output = ${buildout:directory}/instance-mariadb-export.cfg
-md5sum = 0513bf25fbb20cccd57f285c40d96498
-mode = 0644
-
-
-[instance-default-root]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-default-root.cfg.in
-output = ${buildout:directory}/instance-default-root.cfg
-md5sum = 53c9020f7a0b5203f976e069e455787b
+md5sum = 0352896921ca1766b64f0b54f0f8c27e
 mode = 0644
 
 
@@ -277,82 +285,86 @@ signature-certificate-list =
   n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR
   -----END CERTIFICATE-----
 
-
 [versions]
 Jinja2 = 2.6
 Werkzeug = 0.8.3
-apache-libcloud = 0.11.4
+apache-libcloud = 0.12.1
 async = 0.6.1
 buildout-versions = 1.7
 gitdb = 0.5.4
 hexagonit.recipe.cmmi = 1.6
 inotifyx = 0.2.0
-lxml = 3.0.2
+lxml = 3.1.0
 meld3 = 0.6.10
 netaddr = 0.7.10
 pycrypto = 2.6
-pytz = 2012h
+pytz = 2012j
 rdiff-backup = 1.0.5
-slapos.recipe.build = 0.11.5
+slapos.cookbook = 0.74.0
+slapos.recipe.build = 0.11.6
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
+slapos.toolbox = 0.33.1
 smmap = 0.8.2
 
 # Required by:
-# slapos.core==0.33.2-dev
-# slapos.toolbox==0.32.1-dev
+# slapos.core==0.35.1
+# slapos.toolbox==0.33.1
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33.1
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33.1
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33.1
 feedparser = 5.1.3
 
 # Required by:
-# hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6
-
-# Required by:
-# slapos.core==0.33.2-dev
+# slapos.core==0.35.1
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
-paramiko = 1.9.0
+# slapos.toolbox==0.33.1
+paramiko = 1.10.0
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33.1
 psutil = 0.6.1
 
 # Required by:
-# slapos.core==0.33.2-dev
-pyflakes = 0.5.0
+# slapos.core==0.35.1
+pyflakes = 0.6.1
 
 # Required by:
-# slapos.cookbook==0.70.1-dev
-# slapos.core==0.33.2-dev
-# slapos.toolbox==0.32.1-dev
+# slapos.cookbook==0.74.0
+# slapos.core==0.35.1
+# slapos.toolbox==0.33.1
 # supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.2
+# zope.interface==4.0.5
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.33.2-dev
+# slapos.toolbox==0.33.1
+slapos.core = 0.35.1
+
+# Required by:
+# slapos.core==0.35.1
 supervisor = 3.0b1
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
-xml-marshaller = 0.9.7
+# slapos.core==0.35.1
+unittest2 = 0.5.1
 
 # Required by:
-# slapos.core==0.33.2-dev
-zope.interface = 4.0.2
+# slapos.toolbox==0.33.1
+xml-marshaller = 0.9.7
 
+# Required by:
+# slapos.core==0.35.1
+zope.interface = 4.0.5
\ No newline at end of file

stack/lamp/instance-default-root.cfg.in

-[buildout]
-parts = request-apache
-
-[request-apache]
-<= slap-connection
-recipe = slapos.cookbook:request
-software-url = $${slap-connection:software-release-url}
-software-type = apache
-name = Apache
-

stack/lamp/instance-resilient.cfg.jinja2

+# vim: set ft=cfg:
+
+{% import 'parts' as parts %}
+{% import 'replicated' as replicated %}
+
+[buildout]
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+# += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
+parts +=
+  {{ parts.replicate("apache", "3") }}
+  publish-connection-informations
+
+{{ replicated.replicate("apache", "3", "apache-export", "apache-import") }}
+
+# Bubble up the parameters
+[request-apache]
+return = url ssh-public-key ssh-url notification-id ip url backend_url
+# XXX: hardcoded values
+config = domain number authorized-key notify ip-list namebase mariadb1-computer-guid pbs-mariadb1-computer-guid mariadb2-computer-guid pbs-mariadb2-computer-guid mariadb3-computer-guid pbs-mariadb3-computer-guid
+config-mariadb1-computer-guid = ${slap-parameter:mariadb1-computer-guid}
+config-pbs-mariadb1-computer-guid = ${slap-parameter:pbs-mariadb1-computer-guid}
+config-mariadb2-computer-guid = ${slap-parameter:mariadb2-computer-guid}
+config-pbs-mariadb2-computer-guid = ${slap-parameter:pbs-mariadb2-computer-guid}
+config-mariadb3-computer-guid = ${slap-parameter:mariadb3-computer-guid}
+config-pbs-mariadb3-computer-guid = ${slap-parameter:pbs-mariadb3-computer-guid}
+config-domain = ${slap-parameter:domain}
+
+[publish-connection-informations]
+recipe = slapos.cookbook:publish
+backend_url = ${request-apache:connection-backend_url}
+url = ${request-apache:connection-url}
+
+[slap-parameter]
+# Default parameters for distributed deployment
+# I.e state "backup1 of maria should go there, ..."
+# XXX-Cedric: Hardcoded number of backups. Should be dynamically generated.
+mariadb1-computer-guid =
+pbs-mariadb1-computer-guid =
+mariadb2-computer-guid =
+pbs-mariadb2-computer-guid =
+mariadb3-computer-guid =
+pbs-mariadb3-computer-guid =
+# XXX-Cedric: Hardcoded parameters. Should be dynamically generated.
+domain =

stack/lamp/instance.cfg.in

@@ -10,15 +10,12 @@ offline = true
 [switch_softwaretype]
 recipe = slapos.cookbook:softwaretype
 default = ${instance-apache-php:output}
-resilient = ${template-resilient-lamp:rendered}
+resilient = ${instance-resilient:rendered}
 mariadb = ${instance-mariadb:output}
 mariadb-import = ${instance-mariadb-import:output}
 mariadb-export = ${instance-mariadb-export:output}
-apache-backup = ${instance-apache-backup:output}
-
-# To prepend an empty root instance:
-#default = ${instance-default-root:output}
-#apache = ${instance-apache-php:output}
+apache-import = ${instance-apache-import:output}
+apache-export = ${instance-apache-export:rendered}
 
 #frozen creates a syntax error, meaning it can keep its data.
 #It's dirty as hell, it needs to be replaced.

stack/lamp/mariadb/instance-mariadb-export.cfg.in

@@ -2,14 +2,23 @@
 extends = ${instance-mariadb:output}
           ${pbsready-export:output}
 
-
+# Repeating parts from instance-mariadb.
 parts +=
-    mariadb
-
-# have to repeat the next one, as it's not inherited from pbsready-export
-    cron-entry-backup
-
+  urls
+  mariadb
+  stunnel
+  certificate-authority
+  ca-stunnel
+  logrotate
+  logrotate-entry-mariadb
+  logrotate-entry-stunnel
+  logrotate-entry-cron
+  cron
+  cron-entry-logrotate
+  slapmonitor
+  slapmonitor-xml
 
+# Define exporter strategy
 [exporter]
 recipe = slapos.cookbook:mydumper
 wrapper = $${rootdirectory:bin}/$${slap-parameter:namebase}-exporter
@@ -19,3 +28,7 @@ user = root
 mydumper-binary = ${mydumper:location}/bin/mydumper
 database = $${mariadb:database}
 import = false
+
+# Extends publish section with resilient parameters
+[urls]
+<= resilient-publish-connection-parameter
\ No newline at end of file

stack/lamp/mariadb/instance-mariadb-import.cfg.in

@@ -2,13 +2,6 @@
 extends = ${instance-mariadb:output}
           ${pbsready-import:output}
 
-
-parts +=
-    mariadb
-
-# have to repeat the next one, as it's not inherited from pbsready-import
-    import-on-notification
-
 [importer]
 recipe = slapos.cookbook:mydumper
 wrapper = $${rootdirectory:bin}/myloader

stack/lamp/mariadb/instance-mariadb.cfg.in

@@ -14,8 +14,6 @@ parts =
   slapmonitor
   slapmonitor-xml
 
-gzip-binary = ${gzip:location}/bin/gzip
-
 # Define egg directories to be the one from Software Release
 # (/opt/slapgrid/...)
 eggs-directory = ${buildout:eggs-directory}
@@ -91,7 +89,7 @@ command = $${logrotate:wrapper}
 recipe = slapos.cookbook:logrotate
 # Binaries
 logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = $${buildout:gzip-binary}
+gzip-binary = ${gzip:location}/bin/gzip
 gunzip-binary = ${gzip:location}/bin/gunzip
 # Directories
 wrapper = $${rootdirectory:bin}/logrotate
@@ -196,7 +194,8 @@ recipe = slapos.cookbook:mysql
 # Options
 recovering = false
 user = user
-port = 3306
+password = $${mysql-password:passwd}
+port = 33060
 ip = $${slap-network-information:local-ipv4}
 database = db
 
@@ -218,6 +217,11 @@ mysql-install-binary = ${mariadb:location}/scripts/mysql_install_db
 mysql-upgrade-binary = ${mariadb:location}/bin/mysql_upgrade
 mysqld-binary = ${mariadb:location}/bin/mysqld
 
+[mysql-password]
+recipe = slapos.cookbook:generate.password
+storage-path = $${rootdirectory:etc}/.passwd
+bytes = 4
+
 
 #----------------
 #--

stack/lamp/template-resilient.cfg.in

-{% import 'parts' as parts %}
-{% import 'replicated' as replicated %}
-
-[buildout]
-
-extends =
-   {{templateapache}}
-
-# += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
-parts +=
-  {{ parts.replicate("mariadb","3") }}
-  request-apache-backup-1
-  request-apache-backup-2
-
-  request-pull-backup-server-apache-1
-  request-pull-backup-server-apache-backup-1
-
-  request-pull-backup-server-apache-2
-  request-pull-backup-server-apache-backup-2
-
-  publish-connection-informations
-  apache-php
-  stunnel
-  certificate-authority
-  ca-stunnel
-  logrotate
-  logrotate-entry-apache
-  logrotate-entry-stunnel
-  cron
-  cron-entry-logrotate
-  dropbear-server
-  sshkeys-authority
-  dropbear-server-pbs-authorized-key
-
-  request-pull-backup-server
-
-{{ replicated.replicate("mariadb", "3", "mariadb-export", "mariadb-import") }}
-
-
-[request-pull-backup-server]
-<= request-pbs-common
-name = PBS (Pull Backup Server)
-return = ssh-key notification-url feeds-url
-slave = false
-
-[sshkeys-directory]
-recipe = slapos.cookbook:mkdirectory
-requests = ${directory:sshkeys}/requests
-keys = ${directory:sshkeys}/keys
-
-[sshkeys-authority]
-recipe = slapos.cookbook:sshkeys_authority
-request-directory = ${sshkeys-directory:requests}
-keys-directory = ${sshkeys-directory:keys}
-wrapper = ${basedirectory:services}/sshkeys_authority
-keygen-binary = {{dropbear}}/bin/dropbearkey
-
-[sshkeys-dropbear]
-<= sshkeys-authority
-recipe = slapos.cookbook:sshkeys_authority.request
-name = dropbear
-type = rsa
-executable = ${dropbear-server:wrapper}
-public-key = ${dropbear-server:rsa-keyfile}.pub
-private-key = ${dropbear-server:rsa-keyfile}
-wrapper = ${basedirectory:services}/sshd
-
-[dropbear-server]
-recipe = slapos.cookbook:dropbear
-host = ${slap-network-information:global-ipv6}
-port = 2222
-home = ${directory:ssh}
-wrapper = ${rootdirectory:bin}/raw_sshd
-shell = ${rdiff-backup-server:wrapper}
-rsa-keyfile = ${directory:ssh}/server_key.rsa
-dropbear-binary = {{dropbear}}/sbin/dropbear
-
-[dropbear-server-pbs-authorized-key]
-<= dropbear-server
-recipe = slapos.cookbook:dropbear.add_authorized_key
-key = ${request-pull-backup-server:connection-ssh-key}
-
-[rdiff-backup-server]
-<= apache-php
-recipe = slapos.cookbook:pbs
-client = false
-path = ${apache-php:htdocs}
-wrapper = ${rootdirectory:bin}/rdiffbackup-server
-rdiffbackup-binary = {{buildout}}/rdiff-backup
-
-[request-apache-backup-1]
-<= slap-connection
-recipe = slapos.cookbook:request
-name = Apache Backup 1
-software-url = ${slap-connection:software-release-url}
-software-type = apache-backup
-return = url ssh-url ssh-public-key
-config = authorized-key proxy-url
-config-authorized-key = ${request-pull-backup-server:connection-ssh-key}
-config-proxy-url = ${publish-connection-informations:url}
-
-[request-apache-backup-2]
-<= slap-connection
-recipe = slapos.cookbook:request
-name = Apache Backup 2
-software-url = ${slap-connection:software-release-url}
-software-type = apache-backup
-return = url ssh-url ssh-public-key
-config = authorized-key proxy-url
-config-authorized-key = ${request-pull-backup-server:connection-ssh-key}
-config-proxy-url = ${publish-connection-informations:url}
-
-[request-pull-backup-server-apache-1]
-<= request-pbs-common
-name = PBS pulling from Apache 1
-config = url name type server-key notify notification-id frequency
-config-url = ssh://nobody@[${dropbear-server:host}]:${dropbear-server:port}/${rdiff-backup-server:path}
-config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-apache
-config-type = pull
-config-server-key = ${sshkeys-dropbear:public-key-value}
-config-notify = ${request-pull-backup-server:connection-notification-url}
-config-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-apache-pull
-config-frequency = 30 * * * *
-slave = true
-sla = instance_guid
-sla-instance_guid = ${request-pull-backup-server:instance_guid}
-
-[request-pull-backup-server-apache-2]
-<= request-pbs-common
-name = PBS pulling from Apache 2
-config = url name type server-key notify notification-id frequency
-config-url = ssh://nobody@[${dropbear-server:host}]:${dropbear-server:port}/${rdiff-backup-server:path}
-config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-apache
-config-type = pull
-config-server-key = ${sshkeys-dropbear:public-key-value}
-config-notify = ${request-pull-backup-server:connection-notification-url}
-config-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-apache-pull
-config-frequency = 30 * * * *
-slave = true
-sla = instance_guid
-sla-instance_guid = ${request-pull-backup-server:instance_guid}
-
-
-[request-pull-backup-server-apache-backup-1]
-<= request-pbs-common
-name = PBS pushing to ${request-apache-backup-1:name}
-config = url name type server-key on-notification
-config-url = ${request-apache-backup-1:connection-ssh-url}
-config-name = ${request-pull-backup-server-apache-1:config-name}
-config-type = push
-config-server-key = ${request-apache-backup-1:connection-ssh-public-key}
-config-on-notification = ${request-pull-backup-server:connection-feeds-url}${request-pull-backup-server-apache-1:config-notification-id}
-slave = true
-sla = instance_guid
-sla-instance_guid = ${request-pull-backup-server:instance_guid}
-
-[request-pull-backup-server-apache-backup-2]
-<= request-pbs-common
-name = PBS pushing to ${request-apache-backup-2:name}
-config = url name type server-key on-notification
-config-url = ${request-apache-backup-2:connection-ssh-url}
-config-name = ${request-pull-backup-server-apache-2:config-name}
-config-type = push
-config-server-key = ${request-apache-backup-2:connection-ssh-public-key}
-config-on-notification = ${request-pull-backup-server:connection-feeds-url}${request-pull-backup-server-apache-2:config-notification-id}
-slave = true
-sla = instance_guid
-sla-instance_guid = ${request-pull-backup-server:instance_guid}
-
-
-[directory]
-ssh = ${rootdirectory:etc}/ssh
-sshkeys = ${rootdirectory:srv}/sshkeys

stack/lapp/apache/instance-apache-backup.cfg.in

-[buildout]
-
-parts =
-  urls
-  apache-proxy
-  logrotate
-  logrotate-entry-apache
-  cron
-  cron-entry-logrotate
-  sshkeys-authority
-  sshkeys-dropbear
-  dropbear-server
-  dropbear-server-pbs-authorized-key
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-
-#----------------
-#--
-#-- Creation of all needed directories.
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
-tmp = $${buildout:directory}/tmp
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log
-services = $${rootdirectory:etc}/service
-run = $${rootdirectory:var}/run
-backup = $${rootdirectory:srv}/backup
-promises = $${rootdirectory:etc}/promise
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-htdocs = $${rootdirectory:srv}/www
-logrotate-entries = $${rootdirectory:etc}/logrotate.d
-logrotate-backup = $${basedirectory:backup}/logrotate
-cronstamps = $${rootdirectory:etc}/cronstamps
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
-ssh = $${rootdirectory:etc}/ssh
-sshkeys = $${rootdirectory:srv}/sshkeys
-httpd-log = $${basedirectory:log}/apache
-
-
-#----------------
-#--
-#-- Deploy cron.
-
-[cron]
-recipe = slapos.cookbook:cron
-dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${directory:cron-entries}
-crontabs = $${directory:crontabs}
-cronstamps = $${directory:cronstamps}
-catcher = $${cron-simplelogger:wrapper}
-binary = $${basedirectory:services}/crond
-
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/crond.log
-
-
-#----------------
-#--
-#-- Deploy logrotate.
-
-[cron-entry-logrotate]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = logrotate
-frequency = 0 0 * * *
-command = $${logrotate:wrapper}
-
-[logrotate]
-recipe = slapos.cookbook:logrotate
-# Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = ${gzip:location}/bin/gzip
-gunzip-binary = ${gzip:location}/bin/gunzip
-# Directories
-wrapper = $${rootdirectory:bin}/logrotate
-conf = $${rootdirectory:etc}/logrotate.conf
-logrotate-entries = $${directory:logrotate-entries}
-backup = $${directory:logrotate-backup}
-state-file = $${rootdirectory:srv}/logrotate.status
-
-
-#----------------
-#--
-#-- sshkeys
-
-[sshkeys-directory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:sshkeys}/requests
-keys = $${directory:sshkeys}/keys
-
-[sshkeys-authority]
-recipe = slapos.cookbook:sshkeys_authority
-request-directory = $${sshkeys-directory:requests}
-keys-directory = $${sshkeys-directory:keys}
-wrapper = $${basedirectory:services}/sshkeys_authority
-keygen-binary = ${dropbear:location}/bin/dropbearkey
-
-[sshkeys-dropbear]
-<= sshkeys-authority
-recipe = slapos.cookbook:sshkeys_authority.request
-name = dropbear
-type = rsa
-executable = $${dropbear-server:wrapper}
-public-key = $${dropbear-server:rsa-keyfile}.pub
-private-key = $${dropbear-server:rsa-keyfile}
-wrapper = $${basedirectory:services}/sshd
-
-
-#----------------
-#--
-#-- Dropbear.
-
-[dropbear-server]
-recipe = slapos.cookbook:dropbear
-host = $${slap-network-information:global-ipv6}
-port = 2222
-home = $${directory:ssh}
-wrapper = $${rootdirectory:bin}/raw_sshd
-shell = $${rdiff-backup-server:wrapper}
-rsa-keyfile = $${directory:ssh}/server_key.rsa
-dropbear-binary = ${dropbear:location}/sbin/dropbear
-
-[dropbear-server-pbs-authorized-key]
-<= dropbear-server
-recipe = slapos.cookbook:dropbear.add_authorized_key
-key = $${slap-parameter:authorized-key}
-
-
-#----------------
-#--
-#-- rdiff
-
-[rdiff-backup-server]
-recipe = slapos.cookbook:pbs
-client = false
-path = $${directory:htdocs}
-wrapper = $${rootdirectory:bin}/rdiffbackup-server
-rdiffbackup-binary = ${buildout:bin-directory}/rdiff-backup
-
-
-#----------------
-#--
-#-- Apache Proxy.
-
-[apache-proxy]
-recipe = slapos.cookbook:apacheproxy
-url = $${slap-parameter:proxy-url}
-pid-file = $${basedirectory:run}/apache.pid
-lock-file = $${basedirectory:run}/apache.lock
-ip = $${slap-network-information:global-ipv6}
-port = 8080
-error-log = $${directory:httpd-log}/error.log
-access-log = $${directory:httpd-log}/access.log
-httpd-conf = $${rootdirectory:etc}/apache.conf
-wrapper = $${basedirectory:services}/apache
-
-promise = $${basedirectory:promises}/apache
-
-httpd-binary = ${apache:location}/bin/httpd
-
-[logrotate-entry-apache]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = apache
-log = $${apache-proxy:error-log} $${apache-proxy:access-log}
-frequency = daily
-rotate-num = 30
-sharedscripts = true
-notifempty = true
-create = true
-
-
-#----------------
-#--
-#-- Publish instance parameters.
-
-[urls]
-recipe = slapos.cookbook:publish
-url = http://[$${apache-proxy:ip}]:$${apache-proxy:port}/
-ssh-public-key = $${sshkeys-dropbear:public-key-value}
-ssh-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path}
-

stack/lapp/apache/instance-apache-export.cfg.jinja2

+# This file is responsible of three things:
+# 1/ Act as "Apache exporter"
+# 2/ Act as "Postgres backup infrastructure requester"
+# 3/ Act as "Apache" instance
+
+{% import 'parts' as parts %}
+{% import 'replicated' as replicated %}
+
+[buildout]
+extends = {{templateapache}}
+          {{templatepbsreadyexport}}
+
+parts +=
+    {{ parts.replicate("postgres", "3") }}
+
+# Repeating parts from instance-apache-php.
+# XXX-Cedric: how to simplify this?
+    certificate-authority
+    ca-stunnel
+    logrotate
+    logrotate-entry-apache
+    logrotate-entry-stunnel
+    cron
+    cron-entry-logrotate
+    promise
+    frontend-promise
+    content-promise
+    publish-connection-informations
+
+{{ replicated.replicate("postgres", "3", "postgres-export", "postgres-import") }}
+
+# Nothing to do for the exporter. This wrapper is intended
+# to produce the "dump" files that have to be backed up.
+# So, in case of binary DB data, we would back up the ASCII dump
+# files, or a similar data format that can be restored on any machine
+# (i.e. postgres 'custom')
+# In the case of an httpd instance, the src/www directory can be directly
+# pulled from the PBS, we don't need to prepare anything.
+[exporter]
+wrapper = /bin/true
+
+# State that we want to backup srv/www directory, not srv/backup.
+# XXX-Cedric: works well, but doesn't work with big data.
+[rdiff-backup-server]
+path = ${directory:www}
+
+# Add "exporter" parameters to list of published connection parameters
+[publish-connection-informations]
+# XXX-Cedric: Long term goal: could be a recipe that requests an instance and
+# bubbles ALL
+# parameters of the requested instance. Requirement: aggregated publish.
+<= resilient-publish-connection-parameter
+
+# XXX-Cedric: resilient overwrites what's returned from request-postgres
+# XXX-Cedric: change the request method to return everything from
+#             getConnectionParameterDict()
+[request-postgres]
+return = ssh-public-key ssh-url notification-id ip url

stack/lapp/apache/instance-apache-import.cfg.in

+[buildout]
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+extends = ${pbsready-import:output}
+
+[directory]
+srv = $${buildout:directory}/srv
+www = $${:srv}/www/
+
+# Nothing to do for the import. Just dummy part that does nothing.
+# For httpd instance, PBS will directly push data to srv/www.
+# XXX-Cedric: write a real backup system.
+[importer]
+wrapper = /bin/true
+
+# State that we want to push to srv/www directory, not srv/backup.
+[rdiff-backup-server]
+path = $${directory:www}

stack/lapp/apache/instance-apache-php.cfg.in

@@ -57,6 +57,7 @@ logrotate-backup = $${basedirectory:backup}/logrotate
 report = $${rootdirectory:etc}/report
 stunnel-conf = $${rootdirectory:etc}/stunnel
 xml-report = $${rootdirectory:var}/xml_report
+www = $${rootdirectory:srv}/www/
 
 [cadirectory]
 recipe = slapos.cookbook:mkdirectory
@@ -195,7 +196,7 @@ url = $${request-postgres:connection-url}
 recipe = slapos.cookbook:apachephp
 source = ${application:location}
 
-htdocs = $${rootdirectory:srv}/www/
+htdocs = $${directory:www}
 pid-file = $${basedirectory:run}/apache.pid
 lock-file = $${basedirectory:run}/apache.lock
 ip = $${slap-network-information:global-ipv6}

stack/lapp/buildout.cfg

 [buildout]
+
+ignore-existing = true
+
 parts =
   slapos-cookbook
   apache-php-postgres
@@ -15,13 +18,14 @@ parts =
   instance-postgres-import
   instance-postgres-export
 
-  instance-default-root
+#Contains the importer and exporter recipes for apache
+  instance-apache-import
+  instance-apache-export
 
 
 extends =
-  ../resilient/buildout.cfg
-  ../../component/apache/buildout.cfg
   ../../component/apache-php/buildout.cfg
+  ../../component/apache/buildout.cfg
   ../../component/dash/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/gzip/buildout.cfg
@@ -31,6 +35,7 @@ extends =
   ../../component/rdiff-backup/buildout.cfg
   ../../component/stunnel/buildout.cfg
   ../../component/dropbear/buildout.cfg
+  ../resilient/buildout.cfg
   ../slapos.cfg
 
 
@@ -50,38 +55,51 @@ strip-top-level-dir = true
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
-md5sum = 1aaf3ea7b14e09e66904bdb80e3cfe2f
+md5sum = 25d07b5101d5f566398686642ada4cee
 mode = 0644
 
 [instance-apache-php]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
 output = ${buildout:directory}/instance-apache-php.cfg
-md5sum = 72b70452d1c077cfcd0f268181506b8e
+md5sum = 823257dda6f3068a38c6b69c771cf307
 mode = 0644
 
-[instance-apache-backup]
+[instance-apache-import]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/apache/instance-apache-backup.cfg.in
-output = ${buildout:directory}/instance-apache-backup.cfg
-md5sum = db879141c0b6a77ef8b3b7e699f5583a
+url = ${:_profile_base_location_}/apache/instance-apache-import.cfg.in
+output = ${buildout:directory}/instance-apache-import.cfg
+md5sum = f1dc2a71d362b5d2d36481ffefdd2293
 mode = 0644
 
-[template-resilient-lapp]
+[instance-apache-export]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/template-resilient.cfg.in
-rendered = ${buildout:directory}/instance-resilient.cfg
+template = ${:_profile_base_location_}/apache/instance-apache-export.cfg.jinja2
+rendered = ${buildout:directory}/instance-apache-export.cfg
 
 context = key templateapache instance-apache-php:output
-          key dropbear dropbear:location
-          key buildout buildout:bin-directory
+          key templatepbsreadyexport pbsready-export:output
 
 import-list = file parts template-parts:destination
               file replicated template-replicated:destination
 
-md5sum = 525f50e60d0a96557a552de6afa4ab88
+md5sum = bdc7e126567ece6bf93a9bb493e29fac
+mode = 0644
+
+[instance-resilient]
+recipe = slapos.recipe.template:jinja2
+template = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
+rendered = ${buildout:directory}/instance-resilient.cfg
+
+context = key buildout buildout:bin-directory
+          key develop_eggs_directory buildout:develop-eggs-directory
+          key eggs_directory buildout:eggs-directory
+
+import-list = file parts template-parts:destination
+              file replicated template-replicated:destination
+
+md5sum = ef38aa9810ce20960382261f235abfcd
 mode = 0644
- 
 
 [instance-postgres]
 recipe = slapos.recipe.template
@@ -101,7 +119,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/postgres/instance-postgres-export.cfg.in
 output = ${buildout:directory}/instance-postgres-export.cfg
-md5sum = 68080e5d861eb3474442211dd65c668b
+md5sum = d95205a5fc2825e9709ed6db295111e2
 mode = 0644
 
 
@@ -124,12 +142,6 @@ library-dirs =
 rpath = 
     ${postgresql:location}/lib
 
-[instance-default-root]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-default-root.cfg.in
-output = ${buildout:directory}/instance-default-root.cfg
-md5sum = 53c9020f7a0b5203f976e069e455787b
-mode = 0644
 
 #----------------
 #--
@@ -163,82 +175,251 @@ eggs =
   ${psycopg2:egg}
   slapos.toolbox
 
+[networkcache]
+# Romain Courteaud + Sebastien Robin + Alain Takoudjou
+# + Cedric de Saint Martin signature certificate
+# List of signatures of uploaders we trust:
+#   Romain Courteaud
+#   Sebastien Robin
+#   Kazuhiko Shiozaki
+#   Cedric de Saint Martin
+#   Yingjie Xu
+#   Gabriel Monnerat
+#   Łukasz Nowak
+#   Test Agent Signature
+#   Alain Takoudjou
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
+  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
+  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
+  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
+  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
+  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
+  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
+  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
+  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
+  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
+  QUUGLQ==
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
+  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
+  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
+  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
+  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
+  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
+  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
+  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
+  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
+  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
+  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
+  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
+  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
+  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
+  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
+  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
+  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
+  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
+  vaZhjNYKWQf79l6zXfOvphzJ
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
+  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
+  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
+  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
+  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
+  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
+  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
+  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
+  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
+  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
+  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
+  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
+  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
+  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
+  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
+  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
+  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
+  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
+  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
+  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
+  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
+  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
+  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
+  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
+  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
+  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
+  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
+  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
+  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
+  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
+  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
+  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
+  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9DCCAV2gAwIBAgIJAL392bEdqpFQMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjM0MB4XDTExMTEwOTE1MzA0M1oXDTEyMTEwODE1MzA0M1owEzER
+  MA8GA1UEAwwIQ09NUC0yMzQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMRR
+  T0cacZKztie/DaRRjq3mgcqfPKoGXu6zXmeRQI+6Y4bnzjf8h/jAuPzR552P0xK5
+  psxhavXA8hOGRLFDtvDMQLepVHWfwqtFtcp5vNf2+KWqOYy0OxHfVIlnatvCqTZN
+  NG1vRsSOAQ+v7QNFHh6NBbiSrjBBfg4vkfzqnsUvAgMBAAGjUDBOMB0GA1UdDgQW
+  BBTGGw+ASoDi9kqPElDkC0Q5RtAfRjAfBgNVHSMEGDAWgBTGGw+ASoDi9kqPElDk
+  C0Q5RtAfRjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAIOuR1OqXLke
+  LLzH0kRnlIOe60dYJvRya53wDx5x2g4/qkXZPLx2RcbaUrX/SCbL70vfr+apUPss
+  dOSJ86sf/PQHW3/1fhTTE+Vck1MiiAq0aIx6WnKnz4+ZcQctB7b0DCsTcQnmbpi2
+  n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR
+  -----END CERTIFICATE-----
+
 
 [versions]
 Jinja2 = 2.6
 Werkzeug = 0.8.3
-apache-libcloud = 0.11.4
+apache-libcloud = 0.12.1
 async = 0.6.1
 buildout-versions = 1.7
+cp.recipe.cmd = 0.4
 gitdb = 0.5.4
 hexagonit.recipe.cmmi = 1.6
-inotifyx = 0.2.0
-lxml = 3.0.2
 meld3 = 0.6.10
-netaddr = 0.7.10
-psycopg2 = 2.4.6
+plone.recipe.command = 1.1
 pycrypto = 2.6
-pytz = 2012h
 rdiff-backup = 1.0.5
+slapos.recipe.build = 0.11.6
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
+slapos.toolbox = 0.33.1
 smmap = 0.8.2
 
 # Required by:
-# slapos.core==0.33.2-dev
-# slapos.toolbox==0.32.1-dev
+# slapos.core==0.35.1
+# slapos.toolbox==0.33.1
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33.1
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33.1
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33.1
 feedparser = 5.1.3
 
 # Required by:
-# hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6
+# slapos.cookbook==0.74.1-dev
+inotifyx = 0.2.0
+
+# Required by:
+# slapos.cookbook==0.74.1-dev
+# slapos.core==0.35.1
+# xml-marshaller==0.9.7
+lxml = 3.1.0
+
+# Required by:
+# slapos.cookbook==0.74.1-dev
+netaddr = 0.7.10
 
 # Required by:
-# slapos.core==0.33.2-dev
+# slapos.core==0.35.1
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
-paramiko = 1.9.0
+# slapos.toolbox==0.33.1
+paramiko = 1.10.0
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.toolbox==0.33.1
 psutil = 0.6.1
 
 # Required by:
-# slapos.core==0.33.2-dev
-pyflakes = 0.5.0
+# slapos.recipe.maarch==0.4
+psycopg2 = 2.4.6
+
+# Required by:
+# slapos.core==0.35.1
+pyflakes = 0.6.1
 
 # Required by:
-# slapos.cookbook==0.70.1-dev
-# slapos.core==0.33.2-dev
-# slapos.toolbox==0.32.1-dev
+# slapos.cookbook==0.74.1-dev
+pytz = 2013b
+
+# Required by:
+# slapos.cookbook==0.74.1-dev
+# slapos.core==0.35.1
+# slapos.recipe.maarch==0.4
+# slapos.toolbox==0.33.1
 # supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.2
+# zope.interface==4.0.5
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.33.2-dev
+# slapos.cookbook==0.74.1-dev
+# slapos.toolbox==0.33.1
+slapos.core = 0.35.1
+
+# Required by:
+# slapos.core==0.35.1
 supervisor = 3.0b1
 
 # Required by:
-# slapos.toolbox==0.32.1-dev
+# slapos.core==0.35.1
+unittest2 = 0.5.1
+
+# Required by:
+# slapos.cookbook==0.74.1-dev
+# slapos.toolbox==0.33.1
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.core==0.33.2-dev
-zope.interface = 4.0.2
+# zope.testing==4.1.2
+zope.exceptions = 4.0.6
+
+# Required by:
+# slapos.core==0.35.1
+# zope.testing==4.1.2
+zope.interface = 4.0.5
+
+# Required by:
+# cp.recipe.cmd==0.4
+zope.testing = 4.1.2
 

stack/lapp/instance-default-root.cfg.in

-[buildout]
-parts = request-apache
-
-[request-apache]
-<= slap-connection
-recipe = slapos.cookbook:request
-software-url = $${slap-connection:software-release-url}
-software-type = apache
-name = Apache
-

stack/lapp/instance-resilient.cfg.jinja2

+# vim: set ft=cfg:
+
+{% import 'parts' as parts %}
+{% import 'replicated' as replicated %}
+
+[buildout]
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+# += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
+parts +=
+  {{ parts.replicate("apache", "3") }}
+  publish-connection-informations
+
+{{ replicated.replicate("apache", "3", "apache-export", "apache-import") }}
+
+# Bubble up the parameters
+[request-apache]
+return = url ssh-public-key ssh-url notification-id ip url backend_url
+# XXX: hardcoded values
+config = domain number authorized-key notify ip-list namebase postgres1-computer-guid pbs-postgres1-computer-guid postgres2-computer-guid pbs-postgres2-computer-guid postgres3-computer-guid pbs-postgres3-computer-guid maarch-sql-data-file
+config-postgres1-computer-guid = ${slap-parameter:postgres1-computer-guid}
+config-pbs-postgres1-computer-guid = ${slap-parameter:pbs-postgres1-computer-guid}
+config-postgres2-computer-guid = ${slap-parameter:postgres2-computer-guid}
+config-pbs-postgres2-computer-guid = ${slap-parameter:pbs-postgres2-computer-guid}
+config-postgres3-computer-guid = ${slap-parameter:postgres3-computer-guid}
+config-pbs-postgres3-computer-guid = ${slap-parameter:pbs-postgres3-computer-guid}
+config-domain = ${slap-parameter:domain}
+config-maarch-sql-data-file = ${slap-parameter:maarch-sql-data-file}
+
+[publish-connection-informations]
+recipe = slapos.cookbook:publish
+backend_url = ${request-apache:connection-backend_url}
+url = ${request-apache:connection-url}
+
+[slap-parameter]
+# Default parameters for distributed deployment
+# I.e state "backup1 of postgres should go there, ..."
+# XXX-Cedric: Hardcoded number of backups. Should be dynamically generated.
+postgres1-computer-guid =
+pbs-postgres1-computer-guid =
+postgres2-computer-guid =
+pbs-postgres2-computer-guid =
+postgres3-computer-guid =
+pbs-postgres3-computer-guid =
+# XXX-Cedric: Hardcoded parameters. Should be dynamically generated.
+domain =
+# the following parameters are specific to maarch
+maarch-sql-data-file = 

stack/lapp/instance.cfg.in

@@ -9,13 +9,13 @@ offline = true
 
 [switch_softwaretype]
 recipe = slapos.cookbook:softwaretype
-default = ${instance-default-root:output}
-apache = ${instance-apache-php:output}
-resilient = ${template-resilient-lapp:rendered}
+default = ${instance-apache-php:output}
+resilient = ${instance-resilient:rendered}
 postgres = ${instance-postgres:output}
 postgres-import = ${instance-postgres-import:output}
 postgres-export = ${instance-postgres-export:output}
-apache-backup = ${instance-apache-backup:output}
+apache-import = ${instance-apache-import:output}
+apache-export = ${instance-apache-export:rendered}
 
 #frozen creates a syntax error, meaning it can keep its data.
 #It's dirty as hell, it needs to be replaced.

stack/lapp/postgres/instance-postgres-export.cfg.in

@@ -19,3 +19,8 @@ bin = $${postgres-instance:bin}
 pgdata-directory = $${postgres-instance:pgdata-directory}
 backup-directory = $${postgres-instance:backup-directory}
 dbname = $${postgres-instance:dbname}
+
+
+# Extends publish section with resilient parameters
+[urls]
+<= resilient-publish-connection-parameter

stack/lapp/template-resilient.cfg.in

-{% import 'parts' as parts %}
-{% import 'replicated' as replicated %}
-
-[buildout]
-
-extends =
-   {{templateapache}}
-
-# += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
-parts +=
-  {{ parts.replicate("postgres","3") }}
-  request-apache-backup-1
-  request-apache-backup-2
-
-  request-pull-backup-server-apache-1
-  request-pull-backup-server-apache-backup-1
-
-  request-pull-backup-server-apache-2
-  request-pull-backup-server-apache-backup-2
-
-  publish-connection-informations
-  apache-php
-  stunnel
-  certificate-authority
-  ca-stunnel
-  logrotate
-  logrotate-entry-apache
-  logrotate-entry-stunnel
-  cron
-  cron-entry-logrotate
-  dropbear-server
-  sshkeys-authority
-  dropbear-server-pbs-authorized-key
-
-  request-pull-backup-server
-
-{{ replicated.replicate("postgres", "3", "postgres-export", "postgres-import") }}
-
-
-[request-pull-backup-server]
-<= request-pbs-common
-name = PBS (Pull Backup Server)
-return = ssh-key notification-url feeds-url
-slave = false
-
-[sshkeys-directory]
-recipe = slapos.cookbook:mkdirectory
-requests = ${directory:sshkeys}/requests
-keys = ${directory:sshkeys}/keys
-
-[sshkeys-authority]
-recipe = slapos.cookbook:sshkeys_authority
-request-directory = ${sshkeys-directory:requests}
-keys-directory = ${sshkeys-directory:keys}
-wrapper = ${basedirectory:services}/sshkeys_authority
-keygen-binary = {{dropbear}}/bin/dropbearkey
-
-[sshkeys-dropbear]
-<= sshkeys-authority
-recipe = slapos.cookbook:sshkeys_authority.request
-name = dropbear
-type = rsa
-executable = ${dropbear-server:wrapper}
-public-key = ${dropbear-server:rsa-keyfile}.pub
-private-key = ${dropbear-server:rsa-keyfile}
-wrapper = ${basedirectory:services}/sshd
-
-[dropbear-server]
-recipe = slapos.cookbook:dropbear
-host = ${slap-network-information:global-ipv6}
-port = 2222
-home = ${directory:ssh}
-wrapper = ${rootdirectory:bin}/raw_sshd
-shell = ${rdiff-backup-server:wrapper}
-rsa-keyfile = ${directory:ssh}/server_key.rsa
-dropbear-binary = {{dropbear}}/sbin/dropbear
-
-[dropbear-server-pbs-authorized-key]
-<= dropbear-server
-recipe = slapos.cookbook:dropbear.add_authorized_key
-key = ${request-pull-backup-server:connection-ssh-key}
-
-[rdiff-backup-server]
-<= apache-php
-recipe = slapos.cookbook:pbs
-client = false
-path = ${apache-php:htdocs}
-wrapper = ${rootdirectory:bin}/rdiffbackup-server
-rdiffbackup-binary = {{buildout}}/rdiff-backup
-
-[request-apache-backup-1]
-<= slap-connection
-recipe = slapos.cookbook:request
-name = Apache Backup 1
-software-url = ${slap-connection:software-release-url}
-software-type = apache-backup
-return = url ssh-url ssh-public-key
-config = authorized-key proxy-url
-config-authorized-key = ${request-pull-backup-server:connection-ssh-key}
-config-proxy-url = ${publish-connection-informations:url}
-
-[request-apache-backup-2]
-<= slap-connection
-recipe = slapos.cookbook:request
-name = Apache Backup 2
-software-url = ${slap-connection:software-release-url}
-software-type = apache-backup
-return = url ssh-url ssh-public-key
-config = authorized-key proxy-url
-config-authorized-key = ${request-pull-backup-server:connection-ssh-key}
-config-proxy-url = ${publish-connection-informations:url}
-
-[request-pull-backup-server-apache-1]
-<= request-pbs-common
-name = PBS pulling from Apache 1
-config = url name type server-key notify notification-id frequency
-config-url = ssh://nobody@[${dropbear-server:host}]:${dropbear-server:port}/${rdiff-backup-server:path}
-config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-apache
-config-type = pull
-config-server-key = ${sshkeys-dropbear:public-key-value}
-config-notify = ${request-pull-backup-server:connection-notification-url}
-config-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-apache-pull
-config-frequency = 30 * * * *
-slave = true
-sla = instance_guid
-sla-instance_guid = ${request-pull-backup-server:instance_guid}
-
-[request-pull-backup-server-apache-2]
-<= request-pbs-common
-name = PBS pulling from Apache 2
-config = url name type server-key notify notification-id frequency
-config-url = ssh://nobody@[${dropbear-server:host}]:${dropbear-server:port}/${rdiff-backup-server:path}
-config-name = ${slap-connection:computer-id}-${slap-connection:partition-id}-apache
-config-type = pull
-config-server-key = ${sshkeys-dropbear:public-key-value}
-config-notify = ${request-pull-backup-server:connection-notification-url}
-config-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-apache-pull
-config-frequency = 30 * * * *
-slave = true
-sla = instance_guid
-sla-instance_guid = ${request-pull-backup-server:instance_guid}
-
-
-[request-pull-backup-server-apache-backup-1]
-<= request-pbs-common
-name = PBS pushing to ${request-apache-backup-1:name}
-config = url name type server-key on-notification
-config-url = ${request-apache-backup-1:connection-ssh-url}
-config-name = ${request-pull-backup-server-apache-1:config-name}
-config-type = push
-config-server-key = ${request-apache-backup-1:connection-ssh-public-key}
-config-on-notification = ${request-pull-backup-server:connection-feeds-url}${request-pull-backup-server-apache-1:config-notification-id}
-slave = true
-sla = instance_guid
-sla-instance_guid = ${request-pull-backup-server:instance_guid}
-
-[request-pull-backup-server-apache-backup-2]
-<= request-pbs-common
-name = PBS pushing to ${request-apache-backup-2:name}
-config = url name type server-key on-notification
-config-url = ${request-apache-backup-2:connection-ssh-url}
-config-name = ${request-pull-backup-server-apache-2:config-name}
-config-type = push
-config-server-key = ${request-apache-backup-2:connection-ssh-public-key}
-config-on-notification = ${request-pull-backup-server:connection-feeds-url}${request-pull-backup-server-apache-2:config-notification-id}
-slave = true
-sla = instance_guid
-sla-instance_guid = ${request-pull-backup-server:instance_guid}
-
-
-[directory]
-ssh = ${rootdirectory:etc}/ssh
-sshkeys = ${rootdirectory:srv}/sshkeys

stack/resilient/buildout.cfg

@@ -22,7 +22,7 @@ parts =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/pbsready.cfg.in
 output = ${buildout:directory}/pbsready.cfg
-md5sum = e602f6746cbe5a1da82b90097719c4a1
+md5sum = 9f4212a79f10bee8f6d75061943110e2
 mode = 0644
 
 [pbsready-import]
@@ -31,7 +31,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/pbsready-import.cfg.in
 output = ${buildout:directory}/pbsready-import.cfg
-md5sum = eda0c1574d8991f4f9e08e3707c2b04b
+md5sum = 1b1308fd39476d48b5ca13db48ea6dc9
 mode = 0644
 
 [pbsready-export]
@@ -40,7 +40,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/pbsready-export.cfg.in
 output = ${buildout:directory}/pbsready-export.cfg
-md5sum = dd56f9c74e580475a17a9afb1d220390
+md5sum = 5d9e20c436fd307e8e4ab224a9a65792
 mode = 0644
 
 [template-pull-backup]
@@ -53,7 +53,7 @@ mode = 0644
 [template-replicated]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/template-replicated.cfg.in
-md5sum = 63b5649f3cf1c9a77315382793d9593f
+md5sum = 9e20f283bf709c63c9c6692d5e1f8972
 mode = 0644
 destination = ${buildout:directory}/template-replicated.cfg.in
 

stack/resilient/pbsready-export.cfg.in

@@ -2,9 +2,10 @@
 
 extends = ${pbsready:output}
 
-parts += cron-entry-backup
+parts +=
+  cron-entry-backup
 
-[urls]
+[resilient-publish-connection-parameter]
 notification-id = http://[$${notifier:host}]:$${notifier:port}/get/$${notifier-exporter:name}
 
 [notifier-exporter]

stack/resilient/pbsready-import.cfg.in

@@ -2,9 +2,11 @@
 
 extends = ${pbsready:output}
 
-parts += import-on-notification
+parts +=
+  import-on-notification
+  resilient-publish-connection-parameter
 
-[urls]
+[resilient-publish-connection-parameter]
 notification-url = http://[$${notifier:host}]:$${notifier:port}/notify
 
 [import-on-notification]

stack/resilient/pbsready.cfg.in

 [buildout]
 
-parts +=
+parts =
   resiliency
-  urls
-  stunnel
-  certificate-authority
-  ca-stunnel
   logrotate
-  logrotate-entry-stunnel
   logrotate-entry-cron
   logrotate-entry-equeue
   cron
@@ -23,17 +18,110 @@ parts +=
 #--
 #-- Creation of all needed directories.
 
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+var = $${buildout:directory}/var
+srv = $${buildout:directory}/srv
+bin = $${buildout:directory}/bin
+
 [basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = $${rootdirectory:var}/log
+services = $${rootdirectory:etc}/service
+run = $${rootdirectory:var}/run
+script = $${rootdirectory:etc}/script
+backup = $${rootdirectory:srv}/backup
+promises = $${rootdirectory:etc}/promise
 services = $${rootdirectory:etc}/service
 cache = $${rootdirectory:var}/cache
 notifier = $${rootdirectory:etc}/notifier
 
 [directory]
+recipe = slapos.cookbook:mkdirectory
 backup = $${basedirectory:backup}/$${slap-parameter:namebase}
 ssh = $${rootdirectory:etc}/ssh/
 sshkeys = $${rootdirectory:srv}/sshkeys
 notifier-feeds = $${basedirectory:notifier}/feeds
 notifier-callbacks = $${basedirectory:notifier}/callbacks
+cron-entries = $${rootdirectory:etc}/cron.d
+crontabs = $${rootdirectory:etc}/crontabs
+cronstamps = $${rootdirectory:etc}/cronstamps
+logrotate-entries = $${rootdirectory:etc}/logrotate.d
+logrotate-backup = $${basedirectory:backup}/logrotate
+
+#----------------
+#--
+#-- Deploy cron.
+
+[cron]
+recipe = slapos.cookbook:cron
+dcrond-binary = ${dcron:location}/sbin/crond
+cron-entries = $${directory:cron-entries}
+crontabs = $${directory:crontabs}
+cronstamps = $${directory:cronstamps}
+catcher = $${cron-simplelogger:wrapper}
+binary = $${basedirectory:services}/crond
+
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = $${rootdirectory:bin}/cron_simplelogger
+log = $${basedirectory:log}/crond.log
+
+
+#----------------
+#--
+#-- Deploy logrotate.
+
+[cron-entry-logrotate]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+command = $${logrotate:wrapper}
+
+[logrotate]
+recipe = slapos.cookbook:logrotate
+# Binaries
+logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
+gzip-binary = ${gzip:location}/bin/gzip
+gunzip-binary = ${gzip:location}/bin/gunzip
+# Directories
+wrapper = $${rootdirectory:bin}/logrotate
+conf = $${rootdirectory:etc}/logrotate.conf
+logrotate-entries = $${directory:logrotate-entries}
+backup = $${directory:logrotate-backup}
+state-file = $${rootdirectory:srv}/logrotate.status
+
+[logrotate-entry-mariadb]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = mariadb
+log = $${mariadb:error-log}
+frequency = daily
+rotate-num = 30
+post = $${mariadb:logrotate-post}
+sharedscripts = true
+notifempty = true
+create = true
+
+[logrotate-entry-cron]
+<= logrotate
+recipe =slapos.cookbook:logrotate.d
+name = crond
+log = $${cron-simplelogger:log}
+frequency = daily
+rotate-num = 30
+notifempty = true
+create = true
+
+[logrotate-entry-equeue]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = equeue
+log = $${equeue:log}
+frequency = daily
+rotate-num = 30
 
 
 #----------------
@@ -56,10 +144,6 @@ etc = $${rootdirectory:etc}
 #--
 #-- Sets up an rdiff-backup server (with a dropbear server for ssh)
 
-[urls]
-ssh-public-key = $${sshkeys-dropbear:public-key-value}
-ssh-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path}
-
 [rdiff-backup-server]
 recipe = slapos.cookbook:pbs
 client = false
@@ -89,19 +173,11 @@ callbacks = $${directory:notifier-callbacks}
 id-file = $${rootdirectory:etc}/notifier.id
 equeue-socket = $${equeue:socket}
 host = $${slap-network-information:global-ipv6}
-port = 8080
+port = 65534
 wrapper = $${basedirectory:services}/notifier
 server-binary = ${buildout:bin-directory}/pubsubserver
 notifier-binary = ${buildout:bin-directory}/pubsubnotifier
 
-[logrotate-entry-equeue]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = equeue
-log = $${equeue:log}
-frequency = daily
-rotate-num = 30
-
 
 #----------------
 #--
@@ -150,4 +226,12 @@ recipe = slapos.cookbook:dropbear.add_authorized_key
 key = $${slap-parameter:authorized-key}
 
 
-
+#----------------
+#--
+#-- Conncetion informations to re-use.
+# XXX-Cedric: when "aggregation" system is done in libslap, directly publish.
+[resilient-publish-connection-parameter]
+recipe = slapos.cookbook:publish
+ssh-public-key = $${sshkeys-dropbear:public-key-value}
+ssh-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path}
+ip = $${slap-network-information:global-ipv6}

stack/resilient/template-replicated.cfg.in

@@ -2,16 +2,21 @@
 
 ## Tells the Backupable recipe that we want a backup
 [resilient]
+recipe = slapos.cookbook:request
 config-namebase = {{namebase}}
+software-url = ${slap-connection:software-release-url}
 
 ## Every request is double to provide the 3 IPs.
+## First, we request with ip-list parameter hardcoded.
+## Then, we request the same thing without this.
+## XXX-Cedric: is it useful?
 [request-{{namebase}}]
 <= resilient
    slap-connection
    {{heriteLeader}}
 software-type = {{typeexport}}
 name = {{namebase}}0
-return = url ssh-public-key ssh-url notification-id ip
+return = ssh-public-key ssh-url notification-id ip
 
 config = number authorized-key notify ip-list namebase
 config-number = 0
@@ -19,6 +24,7 @@ config-authorized-key = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{na
 config-notify = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}-{{id}}:connection-notification-url}{% endfor %}
 config-ip-list =
 
+
 {% for id in range(1,nbbackup|int) %}
 
 [request-{{namebase}}-pseudo-replicating-{{id}}]
@@ -30,7 +36,7 @@ name = {{namebase}}{{id}}
 
 software-url = ${slap-connection:software-release-url}
 software-type = {{typeimport}}
-return = url ssh-public-key ssh-url notification-url ip
+return = ssh-public-key ssh-url notification-url ip
 
 pbs-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-push
 
@@ -40,49 +46,23 @@ config-authorized-key = ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}
 config-on-notification = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}${:pbs-notification-id}
 config-ip-list =
 
+sla = computer_guid
+sla-computer_guid = ${slap-parameter:{{namebase}}{{id}}-computer-guid}
+
+
 {% endfor %}
 
 [iplist]
 config-ip-list = ${request-{{namebase}}:connection-ip}{% for j in range(1,nbbackup|int) %} ${request-{{namebase}}-pseudo-replicating-{{j}}:connection-ip}{% endfor %}
 
 [request-{{namebase}}-2]
-<= resilient
-   slap-connection
+<= request-{{namebase}}
    iplist
-   {{heriteLeader}}
-
-recipe = slapos.cookbook:request
-name = {{namebase}}0
-
-software-url = ${slap-connection:software-release-url}
-software-type = {{typeexport}}
-return = url ssh-public-key ssh-url notification-id ip
-
-config = number authorized-key notify ip-list namebase
-config-number = 0
-config-authorized-key = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}{% endfor %}
-config-notify = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}-{{id}}:connection-notification-url}{% endfor %}
 
 {% for id in range(1,nbbackup|int) %}
 [request-{{namebase}}-pseudo-replicating-{{id}}-2]
-<= slap-connection
-   resilient
+<= request-{{namebase}}-pseudo-replicating-{{id}}
    iplist
-   {{heriteBackup}}
-
-recipe = slapos.cookbook:request
-name = {{namebase}}{{id}}
-
-software-url = ${slap-connection:software-release-url}
-software-type = {{typeimport}}
-return = url ssh-public-key ssh-url notification-url
-
-pbs-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-push
-
-config = number authorized-key on-notification ip-list namebase
-config-number = {{id}}
-config-authorized-key = ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}
-config-on-notification = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}${:pbs-notification-id}
 
 {% endfor %}
 
@@ -110,6 +90,8 @@ software-type = pull-backup
 name = PBS ({{namebase}} / {{id}})
 return = ssh-key notification-url feeds-url
 slave = false
+sla = computer_guid
+sla-computer_guid = ${slap-parameter:pbs-{{namebase}}{{id}}-computer-guid}
 
 [request-pull-backup-server-{{namebase}}-{{id}}]
 <= request-pbs-common
@@ -144,4 +126,12 @@ sla = instance_guid
 sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}
 {% endfor %}
 
+[slap-parameter]
+# Default parameters for distributed deployment
+# I.e state "backup1 of maria should go there, ..."
+{% for id in range(1,nbbackup|int) %}
+{{namebase}}{{id}}-computer-guid =
+pbs-{{namebase}}{{id}}-computer-guid =
+{% endfor %}
+
 {% endmacro %}

stack/slapos.cfg

@@ -22,6 +22,7 @@ exec-sitecustomize = false
 find-links +=
   http://www.nexedi.org/static/packages/source/slapos.buildout/
   http://www.nexedi.org/static/packages/source/
+  http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
 
 # Use only quite well working sites.
 allow-hosts +=
@@ -68,7 +69,8 @@ eggs =
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.6.0-dev-SlapOS-010
-
+# Use xz-friendly hexagonit.recipe.download
+hexagonit.recipe.download = 1.6nxd002
 # zc.recipe.egg 2.0.0a is buggy
 zc.recipe.egg = 1.3.2