Merge remote-tracking branch 'origin/erp5-z2.13' into erp5-cluster-z2.13

Conflicts: stack/erp5/buildout.cfg stack/erp5/instance-memcached.cfg.in

Merge remote-tracking branch 'origin/erp5-z2.13' into erp5-cluster-z2.13
Conflicts: stack/erp5/buildout.cfg stack/erp5/instance-memcached.cfg.in
153a131c · Sebastien Robin · d85a68e1 · 0d105d0e · 153a131c · 153a131c
Commit 153a131c authored Apr 23, 2013 by Sebastien Robin
241 changed files
--- a/CHANGES.txt
+++ b/CHANGES.txt
 Changes
 =======

+0.77.1 (2013-04-18)
+-------------------
+
+ * Re-release of 0.77.0.
+
+0.77.0 (2013-04-18)
+-------------------
+
+ * Allow to pass extra parameters when creating simple wrapper. [Sebastien Robin]
+ * Apache frontend: Append all rewrite module options to http as well. [Cedric de Saint Martin]
+ * Apache frontend: Add https-only support. [Cedric de Saint Martin]
+ * Apache frontend: make logrotate work by using "generic" component. [Cedric de Saint Martin]
+
+0.76.0 (2013-04-03)
+-------------------
+
+ * Add 'generic' phpconfigure recipe, allowing to configure any PHP-based app. [Cedric de Saint Martin]
+ * apache_frontend: Have more useful access_log in apache frontend. [Cedric de Saint Martin]
+ * apache_frontend: Add "SSLProxyEngine On" to http apache frontend vhost to be able to proxy https -> http. [Cedric de Saint Martin]
+ * Add first preliminary version of nginx-based reverse proxy. [Cedric de Saint Martin]
+ * Request-optional is not verbose anymore (again) if it failed. [Cedric de Saint Martin]
+ * Add possibility to fetch web ip and port from apache recipe. [Cedric de Saint Martin]
+
+0.75.0 (2013-03-26)
+-------------------
+
+ * Add backward compatibility about Partition.getInstanceGuid() in request.py. [Cedric de Saint Martin]
+ * request.py: Don't crash if resource is not ready. [Cedric de Saint Martin]
+ * Use memory-based kumofs instead of memcached to have no limitation for key length and data size. [Kazuhiko Shiozaki]
+ * Postgres: allow slapuser# to connect as postgres user. [Marco Mariani]
+ * apache_frontend: Sanitize inputs, disable Varnish cache, don't touch to custom file if already present. [Cedric de Saint Martin]
+ * Resiliency: simpler, more robust PBS recipe and promise. [Marco Mariani]
+ * Add helper method to set "location" parameter in librecipe. [Cedric de Saint Martin]
+ * Add download helper function in librecipe. [Cedric de Saint Martin]
+ * Update wrapper recipe to make it simpler and more dev-friendly. [Cedric de Saint Martin]
+ * Add configurationfile recipe. [Cedric de Saint Martin]
+ * Add request-edge recipe. [Cedric de Saint Martin]
+ * Add publishsection recipe. [Cedric de Saint Martin]
+ * Add match support for promise check_page_content. [Cedric de Saint Martin]
+
 0.74.0 (2013-03-05)
 -------------------


--- a/component/6tunnel/buildout.cfg
+++ b/component/6tunnel/buildout.cfg
@@ -8,7 +8,7 @@ extends =
  ../automake/buildout.cfg

 [6tunnel]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://toxygen.net/6tunnel/6tunnel-0.11rc2.tar.gz
 md5sum = 74e02d4f0704b3083a01feda66033449
 configure-command =

--- a/component/alsa/buildout.cfg
+++ b/component/alsa/buildout.cfg
@@ -4,7 +4,7 @@ parts =

 [alsa]
 # Contains libasound
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.24.1.tar.bz2
 md5sum = 7cc05f25e1d5b65da8fb3fdcd540f226
 configure-options =

--- a/component/apache-perl/buildout.cfg
+++ b/component/apache-perl/buildout.cfg
@@ -8,7 +8,7 @@ extends =

 [apache-perl]
 # Note: Shall react on each build of apache and reinstall itself
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://perl.apache.org/dist/mod_perl-2.0.5.tar.gz
 md5sum = 03d01d135a122bd8cebd0cd5b185d674
 configure-command =

--- a/component/apache-php/buildout.cfg
+++ b/component/apache-php/buildout.cfg
@@ -20,7 +20,7 @@ extends =

 [apache-php]
 # Note: Shall react on each build of apache and reinstall itself
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${mariadb:version}
 url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
@@ -68,7 +68,7 @@ environment =

 [apache-php-postgres]
 # Note: Shall react on each build of apache and reinstall itself
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
   ${postgresql:url}
 url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
@@ -113,11 +113,11 @@ environment =


 [libmcrypt]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/mcrypt/files/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2/download
 md5sum = c4f491dd411a09e9de3b8702ea6f73eb

 [xml-rpc]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/phpxmlrpc/phpxmlrpc/2.2.2/xmlrpc-2.2.2.tar.gz
 md5sum = 59a644c636c6d98267d0c99b406ae9e8
--- a/component/apache/buildout.cfg
+++ b/component/apache/buildout.cfg
@@ -27,7 +27,7 @@ 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
+recipe = slapos.recipe.cmmi
 depends =
  ${gdbm:version}
 version = 2.4.4
@@ -101,7 +101,7 @@ md5sum = 4f074f035d3b37f3f3e71cd9616440f3

 [apache-antiloris]
 # Note: Shall react on each build of apache and reinstall itself
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
 md5sum = 66862bf10e9be3a023e475604a28a0b4
 patch-options = -p0
@@ -119,7 +119,7 @@ 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
+recipe = slapos.recipe.cmmi
 url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.24.tar.gz
 md5sum = 64a3392018ad60583209a16d728180d3
 patch-options = -p1
@@ -179,7 +179,7 @@ environment =

 [apache-antiloris-apache-2.2]
 # Note: Shall react on each build of apache and reinstall itself
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
 md5sum = 66862bf10e9be3a023e475604a28a0b4
 configure-command = ${apache-2.2:location}/bin/apxs

--- a/component/aspell/buildout.cfg
+++ b/component/aspell/buildout.cfg
@@ -3,7 +3,7 @@ parts =
  aspell
  aspell-en-dictonary

-extends = 
+extends =
  ../ncurses/buildout.cfg

 [aspell-common-dictionary]
@@ -14,12 +14,19 @@ update-command = ${:command}
 stop-on-error = yes

 [aspell]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
+revision = 1
 url = http://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz
 md5sum = e66a9c9af6a60dc46134fdacf6ce97d7
+environment =
+  CPPFLAGS=-I${ncurses:location}/include
+  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib

 [aspell-en-dictionary]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2
 md5sum = beba5e8f3afd3ed1644653bb685b2dfb
-configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin
\ No newline at end of file
+configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin
+depends =
+  ${aspell:url}
+  ${aspell:revision}
--- a/component/attr/buildout.cfg
+++ b/component/attr/buildout.cfg
@@ -3,7 +3,7 @@
 parts = attr

 [attr]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.igh.cnrs.fr/pub/nongnu/attr/attr-2.4.46.src.tar.gz
 md5sum = db557c17fdfa4f785333ecda08654010
 configure-options =

--- a/component/autoconf/buildout.cfg
+++ b/component/autoconf/buildout.cfg
@@ -6,7 +6,7 @@ parts =
  autoconf

 [autoconf]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
 md5sum = 82d05e03b93e45f5a39b828dc9c6c29b
 environment =

--- a/component/automake/buildout.cfg
+++ b/component/automake/buildout.cfg
@@ -7,7 +7,7 @@ parts =
  automake

 [automake]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 md5sum = 140e084223bf463a24c1a28427c6aec7
 url = http://ftp.gnu.org/gnu/automake/automake-1.12.6.tar.xz
 environment =

--- a/component/bash/buildout.cfg
+++ b/component/bash/buildout.cfg
@@ -3,6 +3,6 @@ parts =
  bash

 [bash]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnu.org/gnu/bash/bash-4.2.tar.gz
 md5sum = 3fb927c7c33022f1c327f14a81c0d4b0
--- a/component/binutils/buildout.cfg
+++ b/component/binutils/buildout.cfg
@@ -3,6 +3,6 @@ parts =
  binutils

 [binutils]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/binutils/binutils-2.21.1.tar.bz2
 md5sum = bde820eac53fa3a8d8696667418557ad
--- a/component/bison/buildout.cfg
+++ b/component/bison/buildout.cfg
@@ -17,7 +17,7 @@ patch-options = -p1
 patches =
  ${bison-drop.gets.patch:location}/${bison-drop.gets.patch:filename}

-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/bison/bison-2.5.tar.bz2
 md5sum = 9dba20116b13fc61a0846b0058fbe004
 environment =

--- a/component/bzip2/buildout.cfg
+++ b/component/bzip2/buildout.cfg
@@ -10,7 +10,7 @@ download-only = true
 filename = bzip2-hooks.py

 [bzip2]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
 md5sum = 00b516f4704d4a7cb50a1d97e6e8e15b
 configure-command = true

--- a/component/ca-certificates/buildout.cfg
+++ b/component/ca-certificates/buildout.cfg
@@ -17,7 +17,7 @@ filename = ${:_buildout_section_name_}
 download-only = true

 [ca-certificates]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 20130119
 url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.gz
 patch-binary = ${patch:location}/bin/patch

--- a/component/ccache/buildout.cfg
+++ b/component/ccache/buildout.cfg
@@ -2,7 +2,7 @@
 parts = ccache

 [ccache-common]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi

 [ccache]
 <= ccache-3.1

--- a/component/cclient/buildout.cfg
+++ b/component/cclient/buildout.cfg
@@ -17,7 +17,7 @@ md5sum = 42c77fdd5d7a976fc302b93aadb3da98
 filename = imap-2007f.patch

 [cclient]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz
 md5sum = 2126fd125ea26b73b20f01fcd5940369
 configure-command = true

--- a/component/cloud9/buildout.cfg
+++ b/component/cloud9/buildout.cfg
@@ -51,7 +51,7 @@ md5sum = 5dc8cc28447ed3747b8a53c768d872aa
 # NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location}
 recipe = plone.recipe.command
 stop-on-error = true
-commit = 9158bbf9e886e3b96e91239249aca66e420aa8d1
+commit = f7d102bc225c922f116d2cea52a746d64343ea59
 repository = https://github.com/ajaxorg/cloud9.git
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 environment = export GIT_SSL_NO_VERIFY=true; export PATH=${git:location}/bin:${nodejs:location}/bin:${node-sm:location}/node_modules/sm/bin:$PATH; export CPPFLAGS="-I${libxml2:location}/include -I${nodejs:location}/include"; export LDFLAGS="-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib"; export HOME=${:location};

--- a/component/cloudooo/buildout.cfg
+++ b/component/cloudooo/buildout.cfg
@@ -22,7 +22,7 @@ git-executable = ${git:location}/bin/git

 [cloudooo]
 recipe = zc.recipe.egg
-python = python2.6
+python = python2.7
 extra-paths = ${cloudooo-repository:location}
 eggs =
  ${lxml-python:egg}

--- a/component/cmake/buildout.cfg
+++ b/component/cmake/buildout.cfg
 [buildout]
+extends =
+  ../ncurses/buildout.cfg
+
 parts =
  cmake

 [cmake]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz
 md5sum = 097278785da7182ec0aea8769d06860c
+environment =
+  CMAKE_INCLUDE_PATH=${ncurses:location}/include
+  CMAKE_LIBRARY_PATH=${ncurses:location}/lib
--- a/component/coreutils/buildout.cfg
+++ b/component/coreutils/buildout.cfg
@@ -5,9 +5,9 @@ parts =
  coreutils

 [coreutils]
-recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.20.tar.xz
-md5sum = 3d69af8f561fce512538a9fe85f147ff
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.21.tar.xz
+md5sum = 065ba41828644eca5dd8163446de5d64
 configure-options =
  --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-install-program=tr,basename,uname,cat,cp,ls
 environment =

--- a/component/corosync/buildout.cfg
+++ b/component/corosync/buildout.cfg
@@ -5,7 +5,7 @@ parts =
  corocosync

 [corosync]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp:downloads@corosync.org/downloads/corosync-1.3.1/corosync-1.3.1.tar.gz
 md5sum = c58459a009a3a9d0b9c00e276a190d90
 environment =

--- a/component/couchdb/buildout.cfg
+++ b/component/couchdb/buildout.cfg
@@ -10,7 +10,7 @@ extends =
 parts = couchdb

 [couchdb]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://mir2.ovh.net/ftp.apache.org/dist//couchdb/1.1.1/apache-couchdb-1.1.1.tar.gz
 md5sum = cd126219b9cb69a4c521abd6960807a6
 configure-options =

--- a/component/cpio/buildout.cfg
+++ b/component/cpio/buildout.cfg
@@ -15,6 +15,6 @@ virtual-depends =
 patch-options = -p1
 patches =
  ${cpio-drop.gets.patch:location}/${cpio-drop.gets.patch:filename}
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/cpio/cpio-2.11.tar.bz2
 md5sum = 20fc912915c629e809f80b96b2e75d7d
--- a/component/cuneiform/buildout.cfg
+++ b/component/cuneiform/buildout.cfg
@@ -5,7 +5,7 @@ extends =
 parts = cuneiform

 [cuneiform]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://launchpad.net/cuneiform-linux/1.0/1.0/+download/cuneiform-linux-1.0.0.tar.bz2
 md5sum = 785232ffffad7d82446fbac08a1c3ef9
 location = ${buildout:parts-directory}/${:_buildout_section_name_}

--- a/component/curl/buildout.cfg
+++ b/component/curl/buildout.cfg
@@ -10,9 +10,9 @@ parts =
  curl

 [curl]
-recipe = hexagonit.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.29.0.tar.bz2
-md5sum = fa5f37f38a8042020e292ce7ec5341ce
+recipe = slapos.recipe.cmmi
+url = http://curl.haxx.se/download/curl-7.30.0.tar.bz2
+md5sum = 0db5ec03a5001b42a2edc03bf63b5ceb
 configure-options =
  --disable-static
  --disable-ldap
@@ -27,10 +27,12 @@ configure-options =
  --disable-gopher
  --enable-ipv6
  --disable-sspi
+  --without-gnutls
  --with-ssl=${openssl:location}
  --with-zlib=${zlib:location}
  --without-nss
  --without-libssh2
+  --without-librtmp
  --without-libidn

 environment =

--- a/component/cyrus-sasl/buildout.cfg
+++ b/component/cyrus-sasl/buildout.cfg
@@ -5,7 +5,7 @@ extends =
  ../zlib/buildout.cfg

 [cyrus-sasl]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
 md5sum = a7f4e5e559a0e37b3ffc438c9456e425


--- a/component/dash/buildout.cfg
+++ b/component/dash/buildout.cfg
@@ -3,7 +3,7 @@
 parts = dash

 [dash]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.7.tar.gz
 md5sum = f6cedb10ae7258adb5ab17a10ae80d51
 configure-options =

--- a/component/dbus/buildout.cfg
+++ b/component/dbus/buildout.cfg
@@ -8,7 +8,7 @@ parts =
  dbus

 [dbus]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://dbus.freedesktop.org/releases/dbus/dbus-1.4.10.tar.gz
 md5sum = 402a2f8102bedbe236e2891b2b0f31c2
 configure-options = 
@@ -20,7 +20,7 @@ environment =
  LDFLAGS=-L${libexpat:location}/lib

 [dbus-glib]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.94.tar.gz
 md5sum = e1f1506a6f4941e67bffd614b1ad5af6
 environment =

--- a/component/dcron/buildout.cfg
+++ b/component/dcron/buildout.cfg
@@ -9,7 +9,7 @@ filename = dcron-4.4.noroot.no.globals.patch
 download-only = true

 [dcron]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.jimpryor.net/linux/releases/dcron-4.4.tar.gz
 md5sum = 02d848ba043a9df5bf2102a9f4bc04bd
 configure-command = true

--- a/component/dropbear/buildout.cfg
+++ b/component/dropbear/buildout.cfg
@@ -40,7 +40,7 @@ filename = dropbear-0.53.1-static_build_fix.patch
 download-only = true

 [dropbear]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 md5sum = 0284ea239083f04c8b874e08e1aca243
 # XXX: We still use an old version of dropbear instead of the last one
 #      in order have all patches working.

--- a/component/erlang/buildout.cfg
+++ b/component/erlang/buildout.cfg
@@ -8,7 +8,7 @@ extends =
 parts = erlang

 [erlang]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.erlang.org/download/otp_src_R14B04.tar.gz
 md5sum = 4b469729f103f52702bfb1fb24529dc0
 configure-options =

--- a/component/fastjar/buildout.cfg
+++ b/component/fastjar/buildout.cfg
@@ -4,7 +4,7 @@ extends =
  ../zlib/buildout.cfg

 [fastjar]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/fastjar/files/fastjar/0.94/fastjar-0.94.tar.gz/download
 md5sum = 14d4bdfac236e347d806c6743dba48c6
 environment =

--- a/component/ffmpeg/buildout.cfg
+++ b/component/ffmpeg/buildout.cfg
@@ -12,14 +12,14 @@ parts =
 <= ffmpeg-0.8

 [libogg]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://downloads.xiph.org/releases/ogg/libogg-1.2.2.tar.gz
 md5sum = 5a9fcabc9a1b7c6f1cd75ddc78f36c56
 configure-options =
  --disable-static

 [libvorbis]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.bz2
 md5sum = 798a4211221073c1409f26eac4567e8b
 configure-options =
@@ -29,7 +29,7 @@ environment =
  PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig

 [libtheora]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
 md5sum = 292ab65cedd5021d6b7ddd117e07cd8e
 configure-options =
@@ -39,11 +39,11 @@ environment =
  PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libvorbis:location}/lib/pkgconfig

 [yasm]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz

 [libvpx]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://webm.googlecode.com/files/libvpx-v0.9.6.tar.bz2
 md5sum = 383f3f07a76099682abb43f79b692b72
 configure-options = 
@@ -52,7 +52,7 @@ environment =
  PATH=${yasm:location}/bin:%(PATH)s

 [libx264]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20111005-2245-stable.tar.bz2
 md5sum = f86260b2ea6d6cb5186937c9363891d7
 configure-options =
@@ -62,7 +62,7 @@ environment =
  PATH=${yasm:location}/bin:%(PATH)s

 [lame]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/lame/lame-3.98.4.tar.gz
 md5sum = 8e9866ad6b570c6c95c8cba48060473f
 configure-options =
@@ -70,14 +70,14 @@ configure-options =
  --disable-gtktest

 [opencore-amr]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/opencore-amr/opencore-amr/opencore-amr-0.1.2.tar.gz
 md5sum = 8e8b8b253eb046340ff7b6bf7a6ccd3e
 configure-options =
  --disable-static

 [ffmpeg-0.8]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ffmpeg.org/releases/ffmpeg-0.8.5.tar.bz2
 md5sum = 726877b19ece7ea64def8b7e6727e182
 configure-options = 

--- a/component/file/buildout.cfg
+++ b/component/file/buildout.cfg
@@ -7,7 +7,7 @@ extends =
  ../zlib/buildout.cfg

 [file]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.astron.com/pub/file/file-5.11.tar.gz
 md5sum = 16a407bd66d6c7a832f3a5c0d609c27b
 configure-options =

--- a/component/flare/buildout.cfg
+++ b/component/flare/buildout.cfg
@@ -7,7 +7,7 @@ parts =
  flare

 [flare]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://labs.gree.jp/data/source/flare-1.0.9.tgz
 md5sum = e59ccce1ba29e7edf6f665561678d5c8
 configure-options =

--- a/component/flex/buildout.cfg
+++ b/component/flex/buildout.cfg
@@ -5,7 +5,7 @@ parts =
  flex

 [flex]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/flex/flex/flex-2.5.35/flex-2.5.35.tar.gz
 md5sum = 201d3f38758d95436cbc64903386de0b
 environment =

--- a/component/fontconfig/buildout.cfg
+++ b/component/fontconfig/buildout.cfg
@@ -12,7 +12,7 @@ parts =
  fontconfig

 [fontconfig]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 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?

--- a/component/freetype/buildout.cfg
+++ b/component/freetype/buildout.cfg
@@ -10,7 +10,7 @@ parts =
  freetype

 [freetype]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.11.tar.bz2
 md5sum = b93435488942486c8d0ca22e8f768034
 configure-options =

--- a/component/garbage-collector/buildout.cfg
+++ b/component/garbage-collector/buildout.cfg
@@ -2,7 +2,7 @@
 parts = garbage-collector

 [garbage-collector]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 md5sum = 2ff9924c7249ef7f736ecfe6f08f3f9b
 url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.1.tar.gz
 configure-options =

--- a/component/gcc/buildout.cfg
+++ b/component/gcc/buildout.cfg
@@ -10,7 +10,7 @@ parts =
  gcc

 [mpfr]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.mpfr.org/mpfr-3.0.1/mpfr-3.0.1.tar.bz2
 md5sum = bfbecb2eacb6d48432ead5cfc3f7390a
 configure-options =
@@ -20,7 +20,7 @@ environment =
  LDFLAGS=-Wl,-rpath=${gmp:location}/lib

 [mpc]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.multiprecision.org/mpc/download/mpc-0.9.tar.gz
 md5sum = 0d6acab8d214bd7d1fbbc593e83dd00d
 configure-options =
@@ -31,7 +31,7 @@ environment =
  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib

 [ppl]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 # we should use version 0.10.x for gcc-4.5
 url = http://www.cs.unipr.it/ppl/Download/ftp/releases/0.10.2/ppl-0.10.2.tar.bz2
 md5sum = 5667111f53150618b0fa522ffc53fc3e
@@ -44,7 +44,7 @@ environment =
  LDFLAGS=-Wl,-rpath=${gmp:location}/lib

 [cloog-ppl]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.9.tar.gz
 md5sum = 806e001d1b1a6b130069ff6274900af5
 configure-options =
@@ -78,7 +78,7 @@ download-only = true
 hack-revision = ${gcc-interconnection-workaround:hack-revision}
 depends =
  ${gcc-download:location}
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 path = ${gcc-source:location}
 md5sum = bb3265edf0fa7543e50cedb93e04e427
 patches =
@@ -86,7 +86,7 @@ patches =
 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
+# as slapos.recipe.cmmi is using shell expansion in subproceses
 # backticks are working
 configure-options =
  --disable-bootstrap

--- a/component/gdbm/buildout.cfg
+++ b/component/gdbm/buildout.cfg
@@ -3,7 +3,7 @@ parts =
  gdbm

 [gdbm]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 1.10
 url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
 md5sum = 88770493c2559dc80b561293e39d3570

--- a/component/gettext/buildout.cfg
+++ b/component/gettext/buildout.cfg
@@ -7,9 +7,9 @@ extends =
  ../zlib/buildout.cfg

 [gettext]
-recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.2.tar.gz
-md5sum = 0c86e5af70c195ab8bd651d17d783928
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.2.1.tar.gz
+md5sum = 034c8103b14654ebd300fadac44d6f14

 configure-options =
  --disable-static

--- a/component/ghostscript/buildout.cfg
+++ b/component/ghostscript/buildout.cfg
@@ -8,7 +8,7 @@ extends =
 parts = ghostscript

 [ghostscript-common]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${libtiff:version}
 configure-options =

--- a/component/giflib/buildout.cfg
+++ b/component/giflib/buildout.cfg
@@ -3,7 +3,7 @@ parts =
  giflib

 [giflib]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/giflib/giflib-4.2.0.tar.bz2?download
 md5sum = 711ad48551ee14db7c200b5f402df849
 configure-options =

--- a/component/git/buildout.cfg
+++ b/component/git/buildout.cfg
@@ -11,7 +11,7 @@ parts =
  git

 [git]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://git-core.googlecode.com/files/git-1.7.12.tar.gz
 md5sum = ceb1a6b17a3e33bbc70eadf8fce5876c
 configure-options =

--- a/component/glib/buildout.cfg
+++ b/component/glib/buildout.cfg
@@ -4,7 +4,7 @@ extends =
  ../zlib/buildout.cfg

 [glib]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.8.tar.bz2
 md5sum = 789e7520f71c6a4bf08bc683ec764d24
 configure-options =

--- a/component/gmp/buildout.cfg
+++ b/component/gmp/buildout.cfg
@@ -6,12 +6,12 @@ parts =
  gmp

 [gmp]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 # we should use version 4.x for ppl-0.10
 url = ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2
 md5sum = dd60683d7057917e34630b4a787932e8
 # GMP does not correctly detect achitecture so it have to be given
-# as hexagonit.recipe.cmmi is using shell expansion in subproceses
+# as slapos.recipe.cmmi is using shell expansion in subproceses
 # backticks are working
 configure-options =
  --build=`uname -m`-linux

--- a/component/gnutls/buildout.cfg
+++ b/component/gnutls/buildout.cfg
@@ -7,12 +7,12 @@ extends =
 parts = gnutls

 [gpg-error]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.gz
 md5sum = 7c2710ef439f82ac429b88fec88e9a4c

 [gcrypt]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.gz
 md5sum = 78f8f8bec4580f75b25816f7896d0389
 configure-options =
@@ -23,7 +23,7 @@ environment =

 [gnutls]
 # XXX-Cedric : update to latest gnutls
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnutls.org/gcrypt/gnutls/v2.8/gnutls-2.8.6.tar.bz2
 md5sum = eb0a6d7d3cb9ac684d971c14f9f6d3ba
 configure-options =

--- a/component/graphviz/buildout.cfg
+++ b/component/graphviz/buildout.cfg
@@ -13,7 +13,7 @@ extends =
  ../zlib/buildout.cfg

 [graphviz]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.28.0.tar.gz
 md5sum = 8d26c1171f30ca3b1dc1b429f7937e58
 configure-options =

--- a/component/grep/buildout.cfg
+++ b/component/grep/buildout.cfg
@@ -6,7 +6,7 @@ parts =
  grep

 [grep]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/grep/grep-2.14.tar.xz
 md5sum = d4a3f03849d1e17ce56ab76aa5a24cab
 environment =

--- a/component/groff/buildout.cfg
+++ b/component/groff/buildout.cfg
@@ -3,7 +3,7 @@ parts =
  groff

 [groff]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/groff/groff-1.21.tar.gz
 md5sum = 8b8cd29385b97616a0f0d96d0951c5bf
 configure-options =

--- a/component/groonga/buildout.cfg
+++ b/component/groonga/buildout.cfg
@@ -10,10 +10,10 @@ extends =
  ../zlib/buildout.cfg

 [groonga]
-recipe = hexagonit.recipe.cmmi
-version = 3.0.1
+recipe = slapos.recipe.cmmi
+version = 3.0.2
 url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
-md5sum = fd03bb14a04e7c696151b5673e408701
+md5sum = b17934ef2589a4e261ed0d99aec713eb
 configure-options =
  --disable-static
  --disable-glibtest
@@ -26,10 +26,10 @@ environment =
  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib

 [groonga-normalizer-mysql]
-recipe = hexagonit.recipe.cmmi
-version = 1.0.1
+recipe = slapos.recipe.cmmi
+version = 1.0.2
 url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz
-md5sum = 93239c856f2e4768562506d440cb4c7d
+md5sum = 782111599dcba5023beb698dc5ea514a
 location = ${groonga:location}
 depends =
  ${groonga:version}

--- a/component/gtk-2/buildout.cfg
+++ b/component/gtk-2/buildout.cfg
@@ -15,7 +15,7 @@ parts =
  gtk-2

 [cairo]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://cairographics.org/releases/cairo-1.10.2.tar.gz
 md5sum = f101a9e88b783337b20b2e26dfd26d5f
 configure-options = 
@@ -29,7 +29,7 @@ environment =
  LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib

 [pango]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/pango/1.29/pango-1.29.3.tar.bz2
 md5sum = be4e3891353fae6b62a6f8d7689c4266
 configure-options = 
@@ -43,7 +43,7 @@ environment =
  LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib

 [gdk-pixbuf]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.0.tar.bz2
 md5sum = d8ece3a4ade4a91c768328620e473ab8
 configure-options = 
@@ -57,7 +57,7 @@ environment =
  LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib
  
 [atk]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/atk/2.0/atk-2.0.1.tar.bz2
 md5sum = 87f20b78deaedef858ac54358c0786b1
 environment = 
@@ -67,7 +67,7 @@ environment =
  LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib

 [gtk-2]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.6.tar.bz2
 md5sum = 421100f6597e613234f8dead6091a9fe
 configure-options = 

--- a/component/gzip/buildout.cfg
+++ b/component/gzip/buildout.cfg
@@ -5,7 +5,7 @@ parts =
  gzip

 [gzip]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.5.tar.xz
 md5sum = 2a431e169b6f62f7332ef6d47cc53bae
 environment =

--- a/component/haproxy/buildout.cfg
+++ b/component/haproxy/buildout.cfg
@@ -8,9 +8,9 @@ extends =
 parts = haproxy

 [haproxy]
-recipe = hexagonit.recipe.cmmi
-url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.22.tar.gz
-md5sum = a0b007c76f6a78524f3b3dd5e704979c
+recipe = slapos.recipe.cmmi
+url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.23.tar.gz
+md5sum = 6535d5e58037ada4b58b439cebe03c79
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".

--- a/component/icu/buildout.cfg
+++ b/component/icu/buildout.cfg
@@ -3,7 +3,7 @@
 parts = icu4c

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

--- a/component/imagemagick/buildout.cfg
+++ b/component/imagemagick/buildout.cfg
@@ -30,7 +30,7 @@ download-only = true
 filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch

 [imagemagick]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.vim.org/ImageMagick/ImageMagick-6.8.2-6.tar.xz
 md5sum = ee01558201041a9978dd14b1db946ce8
 depends =

--- a/component/intltool/buildout.cfg
+++ b/component/intltool/buildout.cfg
@@ -8,7 +8,7 @@ parts =
  intltool

 [intltool]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz
 md5sum = d6c91bf06681919ccfdf3624035b75dc
 depends =

--- a/component/jasper/buildout.cfg
+++ b/component/jasper/buildout.cfg
@@ -5,7 +5,7 @@ parts =
  jasper

 [jasper]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip
 md5sum = a342b2b4495b3e1394e161eb5d85d754
 # jasper configure script is not executable by default

--- a/component/jbigkit/buildout.cfg
+++ b/component/jbigkit/buildout.cfg
@@ -19,7 +19,7 @@ filename = jbigkit-2.0-build.patch
 md5sum = e974958e9331735c07478e9c2dde8795

 [jbigkit]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-2.0.tar.gz
 md5sum = 3dd87f605abb1a97a22dc79d8b3e8f6c
 patch-options =

--- a/component/kumo/buildout.cfg
+++ b/component/kumo/buildout.cfg
@@ -30,6 +30,7 @@ md5sum = 46148e9536222d0ad2ef36777c55714d
 patches = ${kumo-ipv6-multiip-patch-download:location}/${kumo-ipv6-multiip-patch-download:filename}
 patch-options = -p1
 configure-options =
+  --enable-tcadb
  --with-tokyocabinet=${tokyocabinet:location}
  --with-msgpack=${messagepack:location}


--- a/component/leptonica/buildout.cfg
+++ b/component/leptonica/buildout.cfg
@@ -10,7 +10,7 @@ extends =
  ../giflib/buildout.cfg

 [leptonica]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://leptonica.googlecode.com/files/leptonica-1.68.tar.gz
 md5sum = 5cd7092f9ff2ca7e3f3e73bfcd556403
 configure-command =

--- a/component/libaio/buildout.cfg
+++ b/component/libaio/buildout.cfg
@@ -3,7 +3,7 @@ parts =
  libaio

 [libaio]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 # originally located at http://www.kernel.org/pub/linux/libs/aio/
 url = http://ftp.free.fr/mirrors/ftp.debian.org/pool/main/liba/libaio/libaio_0.3.109.orig.tar.gz
 md5sum = 435a5b16ca6198eaf01155263d855756

--- a/component/libdb/buildout.cfg
+++ b/component/libdb/buildout.cfg
@@ -9,7 +9,7 @@ download-only=true
 filename = libdb-hooks.py

 [libdb]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz
 md5sum = b0f1c777708cb8e9d37fb47e7ed3312d
 pre-configure-hook = ${libdb-hooks-download:location}/${libdb-hooks-download:filename}:pre_configure_hook

--- a/component/libdmtx/buildout.cfg
+++ b/component/libdmtx/buildout.cfg
@@ -12,14 +12,14 @@ parts =
  dmtx-utils

 [libdmtx]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/libdmtx/libdmtx-0.7.4.tar.bz2
 md5sum = d3a4c0becd92895eb606dbdb78b023e2
 configure-options =
  --disable-static

 [dmtx-utils]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/libdmtx/dmtx-utils-0.7.4.tar.bz2
 md5sum = b132ab9fb1d289869469b8bb4959a08a
 configure-options =

--- a/component/libevent/buildout.cfg
+++ b/component/libevent/buildout.cfg
@@ -2,7 +2,7 @@
 parts = libevent

 [libevent]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.monkey.org/~provos/libevent-1.4.13-stable.tar.gz
 md5sum = 0b3ea18c634072d12b3c1ee734263664
 configure-options =

--- a/component/libexpat/buildout.cfg
+++ b/component/libexpat/buildout.cfg
@@ -3,7 +3,7 @@ parts =
  libexpat

 [libexpat]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download
 md5sum = dd7dab7a5fea97d2a6a43f511449b7cd
 configure-options =

--- a/component/libiconv/buildout.cfg
+++ b/component/libiconv/buildout.cfg
@@ -3,6 +3,6 @@ parts =
  libiconv

 [libiconv]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz
 md5sum = e34509b1623cec449dfeb73d7ce9c6c6
--- a/component/libjpeg/buildout.cfg
+++ b/component/libjpeg/buildout.cfg
@@ -3,7 +3,7 @@ parts =
  libjpeg

 [libjpeg]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz
 md5sum = 52654eb3b2e60c35731ea8fc87f1bd29
 configure-options =

--- a/component/libmemcached/buildout.cfg
+++ b/component/libmemcached/buildout.cfg
@@ -17,7 +17,7 @@ url = http://launchpad.net/libmemcached/1.0/0.44/+download/libmemcached-0.44.tar
 md5sum = e6bd825c46fa080b550f90f9001cba8c

 [libmemcached-common]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 configure-options =
  --without-docs
  --without-memcached

--- a/component/libpng/buildout.cfg
+++ b/component/libpng/buildout.cfg
@@ -8,7 +8,7 @@ parts =
  libpng

 [libpng-common]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 configure-options =
  --disable-static
 environment =

--- a/component/librsvg/buildout.cfg
+++ b/component/librsvg/buildout.cfg
@@ -10,7 +10,7 @@ extends =
  ../xz-utils/buildout.cfg

 [libcroco]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.8.tar.xz
 md5sum = 767e73c4174f75b99695d4530fd9bb80
 environment =
@@ -19,7 +19,7 @@ environment =
  LDFLAGS=-Wl,-rpath=${zlib:location}/lib

 [librsvg]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 2.36.1
 url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.36/librsvg-2.36.4.tar.xz
 md5sum = 3c94524c8ccf668e30b236f409239f54

--- a/component/librsync/buildout.cfg
+++ b/component/librsync/buildout.cfg
@@ -7,7 +7,7 @@ parts =
  librsync

 [librsync]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/sourceforge/librsync/librsync-0.9.7.tar.gz
 md5sum = 24cdb6b78f45e0e83766903fd4f6bc84
 configure-options =

--- a/component/libtiff/buildout.cfg
+++ b/component/libtiff/buildout.cfg
@@ -8,7 +8,7 @@ parts =
  libtiff

 [libtiff]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 4.0.3
 url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz
 md5sum = 051c1068e6a0627f461948c365290410

--- a/component/libtool/buildout.cfg
+++ b/component/libtool/buildout.cfg
@@ -2,7 +2,7 @@
 parts = libtool

 [libtool]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 md5sum = d2f3b7d4627e69e13514a40e72a24d50
 url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz
 configure-options =

--- a/component/libuuid/buildout.cfg
+++ b/component/libuuid/buildout.cfg
@@ -3,7 +3,7 @@ parts =
  libuuid

 [libuuid]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.kernel.org/pub/linux/utils/util-linux/v2.18/util-linux-ng-2.18.tar.bz2
 md5sum = 2f5f71e6af969d041d73ab778c141a77
 configure-options =

--- a/component/libxml2/buildout.cfg
+++ b/component/libxml2/buildout.cfg
@@ -7,7 +7,7 @@ parts =
  libxml2

 [libxml2]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.9.0.tar.gz
 md5sum = 5b9bebf4f5d2200ae2c4efe8fa6103f7
 configure-options =

--- a/component/libxslt/buildout.cfg
+++ b/component/libxslt/buildout.cfg
@@ -10,7 +10,7 @@ parts =
 [libxslt]
 url = ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz
 md5sum = 9667bf6f9310b957254fdcf6596600b7
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 configure-options =
  --disable-static
  --with-libxml-prefix=${libxml2:location}

--- a/component/libyaml/buildout.cfg
+++ b/component/libyaml/buildout.cfg
@@ -4,6 +4,6 @@ parts =
  libyaml

 [libyaml]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz
 md5sum = 36c852831d02cf90508c29852361d01b
--- a/component/logrotate/buildout.cfg
+++ b/component/logrotate/buildout.cfg
@@ -11,7 +11,7 @@ md5sum = 6beac248c978b767d4bccc1b7eebe6bd
 filename = ${:_buildout_section_name_}

 [logrotate]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.9.tar.gz
 md5sum = eeba9dbca62a9210236f4b83195e4ea5
 patch-options = -p1

--- a/component/lxc/buildout.cfg
+++ b/component/lxc/buildout.cfg
@@ -32,7 +32,7 @@ download-only = true
 md5sum = 8d3706a9bd60b6ebfea33998644b1a99

 [lxc-0.8]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://lxc.sourceforge.net/download/lxc/lxc-0.8.0-rc2.tar.gz
 md5sum = 9bd6988542fd7dd198d056ef3a2db9f6
 patch-binary = ${patch:location}/bin/patch

--- a/component/lynx/buildout.cfg
+++ b/component/lynx/buildout.cfg
@@ -2,6 +2,6 @@
 parts = lynx

 [lynx]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 md5sum = 124253e635f7c76bdffc47b9d036c812
 url = http://lynx.isc.org/lynx2.8.7/lynx2.8.7.tar.gz
--- a/component/m4/buildout.cfg
+++ b/component/m4/buildout.cfg
@@ -15,6 +15,6 @@ patch-options = -p1
 patches =
  ${m4-drop.gets.patch:location}/${m4-drop.gets.patch:filename}

-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.bz2
 md5sum = 8a7cef47fecab6272eb86a6be6363b2f
--- a/component/mariadb/buildout.cfg
+++ b/component/mariadb/buildout.cfg
@@ -24,7 +24,7 @@ filename = mariadb_5.5_create_system_tables__no_test.patch
 download-only = true

 [mariadb]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 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
@@ -61,9 +61,9 @@ environment =
 [mroonga-mariadb]
 # 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 = http://packages.groonga.org/source/mroonga/mroonga-3.01.tar.gz
-md5sum = 45c302ca45ae0eb4bbc6f3ec5f7f1072
+recipe = slapos.recipe.cmmi
+url = http://packages.groonga.org/source/mroonga/mroonga-3.02.tar.gz
+md5sum = b2d1a4abc12030fdbd9064bbb6175366
 configure-options =
  --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
  --with-mysql-config=${mariadb:location}/bin/mysql_config

--- a/component/membase/buildout.cfg
+++ b/component/membase/buildout.cfg
@@ -34,7 +34,7 @@ recipe = hexagonit.recipe.download
 strip-top-level-dir = true

 [membase-component-common]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 path = ${membase-source:location}/${:component}
 prefix = ${membase:location}
 configure-options =

--- a/component/memcached/buildout.cfg
+++ b/component/memcached/buildout.cfg
@@ -20,7 +20,7 @@ download-only = true
 md5sum = fd98d0cbfc4d3a25ac9808472fbe62f8

 [memcached]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://memcached.googlecode.com/files/memcached-1.4.8.tar.gz
 md5sum = b7104e269511621c2777367d6d6315fe
 patches =

--- a/component/memstrike/buildout.cfg
+++ b/component/memstrike/buildout.cfg
@@ -10,7 +10,7 @@ parts =
  memstrike

 [memstrike]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 path = ${memstrikesource:location}
 configure-command =
  ./bootstrap

--- a/component/mesa/buildout.cfg
+++ b/component/mesa/buildout.cfg
@@ -7,7 +7,7 @@ parts =

 [libdrm]
 #does not seem to compile with -jX
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://dri.freedesktop.org/libdrm/libdrm-2.4.26.tar.bz2
 md5sum = 062569426773f69b11a47a7712bba770
 configure-options = 
@@ -18,7 +18,7 @@ environment =


 [mesa]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.freedesktop.org//pub/mesa/7.11/MesaLib-7.11.tar.bz2
 md5sum = ff03aca82d0560009a076a87c888cf13
 configure-options = 

--- a/component/mydumper/buildout.cfg
+++ b/component/mydumper/buildout.cfg
@@ -59,10 +59,10 @@ script =
    call(['make'], cwd=workdir, env=env)
    call(['make', 'install'], cwd=workdir, env=env)

-# XXX-Antoine: here's what I did using hexagonit.recipe.cmmi.
+# XXX-Antoine: here's what I did using slapos.recipe.cmmi.
 # and it wasn't working !
 #[mydumper]
-#recipe = hexagonit.recipe.cmmi
+#recipe = slapos.recipe.cmmi
 #url = http://launchpad.net/mydumper/0.2/0.2.3/+download/mydumper-0.2.3.tar.gz
 #md5sum = 36e6a1c97a9634a6882ddaac5e2697d5
 #strip-top-level-dir = true

--- a/component/mysql-5.1/buildout.cfg
+++ b/component/mysql-5.1/buildout.cfg
@@ -29,7 +29,7 @@ filename = mysql_create_system_tables__no_test.patch
 download-only = true

 [mysql-5.1]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 5.1.58
 url = http://mysql.he.net/Downloads/MySQL-5.1/mysql-${:version}.tar.gz
 md5sum = ae5aef506088e521e4b1cc4f668e96d2
@@ -74,7 +74,7 @@ environment =
  LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib

 [groonga-storage-engine-mysql-5.1]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-1.0.0.tar.gz
 md5sum = 289b8b7919e790599ea79b6fe9270e04
 configure-options =

--- a/component/mysql-5.5/buildout.cfg
+++ b/component/mysql-5.5/buildout.cfg
@@ -32,7 +32,7 @@ filename = mysql_create_system_tables__no_test.patch
 download-only = true

 [mysql-5.5]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 5.5.16
 url = http://mysql.he.net/Downloads/MySQL-5.5/mysql-${:version}.tar.gz
 md5sum = 462ab3752dd666ec06ca32f92673b59e
@@ -63,7 +63,7 @@ environment =
  LDFLAGS=-L${libaio:location}/lib

 [groonga-storage-engine-mysql-5.5]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-1.0.0.tar.gz
 md5sum = 289b8b7919e790599ea79b6fe9270e04
 configure-options =

--- a/component/mysql-tritonn-5.0/buildout.cfg
+++ b/component/mysql-tritonn-5.0/buildout.cfg
@@ -18,7 +18,7 @@ parts =
    mysql-tritonn-5.0

 [senna]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.nexedi.org/static/tarballs/senna/senna-r1311.tar.gz
 md5sum = 1cc51554789f81a9e5208da04a5c2f4c
 configure-command =
@@ -50,7 +50,7 @@ filename = mysql-5.0.87-sphinx-1.10.diff
 download-only = true

 [mysql-tritonn-5.0]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.nexedi.org/static/tarballs/mysql/mysql-5.0.87.tar.gz
 md5sum = 65e6229cc98b6a8d4c5206d7fe16c7be
 # configure: how to avoid searching for my.cnf?

--- a/component/ncurses/buildout.cfg
+++ b/component/ncurses/buildout.cfg
@@ -3,7 +3,7 @@ parts =
  ncurses

 [ncurses]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz
 md5sum = 8cb9c412e5f2d96bc6f459aa8c6282a1
 configure-options =

--- a/component/neon/buildout.cfg
+++ b/component/neon/buildout.cfg
@@ -8,7 +8,7 @@ extends =
  ../zlib/buildout.cfg

 [neon]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.webdav.org/neon/neon-0.29.5.tar.gz
 md5sum = ff369e69ef0f0143beb5626164e87ae2
 configure-options =

--- a/component/nginx/buildout.cfg
+++ b/component/nginx/buildout.cfg
@@ -4,14 +4,36 @@ extends =
  ../zlib/buildout.cfg
  ../openssl/buildout.cfg

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

+[nginx-unstable]
+<= nginx
+url = http://nginx.org/download/nginx-1.3.15.tar.gz
+md5sum = ded252047393c79a31b0862e9166a065
+
+[hexaglobe-nginx-module]
+recipe = hexagonit.recipe.download
+url = http://easicloud-p.cdn.hexaglobe.net/nginx-easicloud.tar.gz
+md5sum = 57fe2ceb09740f22b5b1023f29889e0e
+strip-top-level-dir = true
+
+[nginx-enable-sub]
+# Used by Hexaglobe for watermarking
+<= nginx
+configure-options=
+  --with-ipv6
+  --with-http_ssl_module
+  --with-ld-opt="-L ${zlib:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib"
+  --with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include -I ${zlib:location}/include"
+  --add-module=${hexaglobe-nginx-module:location}/sub_module
+# --add-module=${hexaglobe-nginx-module:location}/nginx-upstream-fair
--- a/component/nodejs/buildout.cfg
+++ b/component/nodejs/buildout.cfg
@@ -13,7 +13,7 @@ parts =

 [nodejs-0.8]
 # Server-side Javascript.
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://nodejs.org/dist/v0.8.14/node-v0.8.14.tar.gz
 md5sum = 284fd2c7578064c339d9cf6a3a475ac7
 configure-options =
@@ -28,7 +28,7 @@ environment =

 [nodejs-0.6]
 # Server-side Javascript.
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://nodejs.org/dist/v0.6.21/node-v0.6.21.tar.gz
 md5sum = 0da985a0bf820400af92363b9f453fe4
 configure-options =
@@ -42,7 +42,7 @@ environment =
  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

 [nodejs-0.4]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://nodejs.org/dist/node-v0.4.12.tar.gz
 md5sum = a6375eaa43db5356bf443e25b828ae16
 configure-options =

--- a/component/nspr/buildout.cfg
+++ b/component/nspr/buildout.cfg
@@ -9,7 +9,7 @@ md5sum = 7c00beff0475314f59214842509e407f
 download-only = true

 [nspr]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.7/src/nspr-4.8.7.tar.gz 
 md5sum = 97e30989a56ab813453b71261849c200 
 patches = ${nspr-pkgconfig-patch-download:location}/${nspr-pkgconfig-patch-download:filename}

--- a/component/nss/buildout.cfg
+++ b/component/nss/buildout.cfg
@@ -58,7 +58,7 @@ command =
  rm -rf ${:compile-location}

 [nss-cmmi]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 path = ${nss-download:location}/mozilla/security/nss
 configure-command = echo "No need to configure"
 make-binary = gmake

--- a/component/nullmailer/buildout.cfg
+++ b/component/nullmailer/buildout.cfg
@@ -2,6 +2,6 @@
 parts = nullmailer

 [nullmailer]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://untroubled.org/nullmailer/nullmailer-1.05.tar.gz
 md5sum = 35124cc05f893efba1310e2ec7c876ff
--- a/component/ocropus/buildout.cfg
+++ b/component/ocropus/buildout.cfg
@@ -9,7 +9,7 @@ url = ${:_profile_base_location_}/${:filename}
 md5sum = 08710ec022f3ce13e5c0b584dfee2c1c

 [ocropus]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.nexedi.org/static/packages/source/ocropus/ocropus-0.4.4.tar.gz
 md5sum = 1485dbe9aab27574bfe3c8b4395cf3ce
 configure-options =
@@ -37,7 +37,7 @@ url = ${:_profile_base_location_}/${:filename}
 md5sum = dbbdf909814fb84ffe47e2ff59980db7

 [iulib]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.nexedi.org/static/packages/source/ocropus/iulib-0.4.4.tar.gz
 md5sum = 3d9754dbd64c56029ce1cd7c2f61894c
 # workaround http://code.google.com/p/iulib/issues/detail?id=27

--- a/component/openldap/buildout.cfg
+++ b/component/openldap/buildout.cfg
@@ -7,7 +7,7 @@ extends =
  ../cyrus-sasl/buildout.cfg

 [openldap]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.33.tgz
 md5sum = 5adae44897647c15ce5abbff313bc85a
 configure-options =

--- a/component/opensp/buildout.cfg
+++ b/component/opensp/buildout.cfg
 [buildout]
 [opensp]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/openjade/OpenSP-1.5.2.tar.gz
 md5sum = 670b223c5d12cee40c9137be86b6c39b
 configure-options =

--- a/component/openssh/buildout.cfg
+++ b/component/openssh/buildout.cfg
@@ -12,7 +12,7 @@ parts =
  openssh

 [openssh]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 md5sum = 0541579adf9d55abb15ef927048d372e
 url = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz


--- a/component/openssl/buildout.cfg
+++ b/component/openssl/buildout.cfg
@@ -28,7 +28,7 @@ filename = ${:_buildout_section_name_}
 download-only = true

 [openssl]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = https://www.openssl.org/source/openssl-1.0.1e.tar.gz
 md5sum = 66bf6f10f060d561929de96f9dfe5b8c
 patch-binary = ${patch:location}/bin/patch
@@ -45,6 +45,7 @@ configure-options =
  --libdir=lib
  shared no-idea no-mdc2 no-rc5 zlib
  -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib
+  && make depend

 # it seems that parallel build sometimes fails for openssl.
 make-options =

--- a/component/patch/buildout.cfg
+++ b/component/patch/buildout.cfg
@@ -5,7 +5,7 @@ parts =
  patch

 [patch]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnu.org/gnu/patch/patch-2.7.1.tar.xz
 md5sum = e9ae5393426d3ad783a300a338c09b72
 environment =

--- a/component/pcre/buildout.cfg
+++ b/component/pcre/buildout.cfg
@@ -3,7 +3,7 @@ parts =
  pcre

 [pcre]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.32.tar.bz2
 md5sum = 62f02a76bb57a40bc66681760ed511d5
 configure-options =

--- a/component/pdftk/buildout.cfg
+++ b/component/pdftk/buildout.cfg
@@ -24,7 +24,7 @@ md5sum = d2a067b98953ad30ba1230f87dfb8b92
 download-only = true

 [pdftk]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-1.44-src.zip
 md5sum = 9eb50fffcd621a627d387750c60982b4
 configure-command = true

--- a/component/percona-toolkit/buildout.cfg
+++ b/component/percona-toolkit/buildout.cfg
@@ -7,7 +7,7 @@ parts =
  percona-toolkit

 [percona-toolkit]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${perl:version}
 version = 2.1.9

--- a/component/perl-Class-Accessor/buildout.cfg
+++ b/component/perl-Class-Accessor/buildout.cfg
@@ -5,7 +5,7 @@ parts =
  perl-Class-Accessor

 [perl-Class-Accessor]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${perl:version}
 url = http://search.cpan.org/CPAN/authors/id/K/KA/KASEI/Class-Accessor-0.34.tar.gz

--- a/component/perl-Config-General/buildout.cfg
+++ b/component/perl-Config-General/buildout.cfg
@@ -5,7 +5,7 @@ parts =
  perl-Config-General

 [perl-Config-General]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${perl:version}
 url = http://search.cpan.org/CPAN/authors/id/T/TL/TLINDEN/Config-General-2.50.tar.gz

--- a/component/perl-DBD-MySQL/buildout.cfg
+++ b/component/perl-DBD-MySQL/buildout.cfg
@@ -7,7 +7,7 @@ parts =
  perl-DBD-MySQL

 [perl-DBD-MySQL]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 4.019
 depends =
  ${perl:version}

--- a/component/perl-DBD-mariadb/buildout.cfg
+++ b/component/perl-DBD-mariadb/buildout.cfg
@@ -7,7 +7,7 @@ parts =
  perl-DBD-mariadb

 [perl-DBD-mariadb]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 4.019
 # binary library should be rebuilt when perl is updated.
 depends =

--- a/component/perl-DBI/buildout.cfg
+++ b/component/perl-DBI/buildout.cfg
@@ -5,7 +5,7 @@ parts =
  perl-DBI

 [perl-DBI]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 1.616
 # binary library should be rebuilt when perl is updated.
 depends =

--- a/component/perl-Encode-HanExtra/buildout.cfg
+++ b/component/perl-Encode-HanExtra/buildout.cfg
@@ -5,7 +5,7 @@ parts =
  perl-Encode-HanExtra

 [perl-Encode-HanExtra]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 # binary library should be rebuilt when perl is updated.
 depends =
  ${perl:version}

--- a/component/perl-HTML-Encoding/buildout.cfg
+++ b/component/perl-HTML-Encoding/buildout.cfg
@@ -5,7 +5,7 @@ parts =
  perl-HTML-Encoding

 [perl-HTML-Encoding]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${perl:version}
 url = http://search.cpan.org/CPAN/authors/id/B/BJ/BJOERN/HTML-Encoding-0.61.tar.gz

--- a/component/perl-HTML-Parser/buildout.cfg
+++ b/component/perl-HTML-Parser/buildout.cfg
@@ -6,7 +6,7 @@ parts =
  perl-HTML-Parser

 [perl-HTML-Parser]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 # binary library should be rebuilt when perl is updated.
 depends =
  ${perl:version}

--- a/component/perl-HTML-Tagset/buildout.cfg
+++ b/component/perl-HTML-Tagset/buildout.cfg
@@ -5,7 +5,7 @@ parts =
  perl-HTML-Tagset

 [perl-HTML-Tagset]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${perl:version}
 url = http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz

--- a/component/perl-HTML-Template/buildout.cfg
+++ b/component/perl-HTML-Template/buildout.cfg
@@ -5,7 +5,7 @@ parts =
  perl-HTML-Template

 [perl-HTML-Template]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${perl:version}
 url = http://search.cpan.org/CPAN/authors/id/S/SA/SAMTREGAR/HTML-Template-2.9.tar.gz

--- a/component/perl-Image-Magick/buildout.cfg
+++ b/component/perl-Image-Magick/buildout.cfg
@@ -12,7 +12,7 @@ download-only = true
 filename = ${:_buildout_section_name_}

 [perl-Image-Magick]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${perl:version}
  ${imagemagick:location}

--- a/component/perl-JSON/buildout.cfg
+++ b/component/perl-JSON/buildout.cfg
@@ -5,7 +5,7 @@ parts =
  perl-JSON

 [perl-JSON]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${perl:version}
 url = http://search.cpan.org/CPAN/authors/id/M/MA/MAKAMAKA/JSON-2.50.tar.gz

--- a/component/perl-Net-IP/buildout.cfg
+++ b/component/perl-Net-IP/buildout.cfg
@@ -5,7 +5,7 @@ parts =
  perl-Net-IP

 [perl-Net-IP]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${perl:version}
 url = http://search.cpan.org/CPAN/authors/id/M/MA/MANU/Net-IP-1.25.tar.gz

--- a/component/perl-SGML-Parser-OpenSP/buildout.cfg
+++ b/component/perl-SGML-Parser-OpenSP/buildout.cfg
@@ -7,7 +7,7 @@ parts =
  perl-SGML-Parser-OpenSP

 [perl-SGML-Parser-OpenSP]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 # binary library should be rebuilt when perl is updated.
 depends =
  ${perl:version}
@@ -16,7 +16,8 @@ depends =
 url = http://search.cpan.org/CPAN/authors/id/B/BJ/BJOERN/SGML-Parser-OpenSP-0.994.tar.gz
 md5sum = b1ee0244e9daa4d37f28cf32c4753691
 configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+  ${perl:location}/bin/perl Makefile.PL \
+  INC=-I${opensp:location}/include \
+  LIBS="-lstdc++ -L${opensp:location}/lib -losp"
 make-options =
-  INC=-I${opensp:location}/include
-  OTHERLDFLAGS="-L${opensp:location}/lib -Wl,-rpath=${opensp:location}/lib"
+  OTHERLDFLAGS="-Wl,-rpath=${opensp:location}/lib"
--- a/component/perl-Term-ReadLine-Gnu/buildout.cfg
+++ b/component/perl-Term-ReadLine-Gnu/buildout.cfg
@@ -13,7 +13,7 @@ download-only = true
 filename = ${:_buildout_section_name_}

 [perl-Term-ReadLine-Gnu]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${perl:version}
 url = http://search.cpan.org/CPAN/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.20.tar.gz

--- a/component/perl-URI/buildout.cfg
+++ b/component/perl-URI/buildout.cfg
@@ -5,7 +5,7 @@ parts =
  perl-URI

 [perl-URI]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${perl:version}
 url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-1.58.tar.gz

--- a/component/perl-XML-LibXML/buildout.cfg
+++ b/component/perl-XML-LibXML/buildout.cfg
@@ -9,7 +9,7 @@ parts =
  perl-XML-LibXML

 [perl-XML-LibXML]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 # binary library should be rebuilt when perl is updated.
 depends =
  ${perl:version}

--- a/component/perl-XML-NamespaceSupport/buildout.cfg
+++ b/component/perl-XML-NamespaceSupport/buildout.cfg
@@ -5,7 +5,7 @@ parts =
  perl-XML-NamespaceSupport

 [perl-XML-NamespaceSupport]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${perl:version}
 url = http://search.cpan.org/CPAN/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.11.tar.gz

--- a/component/perl-XML-Parser/buildout.cfg
+++ b/component/perl-XML-Parser/buildout.cfg
@@ -9,7 +9,7 @@ parts =
  perl-XML-Parser

 [perl-XML-Parser]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${perl:version}
  ${perl-libwww-perl:location}

--- a/component/perl-XML-SAX/buildout.cfg
+++ b/component/perl-XML-SAX/buildout.cfg
@@ -6,7 +6,7 @@ parts =
  perl-XML-SAX

 [perl-XML-SAX]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${perl:version}
  ${perl-XML-NamespaceSupport:location}

--- a/component/perl-libwww-perl/buildout.cfg
+++ b/component/perl-libwww-perl/buildout.cfg
@@ -6,7 +6,7 @@ parts =
  perl-libwww-perl

 [perl-libwww-perl]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${perl:version}
  ${perl-HTML-Parser:location}

--- a/component/perl/buildout.cfg
+++ b/component/perl/buildout.cfg
@@ -20,12 +20,12 @@ download-only = true
 filename = create-libs-symlink.py

 [perl]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${gdbm:version}
 version = 5.16.3
 # increase revision when we need to rebuild binary libraries.
-revision = 1
+revision = 2
 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
 md5sum = 025102de0e4a597cf541e57da80c6aa3
 siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}

--- a/component/phantomjs/buildout.cfg
+++ b/component/phantomjs/buildout.cfg
+[buildout]
+extends =
+  ../fontconfig/buildout.cfg
+  ../libexpat/buildout.cfg
+  ../dash/buildout.cfg
+parts =
+  phantomjs
+
+[phantomjs]
+recipe = slapos.recipe.build
+slapos_promise =
+  file:phantomjs-slapos
+
+depends =
+  ${liberation-fonts:location}
+  ${ipaex-fonts:location}
+
+x86 = https://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-i686.tar.bz2 2e94dcad7660d24309abe01011461693
+x86-64 = https://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-x86_64.tar.bz2 8075fa873d8741c7ae9093c80a589a1f
+
+script =
+  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
+  extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
+  workdir = guessworkdir(extract_dir)
+  self.copyTree(workdir, "%(location)s")
+  wrapper_location = os.path.join("%(location)s", "phantomjs-slapos")
+  wrapper = open(wrapper_location, 'w')
+  wrapper.write("""#!${dash:location}/bin/dash
+  cd %(location)s
+  export LD_LIBRARY_PATH=%(location)s:${freetype:location}/lib/:${fontconfig:location}/lib/:${libexpat:location}/lib
+  export PATH=${fontconfig:location}/bin:$PATH
+  exec %(location)s/bin/phantomjs $*""")
+  wrapper.flush()
+  wrapper.close()
+  os.chmod(wrapper_location, 0755)
\ No newline at end of file
--- a/component/pkgconfig/buildout.cfg
+++ b/component/pkgconfig/buildout.cfg
@@ -13,7 +13,7 @@ extends =
 <= pkgconfig

 [pkgconfig]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz
 md5sum = 5392b4e3372879c5bf856173b418d6a2
 location = ${buildout:parts-directory}/${:_buildout_section_name_}

--- a/component/poppler/buildout.cfg
+++ b/component/poppler/buildout.cfg
@@ -12,9 +12,9 @@ extends =
  ../zlib/buildout.cfg

 [poppler]
-recipe = hexagonit.recipe.cmmi
-md5sum = 3939740201c59c470bc7198003450a20
-url = http://poppler.freedesktop.org/poppler-0.22.2.tar.gz
+recipe = slapos.recipe.cmmi
+md5sum = be915388eaad6865cee5a156c8119ec1
+url = http://poppler.freedesktop.org/poppler-0.22.3.tar.gz
 depends =
  ${libtiff:version}
 configure-options =

--- a/component/popt/buildout.cfg
+++ b/component/popt/buildout.cfg
@@ -3,7 +3,7 @@ parts =
  popt

 [popt]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://anduin.linuxfromscratch.org/BLFS/svn/p/popt-1.16.tar.gz
 md5sum = 3743beefa3dd6247a73f8f7a32c14c33
 configure-options =

--- a/component/postfix/buildout.cfg
+++ b/component/postfix/buildout.cfg
@@ -10,7 +10,7 @@ extends =
 parts = postfix

 [postfix]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.8.3.tar.gz
 md5sum = b3922ededd3fd6051f759e58a4ada3ae
 location = ${buildout:parts-directory}/${:_buildout_section_name_}

--- a/component/postgresql/buildout.cfg
+++ b/component/postgresql/buildout.cfg
@@ -13,9 +13,9 @@ parts = postgresql


 [postgresql91]
-recipe = hexagonit.recipe.cmmi
-url = http://ftp.postgresql.org/pub/source/v9.1.7/postgresql-9.1.7.tar.bz2
-md5sum = eaf7b67493d59d1a60767ffdfbd65ce9
+recipe = slapos.recipe.cmmi
+url = http://ftp.postgresql.org/pub/source/v9.1.9/postgresql-9.1.9.tar.bz2
+md5sum = 6b5ea53dde48fcd79acfc8c196b83535
 configure-options = --with-openssl --with-perl
 environment =
  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
@@ -23,9 +23,9 @@ environment =


 [postgresql92]
-recipe = hexagonit.recipe.cmmi
-url = http://ftp.postgresql.org/pub/source/v9.2.2/postgresql-9.2.2.tar.bz2
-md5sum = 1cc388988e69bf75c6b55d59070100f6
+recipe = slapos.recipe.cmmi
+url = http://ftp.postgresql.org/pub/source/v9.2.4/postgresql-9.2.4.tar.bz2
+md5sum = 6ee5bb53b97da7c6ad9cb0825d3300dd
 configure-options = --with-openssl
 environment =
  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib

--- a/component/pwgen/buildout.cfg
+++ b/component/pwgen/buildout.cfg
@@ -3,6 +3,6 @@ parts =
  pwgen

 [pwgen]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/pwgen/pwgen/2.06/pwgen-2.06.tar.gz
 md5sum = 935aebcbe610fbc9de8125e7b7d71297
--- a/component/python-2.4/buildout.cfg
+++ b/component/python-2.4/buildout.cfg
@@ -35,7 +35,7 @@ download-only = true
 filename = python2.4-backport-CPPFLAGS-setup-from-python2.6.patch

 [python2.4]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 # This is actually the default setting for prefix, but we can't use it in
 # other settings in this part if we don't set it explicitly here.
 prefix = ${buildout:parts-directory}/${:_buildout_section_name_}

--- a/component/python-2.6/buildout.cfg
+++ b/component/python-2.6/buildout.cfg
@@ -24,7 +24,7 @@ download-only = true
 filename = python-2.6.6-no_system_inc_dirs.patch

 [python2.6]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${gdbm:version}
 # This is actually the default setting for prefix, but we can't use it in

--- a/component/python-2.7/buildout.cfg
+++ b/component/python-2.7/buildout.cfg
@@ -24,10 +24,10 @@ arguments = sys.argv[1:] + ["bootstrap"]
 python = python2.7

 [python2.7]
-recipe = hexagonit.recipe.cmmi
-package_version = 2.7.3
+recipe = slapos.recipe.cmmi
+package_version = 2.7.4
 package_version_suffix =
-md5sum = c57477edd6d18bd9eeca2f21add73919
+md5sum = 62704ea0f125923208d84ff0568f7d50

 depends =
  ${gdbm:version}
@@ -44,6 +44,9 @@ configure-options =
  --enable-unicode=ucs4
  --with-system-expat
  --with-threads
+# Profiled build:
+make-binary =
+make-targets = make profile-opt && make install

 # the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
 # which would otherwise load the system libmagic.so with ctypes

--- a/component/python-setuptools/buildout.cfg
+++ b/component/python-setuptools/buildout.cfg
@@ -7,6 +7,7 @@ download-only = true
 filename = setuptools-0.6c11-py2.7.egg
 url = http://pypi.python.org/packages/2.7/s/setuptools/${:filename}
 md5sum = fe1f997bc722265116870bc7919059ea
+mode = 0644

 [python-setuptools]
 # Hack to manually install setuptools outside of the Buildout environment.
@@ -19,4 +20,5 @@ environment = export PATH=${python2.7:location}/bin:$PATH; export PYTHONPATH=${:
 stop-on-error = true
 recipe = plone.recipe.command
 update = true
-command = ${:environment} (mkdir ${:location}; sh ${setuptools-download:location}/${setuptools-download:filename} --install-dir ${:location}) || (rm -fr ${:location}; exit 1)
+# chmod is a hack, but the mode of hexagonit.recipe.download above didn't worked yet (there was new version recently)
+command = ${:environment} (mkdir ${:location}; chmod 644 ${setuptools-download:location}/${setuptools-download:filename} ; sh ${setuptools-download:location}/${setuptools-download:filename} --install-dir ${:location}) || (rm -fr ${:location}; exit 1)
--- a/component/qemu-kvm/buildout.cfg
+++ b/component/qemu-kvm/buildout.cfg
@@ -10,7 +10,7 @@ extends =
 <= qemu-kvm

 [qemu-kvm]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.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 =

--- a/component/readline/buildout.cfg
+++ b/component/readline/buildout.cfg
@@ -5,7 +5,7 @@ parts =

 # readline-5.x is still used for GPL2 only softwares.
 [readline5]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz
 md5sum = e39331f32ad14009b9ff49cc10c5e751
 configure-options =
@@ -13,7 +13,7 @@ configure-options =
  --disable-static

 [readline]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz
 md5sum = 67948acb2ca081f23359d0256e9a271c
 configure-options =

--- a/component/rsync/buildout.cfg
+++ b/component/rsync/buildout.cfg
@@ -3,7 +3,7 @@ parts =
  rsync

 [rsync]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz
 md5sum = 5ee72266fe2c1822333c407e1761b92b
 make-options =

--- a/component/ruby/buildout.cfg
+++ b/component/ruby/buildout.cfg
 [buildout]

 extends =
+  ../gdbm/buildout.cfg
+  ../openssl/buildout.cfg
+  ../zlib/buildout.cfg
+  ../readline/buildout.cfg
+  ../ncurses/buildout.cfg
  ../libyaml/buildout.cfg

 parts = ruby

 [ruby-1.9.3]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz
 md5sum = bc0c715c69da4d1d8bd57069c19f6c0e
 configure-options =
  --enable-shared --enable-rpath
 environment =
-  CFLAGS=-I${libyaml:location}/include
-  LDFLAGS=-L${libyaml:location}/lib -Wl,-rpath=${libyaml:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw  -I${gdbm:location}/include -I${openssl:location}/include
+  LDFLAGS=-L${zlib:location}/lib -L${libyaml:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib  -L${gdbm:location}/lib -L${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libyaml:location}/lib   -Wl,-rpath=${ncurses:location}/lib  -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib

 [ruby-1.9]
 <= ruby-1.9.3

--- a/component/sed/buildout.cfg
+++ b/component/sed/buildout.cfg
@@ -3,7 +3,7 @@ parts =
  sed

 [sed]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz
 md5sum = f0fd4d7da574d4707e442285fd2d3b86
 environment =

--- a/component/serf/buildout.cfg
+++ b/component/serf/buildout.cfg
@@ -8,7 +8,7 @@ extends =
  ../zlib/buildout.cfg

 [serf]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://serf.googlecode.com/files/serf-0.7.0.tar.gz
 md5sum = 3233f22a5875320da7bdc854d0873080
 configure-options =

--- a/component/sheepstrike/buildout.cfg
+++ b/component/sheepstrike/buildout.cfg
@@ -2,7 +2,7 @@
 parts = sheepstrike

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

--- a/component/shellinabox/buildout.cfg
+++ b/component/shellinabox/buildout.cfg
@@ -20,7 +20,7 @@ url = ${:_profile_base_location_}/${:filename}
 download-only = true

 [shellinabox]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://shellinabox.googlecode.com/files/shellinabox-2.10.tar.gz
 md5sum = 0e144910d85d92edc54702ab9c46f032
 environment =

--- a/component/slapos/buildout.cfg
+++ b/component/slapos/buildout.cfg
@@ -131,54 +131,44 @@ scripts = py
 # Use our own buildout version
 zc.buildout = 1.6.0-dev-SlapOS-010

-# Don't use beta
-lxml = 3.0.2
+# Force to use zc.recipe.egg 1.x
+zc.recipe.egg = 1.3.2
+
+# Use own version of h.r.download to be able to open archives not supported by python2.x: .xz
+hexagonit.recipe.download = 1.6nxd002

 Jinja2 = 2.6
 Werkzeug = 0.8.3
 buildout-versions = 1.7
-collective.recipe.template = 1.9
-hexagonit.recipe.cmmi = 1.6
+collective.recipe.template = 1.10
+lxml = 3.1.2
 meld3 = 0.6.10
 netaddr = 0.7.10
-slapos.core = 0.35
 slapos.libnetworkcache = 0.13.3
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
-zc.recipe.egg = 1.3.2

 # Required by:
-# slapos.core==0.35
+# slapos.core==0.35.2-dev
 Flask = 0.9

 # Required by:
-# hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6nxd002
-
-# Required by:
-# slapos.core==0.35
+# slapos.core==0.35.2-dev
 netifaces = 0.8

 # Required by:
-# slapos.core==0.35
-pyflakes = 0.6.1
-
-# Required by:
-# slapos.core==0.35
+# slapos.core==0.35.2-dev
 # slapos.libnetworkcache==0.13.3
 # supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.3
+# zope.interface==4.0.5
 setuptools = 0.6c12dev-r88846

 # Required by:
-# slapos.core==0.35
+# slapos.core==0.35.2-dev
 supervisor = 3.0b1

 # Required by:
-# slapos.core==0.35
-unittest2 = 0.5.1
+# slapos.core==0.35.2-dev
+zope.interface = 4.0.5

-# Required by:
-# slapos.core==0.35
-zope.interface = 4.0.3
--- a/component/sphinx/buildout.cfg
+++ b/component/sphinx/buildout.cfg
@@ -17,7 +17,7 @@ download-only = true
 filename = sphinx-1.10-beta-snowball.patch

 [sphinx]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 depends =
  ${mariadb:version}
 url = http://sphinxsearch.com/files/sphinx-2.0.5-release.tar.gz

--- a/component/sqlite3/buildout.cfg
+++ b/component/sqlite3/buildout.cfg
@@ -4,9 +4,9 @@ parts =
  sqlite3

 [sqlite3]
-recipe = hexagonit.recipe.cmmi
-url = http://www.sqlite.org/sqlite-autoconf-3071502.tar.gz
-md5sum = bcb0ab0b5b30116b2531cfeef3c861b4
+recipe = slapos.recipe.cmmi
+url = http://www.sqlite.org/2013/sqlite-autoconf-3071601.tar.gz
+md5sum = 8860d1a1ed26d40f07e3c7ae035b644a
 configure-options =
  --disable-static
  --enable-readline

--- a/component/stunnel/buildout.cfg
+++ b/component/stunnel/buildout.cfg
@@ -6,7 +6,7 @@ parts =

 [stunnel]
 <= stunnel-4
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi

 [stunnel-4-hook-download]
 recipe = hexagonit.recipe.download
@@ -16,7 +16,7 @@ download-only=true
 filename = stunnel-4-hooks.py

 [stunnel-4]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 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

--- a/component/subversion/buildout.cfg
+++ b/component/subversion/buildout.cfg
@@ -23,7 +23,7 @@ url = ${:_profile_base_location_}/${:filename}
 md5sum = 8d911ec2422dc4c08a00693ac915a07a

 [subversion]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2
 md5sum = 81e5dc5beee4b3fc025ac70c0b6caa14
 patches =

--- a/component/swig/buildout.cfg
+++ b/component/swig/buildout.cfg
@@ -8,7 +8,7 @@ parts =
  swig

 [swig]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/swig/swig/swig-1.3.40/swig-1.3.40.tar.gz
 md5sum = 2df766c9e03e02811b1ab4bba1c7b9cc
 configure-options =

--- a/component/tar/buildout.cfg
+++ b/component/tar/buildout.cfg
@@ -15,7 +15,7 @@ patch-options = -p1
 patches =
  ${tar-drop.gets.patch:location}/${tar-drop.gets.patch:filename}

-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/tar/tar-1.26.tar.gz
 md5sum = 00d1e769c6af702c542cca54b728920d
 environment =

--- a/component/tesseract/buildout.cfg
+++ b/component/tesseract/buildout.cfg
@@ -23,7 +23,7 @@ filename = ${:_buildout_section_name_}
 md5sum = 2e691858cb492b7c17d23bf0912b3d24

 [tesseract]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz
 md5sum = 1ba496e51a42358fb9d3ffe781b2d20a
 patch-options =

--- a/component/tokyocabinet/buildout.cfg
+++ b/component/tokyocabinet/buildout.cfg
@@ -5,7 +5,7 @@ extends =
 parts = tokyocabinet

 [tokyocabinet]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://fallabs.com/tokyocabinet/tokyocabinet-1.4.46.tar.gz
 md5sum = 341dadd1f3d68760e350f7e731111786


--- a/component/varnish/buildout.cfg
+++ b/component/varnish/buildout.cfg
@@ -15,7 +15,7 @@ extends =
 <= varnish-2.0

 [varnish-2.0]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/varnish/files/varnish/2.0.6/varnish-2.0.6.tar.gz/download
 md5sum = d91dc21c636db61c69b5e8f061c5bb95
 configure-options =
@@ -25,7 +25,7 @@ environment =
  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib

 [varnish-2.1]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://repo.varnish-cache.org/source/varnish-2.1.5.tar.gz
 md5sum = 2d2f227da36a2a240c475304c717b8e3
 configure-options =

--- a/component/w3m/buildout.cfg
+++ b/component/w3m/buildout.cfg
@@ -20,7 +20,7 @@ md5sum = 75422a6f7f671b3a6d9add6724cc0945
 virtual-depend =
  ${w3m-w3m.gcc.forward.compat.patch:md5sum}

-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 md5sum = 1b845a983a50b8dec0169ac48479eacc
 url = http://downloads.sourceforge.net/project/w3m/w3m/w3m-0.5.3/w3m-0.5.3.tar.gz
 configure-options =

--- a/component/webp/buildout.cfg
+++ b/component/webp/buildout.cfg
@@ -9,7 +9,7 @@ extends =
  ../libpng/buildout.cfg

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

--- a/component/wget/buildout.cfg
+++ b/component/wget/buildout.cfg
@@ -9,7 +9,7 @@ parts =
  wget

 [wget]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/wget/wget-1.14.tar.xz
 md5sum = 316f6f59292c9098ad81fd54f658c579
 configure-options =

--- a/component/xapian/buildout.cfg
+++ b/component/xapian/buildout.cfg
@@ -6,7 +6,7 @@ depends =
  ../libuuid/buildout.cfg

 [xapian]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://oligarchy.co.uk/xapian/1.2.12/xapian-core-1.2.12.tar.gz
 md5sum = faf33a3945edbe4c848627750856cbeb
 environment =

--- a/component/xorg/buildout.cfg
+++ b/component/xorg/buildout.cfg
@@ -27,12 +27,12 @@ parts =
 ACLOCAL=${xorg-util-macros:location}/share/aclocal

 [xorg-util-macros]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/util/util-macros-1.11.0.tar.bz2
 md5sum = 22d5cdff672450cb6902e0d68c200dcb

 [xproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/proto/xproto-7.0.20.tar.bz2
 md5sum = 65633168e5315c19defb4652cd3d83c1
 configure-options =
@@ -44,7 +44,7 @@ environment =
  PATH=${libxml2:location}/bin:${pkgconfig:location}/bin:%(PATH)s

 [xextproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/proto/xextproto-7.1.2.tar.bz2
 md5sum = 263ae968b223c23b2986603d84e5c30e
 configure-options =
@@ -63,7 +63,7 @@ filename = xtrans_tmp_env.patch
 md5sum = 37d82a3b6009113023599632117a6855

 [xtrans]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/xtrans-1.2.6.tar.bz2
 md5sum = c66f9ffd2da4fb012220c6c40ebc7609
 patches =
@@ -79,7 +79,7 @@ environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s

 [libXau]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libXau-1.0.6.tar.bz2
 md5sum = 4a2cbd83727682f9ee1c1e719bac6adb
 configure-options =
@@ -89,7 +89,7 @@ environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s

 [xcbproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/xcb/xcb-proto-1.6.tar.bz2
 md5sum = 04313e1d914b44d0e457f6c494fc178b
 environment =
@@ -97,7 +97,7 @@ environment =
  PYTHON=${buildout:executable}

 [xorg-libpthread-stubs]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/xcb/libpthread-stubs-0.3.tar.bz2
 md5sum = e8fa31b42e13f87e8f5a7a2b731db7ee

@@ -109,7 +109,7 @@ filename = xcb_tmp_env.patch
 md5sum = 61f39878120ba434a169e24cae2af862

 [libxcb]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/xcb/libxcb-1.7.tar.bz2
 md5sum = 925699df361b99491165ebc12068056b
 patches =
@@ -129,7 +129,7 @@ environment =
 # suitable library.

 [libXext]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libXext-1.2.0.tar.bz2
 md5sum = 9bb236ff0193e9fc1c1fb504dd840331
 environment =
@@ -158,17 +158,17 @@ filename = 700c7896b832d6e4fb0185f0d5382b01f94e7141.patch
 md5sum = 52635ef694ee6f1acb642a77ee8eb010

 [inputproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/inputproto-2.0.1.tar.bz2
 md5sum = da9bf9e5d174163f597d2d72757d9038

 [kbproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2
 md5sum = e7edb59a3f54af15f749e8f3e314ee62

 [libX11]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libX11-1.4.0.tar.bz2
 md5sum = b63d9f7493a61df51d0c0be04ac435e4
 configure-options =
@@ -189,7 +189,7 @@ environment =


 [libXdmcp]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libXdmcp-1.1.0.tar.bz2
 md5sum = 762b6bbaff7b7d0831ddb4f072f939a5
 environment =
@@ -201,67 +201,67 @@ configure-options =
  --without-fop

 [fixesproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2
 md5sum = bdb58ecc313b509247036d5c11fa99df

 [bigreqsproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2
 md5sum = 6f6c24436c2b3ab235eb14a85b9aaacf

 [xcmiscproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/xcmiscproto-1.2.1.tar.bz2
 md5sum = cd7372cd827bfd7ca7e9238f2ce274b1

 [damageproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2
 md5sum = 998e5904764b82642cc63d97b4ba9e95

 [randrproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/randrproto-1.3.2.tar.bz2
 md5sum = 597491c0d8055e2a66f11350c4985775

 [renderproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/renderproto-0.11.1.tar.bz2
 md5sum = a914ccc1de66ddeb4b611c6b0686e274

 [videoproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2
 md5sum = c3b348c6e2031b72b11ae63fc7f805c2

 [fontsproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/fontsproto-2.1.1.tar.bz2
 md5sum = 37102ffcaa73f77d700acd6f7a25d8f0

 [recordproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/recordproto-1.14.1.tar.bz2
 md5sum = 24541a30b399213def35f48efd926c63

 [resourceproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/resourceproto-1.1.1.tar.bz2
 md5sum = 8ff0525ae7502b48597b78d00bc22284

 [xineramaproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/xineramaproto-1.2.tar.bz2
 md5sum = a8aadcb281b9c11a91303e24cdea45f5

 [pixman]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://xorg.freedesktop.org/archive/individual/lib/pixman-0.23.2.tar.bz2 
 md5sum = 2e2805f5ca02edeb15a7862779670069

 [libfontenc]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2
 md5sum = 11d3c292f05a90f6f67840a9e9c3d9b8
 environment =
@@ -273,7 +273,7 @@ environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s

 [libXfont]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2
 md5sum = 6fb689cfe13d8d9460f4abb5bd88588d
 environment =
@@ -285,7 +285,7 @@ environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s

 [libxkbfile]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2
 md5sum = 59b4fe0bdf8d9b05e45b59e8fe9e7516
 environment =
@@ -296,7 +296,7 @@ environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s

 [xkeyboard-config]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.1.tar.bz2
 md5sum = 57ecc78bacd8ecc398d8ed6588f4d04b
 depends =
@@ -312,7 +312,7 @@ environment =
  PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig

 [xkbcomp]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/app/xkbcomp-1.2.0.tar.bz2
 md5sum = 0f55995cd8da9b2d88553e1a2e17cd0a
 # Hardcoded location for xkeyboard-config, needed during compile time
@@ -327,12 +327,12 @@ environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s

 [render]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://xlibs.freedesktop.org/release/renderext-0.9.tar.bz2
 md5sum = d43c2afc69937655d13c02588c9ff974

 [libXrender]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://xlibs.freedesktop.org/release/libXrender-0.9.0.tar.bz2
 md5sum = ce7cda009aa0b10a73637941d44ae789
 configure-options =
@@ -342,7 +342,7 @@ environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s

 [libXinerama]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libXinerama-1.1.1.tar.bz2
 md5sum = ecd4839ad01f6f637c6fb5327207f89b
 environment =
@@ -352,7 +352,7 @@ configure-options =
  --disable-static

 [libICE]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libICE-1.0.7.tar.bz2
 md5sum = bb72a732b15e9dc25c3036559387eed5
 configure-options =
@@ -364,7 +364,7 @@ environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s

 [libSM]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libSM-1.2.0.tar.bz2
 md5sum = e78c447bf1790552b644eca81b542742
 configure-options =
@@ -377,7 +377,7 @@ environment =
  LIBUUID_CFLAGS=-I${libuuid:location}/include

 [libXt]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libXt-1.0.9.tar.bz2
 md5sum = 8a414f8f2327aaa616ca2dcac1f5d8c3
 environment =
@@ -386,7 +386,7 @@ environment =
  CPPFLAGS=-I${libSM:location}/include -I${kbproto:location}/include -I${libICE:location}/include -I${xproto:location}/include -I${libX11:location}/include

 [dri2proto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.6.tar.gz
 md5sum = 873142af5db695537cfe05e01d13541f
 configure-options = 
@@ -397,7 +397,7 @@ environment =


 [pciaccess]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libpciaccess-0.12.0.tar.bz2
 md5sum = 285e07976274572e1f1e68edee09b70a
 configure-options = 
@@ -406,7 +406,7 @@ environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s

 [makedepend]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.3.tar.bz2
 md5sum = 4e6cb97bbecfbb34f3f644a75e513093
 configure-options = 
@@ -416,7 +416,7 @@ environment =
  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig

 [glproto]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.14.tar.bz2
 md5sum = f48257daf0017f7a7667e5bf48ca3578
 configure-options = 
@@ -426,7 +426,7 @@ environment =
  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig

 [xfixes]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://xorg.freedesktop.org/releases/individual/lib/libXfixes-4.0.5.tar.bz2
 md5sum = 1b4b8386bd5d1751b2c7177223ad4629
 configure-options = 
@@ -437,7 +437,7 @@ environment =
  CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${fixesproto:location}/include -I${xextproto:location}/include

 [xdamage]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.3.tar.bz2
 md5sum = 44774e1a065158b52f1a0da5100cebec
 configure-options = 
@@ -455,7 +455,7 @@ filename = tmp_env.patch
 md5sum = 8b60ab8121f0564a681fc00d03101696

 [libxmu]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libXmu-1.1.0.tar.gz
 md5sum = 15e1cb9aaf97eae169bfe6944e0a541e
 environment =
@@ -464,7 +464,7 @@ environment =
  CPPFLAGS=-I${libX11:location}/include -I${xextproto:location}/include

 [libXcursor]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libXcursor-1.1.11.tar.gz
 md5sum = 55558a41d0bcf9210636858844fa4d2f
 environment =
@@ -473,7 +473,7 @@ environment =
  CPPFLAGS=-I${render:location}/include -I${xproto:location}/include -I${fixesproto:location}/include -I${libX11:location}/include -I${xfixes:location}/include -I${libXrender:location}/include

 [xwd]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/app/xwd-1.0.4.tar.gz
 md5sum = f8da771069756210833524b5afa1832c
 environment =
@@ -484,7 +484,7 @@ environment =

 [xserver]
 # Adds Xvfb functionnality
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/xserver/xorg-server-1.9.3.tar.bz2
 md5sum = 5bef6839a76d029204ab31aa2fcb5201
 patches =

--- a/component/xpdf/buildout.cfg
+++ b/component/xpdf/buildout.cfg
@@ -35,7 +35,7 @@ filename = xpdf-3.02pl5.patch
 md5sum = 504902ca5e9d66c67eed03636ec6b163

 [xpdf-3.02]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 md5sum = 599dc4cc65a07ee868cf92a667a913d2
 url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz
 configure-options =

--- a/component/xtrabackup/buildout.cfg
+++ b/component/xtrabackup/buildout.cfg
@@ -46,7 +46,7 @@ download-only = true
 filename = libtar-${:version}.tar.gz

 [xtrabackup]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.percona.com/downloads/XtraBackup/XtraBackup-1.6.3/source/xtrabackup-1.6.3.tar.gz
 md5sum = d0b827fd18cd76416101eb7b7c56a311
 make-binary = true

--- a/component/xz-utils/buildout.cfg
+++ b/component/xz-utils/buildout.cfg
@@ -3,6 +3,6 @@ parts =
  xz-utils

 [xz-utils]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://tukaani.org/xz/xz-5.0.4.tar.gz
 md5sum = df3df690aef18384e1e031be7ec3a964
--- a/component/zabbix/buildout.cfg
+++ b/component/zabbix/buildout.cfg
@@ -3,7 +3,7 @@ parts =
  zabbix-agent

 [zabbix-agent]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.1.tar.gz?download
 md5sum = 3b301aa4f2b7cb5ede46884b9c7873e1
 configure-options =

--- a/component/zip/buildout.cfg
+++ b/component/zip/buildout.cfg
@@ -2,7 +2,7 @@
 parts = zip

 [zip]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/infozip/files/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz/download
 md5sum = 7b74551e63f8ee6aab6fbc86676c0d37
 location = ${buildout:parts-directory}/${:_buildout_section_name_}

--- a/component/zlib/buildout.cfg
+++ b/component/zlib/buildout.cfg
@@ -3,6 +3,6 @@ parts =
  zlib

 [zlib]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/libpng/zlib-1.2.6.tar.bz2?download
 md5sum = dc2cfa0d2313ca77224b4d932b2911e9
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os

-version = '0.74.1-dev'
+version = '0.77.2.dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
    open("CHANGES.txt").read() + "\n"
@@ -52,6 +52,7 @@ setup(name=name,
      packages=find_packages(),
      include_package_data=True,
      install_requires=[
+        'hexagonit.recipe.download',
        'lxml', # for full blown python interpreter
        'netaddr', # to manipulate on IP addresses
        'setuptools', # namespaces
@@ -72,6 +73,7 @@ setup(name=name,
          'apache.zope.backend = slapos.recipe.apache_zope_backend:Recipe',
          'apacheperl = slapos.recipe.apacheperl:Recipe', 
          'apachephp = slapos.recipe.apachephp:Recipe',
+          'apachephpconfigure = slapos.recipe.apachephpconfigure:Recipe',
          'apacheproxy = slapos.recipe.apacheproxy:Recipe',
          'certificate_authority = slapos.recipe.certificate_authority:Recipe',
          'certificate_authority.request = slapos.recipe.certificate_authority:Request',
@@ -80,6 +82,7 @@ setup(name=name,
          'check_url_available = slapos.recipe.check_url_available:Recipe',
          'cloud9 = slapos.recipe.cloud9:Recipe',
          'cloudooo.test = slapos.recipe.erp5_test:CloudoooRecipe',
+          'configurationfile = slapos.recipe.configurationfile:Recipe',
          'cron = slapos.recipe.dcron:Recipe',
          'cron.d = slapos.recipe.dcron:Part',
          'davstorage = slapos.recipe.davstorage:Recipe',
@@ -121,6 +124,7 @@ setup(name=name,
          'kvm = slapos.recipe.kvm:Recipe',
          'kvm.frontend = slapos.recipe.kvm_frontend:Recipe',
          'lamp = slapos.recipe.lamp:Request',
+          'lamp.generic = slapos.recipe.lampgeneric:Recipe',
          'lamp.request = slapos.recipe.lamp:Request',
          'lamp.simple = slapos.recipe.lamp:Simple',
          'lamp.static = slapos.recipe.lamp:Static',
@@ -151,12 +155,15 @@ setup(name=name,
          'proactive = slapos.recipe.proactive:Recipe',
          'publish = slapos.recipe.publish:Recipe',
          'publish.serialised = slapos.recipe.publish:Serialised',
+          'publishsection = slapos.recipe.publish:PublishSection',
          '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',
+          'request.edge = slapos.recipe.request:RequestEdge',
          'requestoptional = slapos.recipe.request:RequestOptional',
+          'reverseproxy.nginx = slapos.recipe.reverse_proxy_nginx:Recipe',
          'seleniumrunner = slapos.recipe.seleniumrunner:Recipe',
          'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',
          'shell = slapos.recipe.shell:Recipe',
@@ -188,8 +195,8 @@ setup(name=name,
          'xvfb = slapos.recipe.xvfb:Recipe',
          'xwiki = slapos.recipe.xwiki:Recipe',
          'zabbixagent = slapos.recipe.zabbixagent:Recipe',
+          'zimbra.kvm = slapos.recipe.zimbra_kvm:Recipe',
          'zeo = slapos.recipe.zeo:Recipe',
-
        ],
        'slapos.recipe.nosqltestbed.plugin': [
          'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',

--- a/slapos/recipe/apache_frontend/__init__.py
+++ b/slapos/recipe/apache_frontend/__init__.py
@@ -36,6 +36,7 @@ import ConfigParser
 import re
 import traceback

+TRUE_VALUES = ['y', 'yes', '1', 'true']

 class Recipe(BaseSlapRecipe):

@@ -65,13 +66,13 @@ class Recipe(BaseSlapRecipe):

    # self.cron_d is a directory, where cron jobs can be registered
    self.cron_d = self.installCrond()
-    self.logrotate_d, self.logrotate_backup = self.installLogrotate()
    self.killpidfromfile = zc.buildout.easy_install.scripts(
-        [('killpidfromfile', 'slapos.recipe.erp5.killpidfromfile',
+        [('killpidfromfile', 'slapos.toolbox.killpidfromfile',
          'killpidfromfile')], self.ws, sys.executable, self.bin_directory)[0]
    self.path_list.append(self.killpidfromfile)

    rewrite_rule_list = []
+    rewrite_rule_https_only_list = []
    rewrite_rule_zope_list = []
    rewrite_rule_zope_path_list = []
    slave_dict = {}
@@ -88,20 +89,16 @@ class Recipe(BaseSlapRecipe):
      # Sanitize inputs
      backend_url = slave_instance.get("url", None)
      reference = slave_instance.get("slave_reference")
+      enable_cache = slave_instance.get('enable_cache', '').lower() in TRUE_VALUES
+      slave_type = slave_instance.get('type', '').lower() or None

-      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
+      https_only = slave_instance.get('https-only', '').lower() in TRUE_VALUES

      # Set scheme (http? https?)
-      # Future work may allow to choose between http and https (or both?)
-      scheme = 'http://'
+      if https_only:
+        scheme = 'https://'
+      else:
+        scheme = 'http://'

      self.logger.info('Processing slave instance: %s' % reference)

@@ -143,6 +140,10 @@ class Recipe(BaseSlapRecipe):
      rewrite_rule = "%s %s" % (domain, backend_url)

      # Finally, if successful, we add the rewrite rule to our list of rules
+      # We have 4 RewriteMaps:
+      #  - One for generic (non-zope) websites, accepting both HTTP and HTTPS
+      #  - One for generic websites that only accept HTTPS
+      #  - Two for Zope-based websites
      if rewrite_rule:
        # We check if we have a zope slave. It requires different rewrite
        # rule structure.
@@ -154,7 +155,10 @@ class Recipe(BaseSlapRecipe):
          rewrite_rule_path = "%s %s" % (domain, slave_instance.get('path', ''))
          rewrite_rule_zope_path_list.append(rewrite_rule_path)
        else:
-          rewrite_rule_list.append(rewrite_rule)
+          if https_only:
+            rewrite_rule_https_only_list.append(rewrite_rule)
+          else:
+            rewrite_rule_list.append(rewrite_rule)

    # Certificate stuff
    valid_certificate_str = self.parameter_dict.get("domain_ssl_ca_cert")
@@ -186,6 +190,7 @@ class Recipe(BaseSlapRecipe):
        plain_http_port=frontend_plain_http_port_number,
        name=frontend_domain_name,
        rewrite_rule_list=rewrite_rule_list,
+        rewrite_rule_https_only_list=rewrite_rule_https_only_list,
        rewrite_rule_zope_list=rewrite_rule_zope_list,
        rewrite_rule_zope_path_list=rewrite_rule_zope_path_list,
        key=key, certificate=certificate)
@@ -279,29 +284,6 @@ class Recipe(BaseSlapRecipe):
    return "%s http://%s:%s" % \
        (domain, varnish_ip, base_varnish_port)

-  def installLogrotate(self):
-    """Installs logortate main configuration file and registers its to cron"""
-    logrotate_d = os.path.abspath(os.path.join(self.etc_directory,
-      'logrotate.d'))
-    self._createDirectory(logrotate_d)
-    logrotate_backup = self.createBackupDirectory('logrotate')
-    logrotate_conf = self.createConfigurationFile("logrotate.conf",
-        "include %s" % logrotate_d)
-    logrotate_cron = os.path.join(self.cron_d, 'logrotate')
-    state_file = os.path.join(self.data_root_directory, 'logrotate.status')
-    open(logrotate_cron, 'w').write('0 0 * * * %s -s %s %s' %
-        (self.options['logrotate_binary'], state_file, logrotate_conf))
-    self.path_list.extend([logrotate_d, logrotate_conf, logrotate_cron])
-    return logrotate_d, logrotate_backup
-
-  def registerLogRotation(self, name, log_file_list, postrotate_script):
-    """Register new log rotation requirement"""
-    open(os.path.join(self.logrotate_d, name), 'w').write(
-        self.substituteTemplate(self.getTemplateFilename(
-          'logrotate_entry.in'),
-          dict(file_list=' '.join(['"'+q+'"' for q in log_file_list]),
-            postrotate=postrotate_script, olddir=self.logrotate_backup)))
-
  def requestCertificate(self, name):
    hash = hashlib.sha512(name).hexdigest()
    key = os.path.join(self.ca_private, hash + self.ca_key_ext)
@@ -418,8 +400,7 @@ class Recipe(BaseSlapRecipe):
  def _getApacheConfigurationDict(self, name, ip_list, port):
    apache_conf = dict()
    apache_conf['server_name'] = name
-    apache_conf['pid_file'] = os.path.join(self.run_directory,
-        name + '.pid')
+    apache_conf['pid_file'] = self.options['pid-file']
    apache_conf['lock_file'] = os.path.join(self.run_directory,
        name + '.lock')
    apache_conf['document_root'] = os.path.join(self.data_root_directory,
@@ -429,13 +410,8 @@ class Recipe(BaseSlapRecipe):
    apache_conf['ip_list'] = ip_list
    apache_conf['port'] = port
    apache_conf['server_admin'] = 'admin@'
-    apache_conf['error_log'] = os.path.join(self.log_directory,
-        'frontend-apache-error.log')
-    apache_conf['access_log'] = os.path.join(self.log_directory,
-        'frontend-apache-access.log')
-    self.registerLogRotation(name, [apache_conf['error_log'],
-      apache_conf['access_log']], self.killpidfromfile + ' ' +
-      apache_conf['pid_file'] + ' SIGUSR1')
+    apache_conf['error_log'] = self.options['error-log']
+    apache_conf['access_log'] = self.options['access-log']
    return apache_conf

  def installVarnishCache(self, name, ip, port, control_port, backend_host,
@@ -517,10 +493,13 @@ class Recipe(BaseSlapRecipe):
                            port=4443, plain_http_port=8080,
                            rewrite_rule_list=None,
                            rewrite_rule_zope_list=None,
+                            rewrite_rule_https_only_list=None,
                            rewrite_rule_zope_path_list=None,
                            access_control_string=None):
    if rewrite_rule_list is None:
      rewrite_rule_list = []
+    if rewrite_rule_https_only_list is None:
+      rewrite_rule_zope_path_list = []
    if rewrite_rule_zope_list is None:
      rewrite_rule_zope_list = []
    if rewrite_rule_zope_path_list is None:
@@ -571,15 +550,22 @@ class Recipe(BaseSlapRecipe):
    self.path_list.append(backup_cron)

    # Create configuration file and rewritemaps
-    apachemap_name = "apachemap.txt"
-    apachemapzope_name = "apachemapzope.txt"
-    apachemapzopepath_name = "apachemapzopepath.txt"
-
-    self.createConfigurationFile(apachemap_name, "\n".join(rewrite_rule_list))
-    self.createConfigurationFile(apachemapzope_name,
-        "\n".join(rewrite_rule_zope_list))
-    self.createConfigurationFile(apachemapzopepath_name,
-        "\n".join(rewrite_rule_zope_path_list))
+    apachemap_path = self.createConfigurationFile(
+        "apache_rewritemap_generic.txt",
+        "\n".join(rewrite_rule_list)
+    )
+    apachemap_httpsonly_path = self.createConfigurationFile(
+        "apache_rewritemap_httpsonly.txt",
+        "\n".join(rewrite_rule_https_only_list)
+    )
+    apachemap_zope_path = self.createConfigurationFile(
+        "apache_rewritemap_zope.txt",
+        "\n".join(rewrite_rule_zope_list)
+    )
+    apachemap_zopepath_path = self.createConfigurationFile(
+        "apache_rewritemap_zopepath.txt",
+        "\n".join(rewrite_rule_zope_path_list)
+    )

    apache_conf = self._getApacheConfigurationDict(name, ip_list, port)
    apache_conf['ssl_snippet'] = self.substituteTemplate(
@@ -606,9 +592,10 @@ class Recipe(BaseSlapRecipe):

    apache_conf.update(**dict(
      path_enable=path,
-      apachemap_path=os.path.join(self.etc_directory, apachemap_name),
-      apachemapzope_path=os.path.join(self.etc_directory, apachemapzope_name),
-      apachemapzopepath_path=os.path.join(self.etc_directory, apachemapzopepath_name),
+      apachemap_path=apachemap_path,
+      apachemap_httpsonly_path=apachemap_httpsonly_path,
+      apachemapzope_path=apachemap_zope_path,
+      apachemapzopepath_path=apachemap_zopepath_path,
      apache_domain=name,
      https_port=port,
      plain_http_port=plain_http_port,

--- a/slapos/recipe/apache_frontend/template/apache.conf.in
+++ b/slapos/recipe/apache_frontend/template/apache.conf.in
@@ -22,7 +22,7 @@ ServerTokens Prod

 # Log configuration
 ErrorLog "%(error_log)s"
-LogLevel warn
+LogLevel info
 LogFormat "%%h %%{REMOTE_USER}i %%{Host}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
 LogFormat "%%h %%{REMOTE_USER}i %%{Host}i %%l %%u %%t \"%%r\" %%>s %%b" common
 CustomLog "%(access_log)s" common
@@ -60,8 +60,8 @@ BrowserMatch "RealPlayer 4\.0" force-response-1.0
 BrowserMatch "Java/1\.0" force-response-1.0
 BrowserMatch "JDK/1\.0" force-response-1.0
 # The following directive disables redirects on non-GET requests for
-# a directory that does not include the trailing slash.  This fixes a 
-# problem with Microsoft WebFolders which does not appropriately handle 
+# a directory that does not include the trailing slash.  This fixes a
+# problem with Microsoft WebFolders which does not appropriately handle
 # redirects for folders with DAV methods.
 # Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
 BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
@@ -84,7 +84,7 @@ MCacheRemovalAlgorithm LRU
 AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/x-javascript application/javascript
 BrowserMatch ^Mozilla/4 gzip-only-text/html
 BrowserMatch ^Mozilla/4\.0[678] no-gzip
-BrowserMatch \bMSIE !no-gzip !gzip-only-text/html 
+BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
 # Make sure proxies don't deliver the wrong content
 Header append Vary User-Agent

@@ -104,10 +104,12 @@ Header append Vary User-Agent
  # or changed when slapgrid is ran. It can be freely customized by node admin.
  Include %(custom_apache_virtualhost_conf)s

-  # Define the two RewriteMaps (key -> value store): one for Zope, one generic
+  # Define the 3 RewriteMaps (key -> value store): one for Zope, one generic,
+  # one generic https only,
  # containing: rewritten URL -> original URL (a.k.a VirtualHostBase in Zope)
  RewriteMap apachemapzope txt:%(apachemapzope_path)s
  RewriteMap apachemapgeneric txt:%(apachemap_path)s
+  RewriteMap apachemapgenerichttpsonly txt:%(apachemap_httpsonly_path)s

  # Define another RewriteMap for Zope, containing:
  # rewritten URL -> VirtualHostRoot
@@ -123,20 +125,32 @@ Header append Vary User-Agent
  RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >""
  # We suppose that Apache listens to 443 (even indirectly thanks to things like iptables)
  RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P]
+  # Same for https only server
+  RewriteCond ${apachemapgenerichttpsonly:%%{SERVER_NAME}} >""
+  # We suppose that Apache listens to 443 (even indirectly thanks to things like iptables)
+  RewriteRule ^/(.*)$ ${apachemapgenerichttpsonly:%%{SERVER_NAME}}/$1 [L,P]

  # If nothing exist : put a nice error
  ErrorDocument 404 /notfound.html
 </VirtualHost>

+
+# Only accept generic (i.e not Zope) backends on http
 <VirtualHost *:%(plain_http_port)s>
-  RewriteEngine On
+  SSLProxyEngine on
+  # Rewrite part
+  ProxyVia On
  ProxyPreserveHost On
+  ProxyTimeout 600
+  RewriteEngine On
+
+  # Remove "Secure" from cookies, as backend may be https
+  Header edit Set-Cookie "(?i)^(.+);secure$" "$1"

  # Include configuration file not operated by slapos. This file won't be erased
  # or changed when slapgrid is ran. It can be freely customized by node admin.
  Include %(custom_apache_virtualhost_conf)s

-  # We accept generic (i.e not lamp) backends on http
  RewriteMap apachemapgeneric txt:%(apachemap_path)s
  RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >""
  RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P]
@@ -147,6 +161,7 @@ Header append Vary User-Agent
  RewriteRule ^/(.*)$ https://%%{SERVER_NAME}%%{REQUEST_URI}
 </VirtualHost>

+
 # Include configuration file not operated by slapos. This file won't be erased
 # or changed when slapgrid is ran. It can be freely customized by node admin.
 Include %(custom_apache_conf)s
--- a/slapos/recipe/apachephp/__init__.py
+++ b/slapos/recipe/apachephp/__init__.py
@@ -101,6 +101,9 @@ class Recipe(GenericBaseRecipe):
                              mysql_ip=self.options['mysql-host'],
                              mysql_port=self.options['mysql-port'],
                              secret_key=secret_key,
+                              ip='[%s]' % self.options['ip'],
+                              port=self.options['port'],
+                              # XXX-Cedric: add frontend url.
                             )

      directory, file_ = os.path.split(self.options['configuration'])

--- a/slapos/recipe/apachephpconfigure/__init__.py
+++ b/slapos/recipe/apachephpconfigure/__init__.py
+##############################################################################
+#
+# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+import zc.buildout
+import sys
+import zc.recipe.egg
+
+class Recipe(GenericBaseRecipe):
+  def install(self):
+    """
+    Taken out from the old "lamp" recipe. Allows do configure a LAMP instance.
+    """
+    self.path_list = []
+
+    document_root = self.options['htdocs']
+    url = self.options.get('url', '')
+    mysql_conf = {'mysql_host': self.options['mysql-host'],
+                  'mysql_port': self.options['mysql-port'],
+                  'mysql_user': self.options['mysql-username'],
+                  'mysql_password': self.options['mysql-password'],
+                  'mysql_database': self.options['mysql-database'],
+                 }
+    self.configureInstallation(document_root, url, mysql_conf)
+
+    return self.path_list
+
+  def configureInstallation(self, document_root, url, mysql_conf):
+    """Start process which can launch python scripts, move or remove files or
+    directories when installing software.
+    """
+    if not self.options.has_key('delete') and not self.options.has_key('rename') and not\
+        self.options.has_key('chmod') and not self.options.has_key('script') and not self.options.has_key('sql-script'):
+      return ""
+    delete = []
+    chmod = []
+    data = []
+    rename = []
+    rename_list = ""
+    argument = [self.options['lampconfigure'], "-H", mysql_conf['mysql_host'], "-P", mysql_conf['mysql_port'],
+                             "-p", mysql_conf['mysql_password'], "-u", mysql_conf['mysql_user']]
+    if not self.options.has_key('file_token'):
+      argument = argument + ["-d", mysql_conf['mysql_database'],
+                             "--table", self.options['table_name'].strip(), "--cond",
+                             self.options.get('constraint', '1').strip()]
+    else:
+      argument = argument + ["-f", self.options['file_token'].strip()]
+    argument += ["-t", document_root]
+
+    if self.options.has_key('delete'):
+      delete = ["delete"]
+      for fname in self.options['delete'].split(','):
+        delete.append(fname.strip())
+    if self.options.has_key('rename'):
+      for fname in self.options['rename'].split(','):
+        if fname.find("=>") < 0:
+          old_name = fname
+          fname = []
+          fname.append(old_name)
+          fname.append(old_name + '-' + mysql_conf['mysql_user'])
+        else:
+          fname = fname.split("=>")
+        cmd = ["rename"]
+        if self.options.has_key('rename_chmod'):
+          cmd += ["--chmod", self.options['rename_chmod'].strip()]
+        rename.append(cmd + [fname[0].strip(), fname[1].strip()])
+        rename_list += fname[0] + " to " + fname[1] + " "
+    if self.options.has_key('chmod'):
+      chmod = ["chmod", self.options['mode'].strip()]
+      for fname in self.options['chmod'].split(','):
+        chmod.append(fname.strip())
+    if self.options.has_key('script') and \
+        self.options['script'].strip().endswith(".py"):
+      data = ["run", self.options['script'].strip(), "-v", mysql_conf['mysql_database'], url, document_root]
+    if self.options.has_key('sql-script'):
+      data = ["sql", self.options['sql-script'].strip(), "-v", mysql_conf['mysql_database'], url, document_root]
+
+
+    # TODO factor
+    if delete != []:
+      print "Creating lampconfigure with 'delete' arguments"
+      command = argument + delete
+    if rename != []:
+      for parameters in rename:
+        print "Creating lampconfigure with 'rename' arguments"
+        command = argument + rename
+    if chmod != []:
+      print "Creating lampconfigure with 'chmod' arguments"
+      command = argument + chmod
+    if data != []:
+      print "Creating lampconfigure with 'run' arguments"
+      command = argument + data
+
+
+    configureinstall_wrapper_path = self.createPythonScript(
+        self.options['configureinstall-location'],
+        __name__ + '.runner.executeRunner',
+        [argument, delete, rename, chmod, data]
+    )
+    
+    #TODO finish to port this and remove upper one
+    #configureinstall_wrapper_path = self.createPythonScript(
+    #    self.options['configureinstall-location'],
+    #    'slapos.lamp.run',
+    #    [command]
+    #)
+    self.path_list.append(configureinstall_wrapper_path)
+
+    return rename_list
--- a/slapos/recipe/apachephpconfigure/runner.py
+++ b/slapos/recipe/apachephpconfigure/runner.py
+import subprocess
+
+def executeRunner(args):
+  """Start the instance configure. this may run a python script, move or/and rename
+  file or directory when dondition is filled. the condition may be when file exist or when an entry
+  exist into database.
+  """
+  arguments, delete, rename, chmod, data = args
+  if delete != []:
+    print "Calling lampconfigure with 'delete' arguments"
+    result = subprocess.Popen(arguments + delete)
+    result.wait()
+  if rename != []:
+    for parameters in rename:
+      print "Calling lampconfigure with 'rename' arguments"
+      result = subprocess.Popen(arguments + parameters)
+      result.wait()
+  if chmod != []:
+    print "Calling lampconfigure with 'chmod' arguments"
+    result = subprocess.Popen(arguments + chmod)
+    result.wait()
+  if data != []:
+    print "Calling lampconfigure with 'run' arguments"
+    print arguments + data
+    result = subprocess.Popen(arguments + data)
+    result.wait()
+    return
+
--- a/slapos/recipe/check_page_content/__init__.py
+++ b/slapos/recipe/check_page_content/__init__.py
@@ -38,6 +38,7 @@ class Recipe(GenericBaseRecipe):
      'url': self.options['url'],
      'shell_path': self.options['dash_path'],
      'curl_path': self.options['curl_path'],
+      'match': self.options.get('match', self.options['url'])
    }

    # XXX-Cedric in this script, curl won't check certificate

--- a/slapos/recipe/check_page_content/template/check_page_content.in
+++ b/slapos/recipe/check_page_content/template/check_page_content.in
@@ -3,13 +3,14 @@
 # BEWARE: It will be overwritten automatically

 URL="%(url)s"
+MATCH="%(match)s"

 if [ -z $URL ]; then
  echo "No URL specified." >&2
  exit 3
 fi

-%(curl_path)s -k -sL $URL | grep "$URL" > /dev/null
+%(curl_path)s -k -sL $URL | grep "$MATCH" > /dev/null

 if [ $? != 0 ]; then
  echo "Content at $URL seems to be corrupted" >&2

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

 BUFFER_SIZE = 1024

+# XXX-Cedric: For god's sake, why do we always reinvent the wheel???
+# DON'T use this and use h.r.download, except if you need the "confirm" feature.
+
+# XXX-Cedric: implement "confirm" feature in h.r.download
+
 def service(args):
    environ = os.environ.copy()
    environ.update(PATH=args['path'])

--- a/slapos/recipe/lampgeneric/__init__.py
+++ b/slapos/recipe/lampgeneric/__init__.py
+##############################################################################
+#
+# Copyright (c) 2013 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 zc.buildout
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+  # XXX-Cedric: write docstring
+
+  def install(self):
+    path_list = []
+
+    # Download and unpack 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
+      self.download(htdocs_location)
+
+    # Install php.ini
+    php_ini = self.createFile(os.path.join(self.options['php-ini-dir'],
+                                           'php.ini'),
+      self.substituteTemplate(self.getTemplateFilename('php.ini.in'),
+        dict(tmp_directory=self.options['tmp-dir']))
+    )
+    path_list.append(php_ini)
+
+    # 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'],
+      php_ini_dir=self.options['php-ini-dir'],
+    )
+    httpd_conf = self.createFile(self.options['httpd-conf'],
+      self.substituteTemplate(self.getTemplateFilename('apache.in'),
+                              apache_config)
+    )
+    path_list.append(httpd_conf)
+
+    wrapper = self.createWrapper(name=self.options['wrapper'],
+                                 command=self.options['httpd-binary'],
+                                 parameters=[
+                                     '-f',
+                                     self.options['httpd-conf'],
+                                     '-DFOREGROUND'
+                                     ])
+    path_list.append(wrapper)
+
+
+    return path_list
--- a/slapos/recipe/lampgeneric/template/apache.in
+++ b/slapos/recipe/lampgeneric/template/apache.in
+# Apache static configuration
+# Automatically generated
+
+# Basic server configuration
+PidFile "%(pid_file)s"
+Listen %(ip)s:%(port)s
+PHPINIDir %(php_ini_dir)s
+ServerAdmin someone@email
+DefaultType text/plain
+TypesConfig conf/mime.types
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+AddType application/x-httpd-php .php .phtml .php5 .php4
+AddType application/x-httpd-php-source .phps
+
+# Log configuration
+ErrorLog "%(error_log)s"
+LogLevel warn
+LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
+LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common
+CustomLog "%(access_log)s" common
+
+# Directory protection
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Require all denied
+</Directory>
+
+<Directory %(document_root)s>
+  Options FollowSymLinks
+  AllowOverride All
+  Require all granted
+</Directory>
+DocumentRoot %(document_root)s
+DirectoryIndex index.html index.php
+
+# List of modules
+LoadModule unixd_module modules/mod_unixd.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule dav_module modules/mod_dav.so
+LoadModule dav_fs_module modules/mod_dav_fs.so
+LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule php5_module modules/libphp5.so
+LoadModule alias_module modules/mod_alias.so
--- a/slapos/recipe/lampgeneric/template/php.ini.in
+++ b/slapos/recipe/lampgeneric/template/php.ini.in
+[PHP]
+engine = On
+safe_mode = Off
+expose_php = Off
+error_reporting = E_ALL & ~(E_DEPRECATED|E_NOTICE|E_WARNING)
+display_errors = On
+display_startup_errors = Off
+log_errors = On
+log_errors_max_len = 1024
+ignore_repeated_errors = Off
+ignore_repeated_source = Off
+session.save_path = "%(tmp_directory)s"
+session.auto_start = 0
+date.timezone = Europe/Paris
+file_uploads = On
+upload_max_filesize = 8M
+post_max_size = 8M
+magic_quotes_gpc=Off
--- a/slapos/recipe/librecipe/generic.py
+++ b/slapos/recipe/librecipe/generic.py
@@ -32,6 +32,7 @@ import os
 import sys
 import inspect
 import re
+import shutil
 import urllib
 import urlparse

@@ -226,3 +227,30 @@ class GenericBaseRecipe(object):
    url = urlparse.urlunparse((scheme, netloc, path, params, query, fragment))

    return url
+
+  def setLocationOption(self):
+    if not self.options.get('location'):
+      self.options['location'] = os.path.join(
+          self.buildout['buildout']['parts-directory'], self.name)
+
+  def download(self, destination=None):
+    """ A simple wrapper around h.r.download, downloading to self.location"""
+    self.setLocationOption()
+
+    import hexagonit.recipe.download
+    if not destination:
+      destination = self.location
+    if os.path.exists(destination):
+        # leftovers from a previous failed attempt, removing it.
+        log.warning('Removing already existing directory %s' % destination)
+        shutil.rmtree(destination)
+    os.mkdir(destination)
+
+    try:
+      options = self.options.copy()
+      options['destination'] = destination
+      hexagonit.recipe.download.Recipe(
+          self.buildout, self.name, options).install()
+    except:
+      shutil.rmtree(destination)
+      raise
--- a/slapos/recipe/pbs.py
+++ b/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)

--- a/slapos/recipe/publish.py
+++ b/slapos/recipe/publish.py
@@ -28,6 +28,8 @@ import zc.buildout
 from slapos.recipe.librecipe import wrap
 from slapos.recipe.librecipe import GenericSlapRecipe

+CONNECTION_PARAMETER_STRING = 'connection-'
+
 class Recipe(GenericSlapRecipe):
  def _install(self):
    publish_dict = dict()
@@ -47,3 +49,26 @@ SERIALISED_MAGIC_KEY = '_'
 class Serialised(Recipe):
  def _setConnectionDict(self, publish_dict):
    return super(Serialised, self)._setConnectionDict(wrap(publish_dict))
+
+
+
+class PublishSection(GenericSlapRecipe):
+  """
+  Take a list of "request" sections, and publish every connection parameter.
+  
+  Input:
+    section-list: String, representing the list of sections to fetch
+                  parameters to publish, in order, separated by a space.
+  """
+  def _install(self):
+    publish_dict = dict()
+    for section in self.options['section-list'].strip().split():
+      section = section.strip()
+      options = self.buildout[section].copy()
+      for k, v in options.iteritems():
+        if k.startswith(CONNECTION_PARAMETER_STRING):
+          print k, v
+          publish_dict[k.lstrip(CONNECTION_PARAMETER_STRING)] = v
+    self.setConnectionDict(publish_dict)
+    return []
+
--- a/slapos/recipe/request.py
+++ b/slapos/recipe/request.py
@@ -195,7 +195,7 @@ class RequestOptional(Recipe):
      self.logger.warning('Optional request failed.')
      if not isinstance(self._raise_request_exception, slapmodule.NotFoundError):
        # full traceback for optional 'not found' is too verbose and confusing
-        self.logger.warning(self._raise_request_exception_formatted)
+        self.logger.debug(self._raise_request_exception_formatted)
    elif self.failed is not None:
      # Check instance status to know if instance has been deployed
      try:
@@ -203,7 +203,7 @@ class RequestOptional(Recipe):
          status = self.instance.getState()
        else:
          status = 'not ready yet'
-      except (slapmodule.NotFoundError, slapmodule.ServerError):
+      except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady):
        status = 'not ready yet'
      except AttributeError:
        status = 'unknown'
@@ -215,7 +215,6 @@ class RequestOptional(Recipe):

  update = install

-
 class Serialised(Recipe):
  def _filterForStorage(self, partition_parameter_kw):
    return wrap(partition_parameter_kw)
@@ -225,3 +224,39 @@ class Serialised(Recipe):
      return json.loads(instance.getConnectionParameter(JSON_SERIALISED_MAGIC_KEY))
    except slapmodule.NotFoundError:
      return {}
+
+
+
+
+CONNECTION_PARAMETER_STRING = 'connection-'
+
+class RequestEdge(Recipe):
+  """
+  For each country in country-list, do a request.
+  """
+  def __init__(self, buildout, name, options):
+    self.logger = logging.getLogger(name)
+    self.options = options
+    self.request_dict = {}
+    # Keep a copy of original options dict
+    original_options = options.copy()
+    for country in options['country-list'].split(','):
+      # Request will have its own copy of options dict
+      local_options = original_options.copy()
+      local_options['name'] = '%s-%s' % (country, name)
+      local_options['sla'] = "region"
+      local_options['sla-region'] = country
+      
+      self.request_dict[country] = Recipe(buildout, name, local_options)
+      # "Bubble" all connection parameters
+      for option, value in local_options.iteritems():
+        if option.startswith(CONNECTION_PARAMETER_STRING):
+          self.options['%s-%s' % (option, country)] = value
+
+  def install(self):
+    for country, request in self.request_dict.iteritems():
+      request.install()
+    return []
+
+  update = install
+
--- a/slapos/recipe/reverse_proxy_nginx/__init__.py
+++ b/slapos/recipe/reverse_proxy_nginx/__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 operator
+from slapos.recipe.librecipe import GenericSlapRecipe
+import zc.buildout
+
+class Recipe(GenericSlapRecipe):
+  def _install(self):
+    path_list = []
+
+    # Check for mandatory arguments
+    domain_name = self.options['domain']
+    if not domain_name:
+      raise zc.buildout.UserError('No domain name specified. Please define '
+          'the "domain" instance parameter.')
+
+    # XXX: add HTTP support
+    #https_port_number = self.options['https-port']
+    #http_port_number = self.options['http-port']
+
+    # Parse list of slaves
+    slave_instance_list = sorted(self.options['slave-instance-list'],
+                                 key=operator.itemgetter('slave_reference'))
+
+    # Now, we only take first instance and only use this one.
+    # XXX: TODO real implementation of slaves
+    zimbra_slave_instance = slave_instance_list[0]
+
+    # Generate Nginx configuration
+    nginx_configuration_dict = {
+      'listen-local-ipv4': self.options['ipv4'],
+      'listen-global-ipv6': '[%s]' % self.options['ipv6'],
+      'domain-name': domain_name,
+      'smtp-port-number': self.options['smtp-port'],
+      'error-log': self.options['error-log'],
+      'access-log': self.options['access-log'],
+      'htdocs': self.options['htdocs'],
+      'smtp-upstream-host': zimbra_slave_instance['smtp-upstream-host'],
+      'smtp-upstream-port': zimbra_slave_instance['smtp-upstream-port'],
+    }
+    nginx_configuration_file = self.createFile(
+        self.options['configuration-file'],
+        self.substituteTemplate(self.getTemplateFilename('nginx.conf.in'),
+        nginx_configuration_dict)
+    )
+    path_list.append(nginx_configuration_file)
+    
+    # Generate Nginx wrapper
+    wrapper = self.createWrapper(
+        name=self.options['wrapper'],
+        command=self.options['nginx-executable'],
+        parameters=[
+            '-c', self.options['configuration-file'],
+            '-p', self.options['home-directory']
+        ]
+    )
+
+    # TODO: reload configuration or have feature like apache_map
+
+    # Send connection informations about each slave
+    for slave_instance in slave_instance_list:
+      reference = slave_instance.get("slave_reference")
+      self.logger.debug('Sending connection parameters of slave '
+          'instance: %s' % reference)
+      try:
+        connection_dict = {
+            'listening-ipv6': self.options['ipv6'],
+            # Arbitrary, as the instance doesn't know its public IP.
+            'listening-ipv4': self.options['public-ipv4'],
+            # XXX-TODO
+            #'site_url': url,
+        }
+        self.setConnectionDict(connection_dict, reference)
+      except:
+        self.logger.fatal("Error while sending slave %s informations: %s",
+            reference, traceback.format_exc())
+
+    return path_list
--- a/slapos/recipe/reverse_proxy_nginx/template/nginx.conf.in
+++ b/slapos/recipe/reverse_proxy_nginx/template/nginx.conf.in
+daemon off;
+worker_processes 1;
+
+#XXX-Cedric: TODO separate the different logs
+error_log %(error-log)s info;
+
+events {
+        worker_connections 1024;
+        use epoll;
+}
+
+http {
+        log_format main
+                '$remote_addr - $remote_user [$time_local] '
+                '"$request" $status $bytes_sent '
+                '"$http_referer" "$http_user_agent" '
+                '"$gzip_ratio"';
+
+        server {
+                listen %(listen-local-ipv4)s:8008;
+                server_name localhost;
+                access_log %(access-log)s main;
+                error_log %(error-log)s info;
+
+                root %(htdocs)s;
+
+                location ~ $ {
+                        add_header Auth-Server %(smtp-upstream-host)s;
+                        add_header Auth-Port %(smtp-upstream-port)s;
+                        return 200;
+                }
+        }
+}
+
+mail {
+        server_name %(domain-name)s;
+
+        auth_http %(listen-local-ipv4)s:8008;
+
+        server {
+                listen %(listen-local-ipv4)s:%(smtp-port-number)s;
+                listen %(listen-global-ipv6)s:%(smtp-port-number)s;
+                protocol smtp;
+                timeout 5s;
+                proxy on;
+                xclient off;
+                smtp_auth none;
+        }
+}
--- a/slapos/recipe/softwaretype.py
+++ b/slapos/recipe/softwaretype.py
@@ -116,7 +116,7 @@ class Recipe:
    for parameter, value in self.parameter_dict.items():
      # All parameters evaluating to False are... False, and shouldn't
      # convey any information.
-      # Here, all those parameters are set to empty string.
+      # Here, all those parameters are simply ignored.
      if value:
        if isinstance(value, str):
          buildout.set('slap-parameter', parameter, value)

--- a/slapos/recipe/symbolic_link.py
+++ b/slapos/recipe/symbolic_link.py
@@ -51,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))

--- a/slapos/recipe/wrapper.py
+++ b/slapos/recipe/wrapper.py
@@ -30,25 +30,34 @@ import shlex
 from slapos.recipe.librecipe import GenericBaseRecipe

 class Recipe(GenericBaseRecipe):
-
    def install(self):
-
        command_line = shlex.split(self.options['command-line'])
-
+        wrapper_path = self.options['wrapper-path']
        wait_files = self.options.get('wait-for-files')
+        environment = self.options.get('environment')
+        parameters_extra = self.options.get('parameters_extra')
+
+        if not wait_files and not environment:
+          # Create a simple wrapper as shell script
+          return [self.createWrapper(
+             name=wrapper_path,
+             command=command_line[0],
+             parameters=command_line[1:],
+             parameters_extra=parameters_extra,
+          )]
+
+        # More complex needs: create a Python script as wrapper
+
        if wait_files is not None:
            wait_files = [filename.strip() for filename in wait_files.split()
                          if filename.strip()]
-
-        environment = self.options.get('environment')
        if environment is not None:
            environment = dict((k.strip(), v.strip()) for k, v in [
                             line.split('=')
                             for line in environment.split('\n')
                           ])
-
        return [self.createPythonScript(
-            self.options['output'],
+            wrapper_path,
            'slapos.recipe.librecipe.execute.generic_exec',
            (command_line, wait_files, environment,),
        )]
--- a/slapos/recipe/zimbra_kvm/__init__.py
+++ b/slapos/recipe/zimbra_kvm/__init__.py
+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+import sys
+
+class Recipe(GenericBaseRecipe):
+  """
+  kvm instance configuration.
+  """
+  def install(self):
+    config = dict(
+      vnc_ip=self.options['vnc-ip'],
+      vnc_port=self.options['vnc-port'],
+      boot_disk_path=self.options['boot-disk-path'],
+      disk_path=self.options['data-disk-path'],
+      disk_size=self.options['data-disk-size'],
+      disk_type=self.options['data-disk-type'],
+      mac_address=self.options['mac-address'],
+      smp_count=self.options['smp-count'],
+      ram_size=self.options['ram-size'],
+      socket_path=self.options['socket-path'],
+      pid_file_path=self.options['pid-path'],
+      python_path=sys.executable,
+      shell_path=self.options['shell-path'],
+      qemu_path=self.options['qemu-path'],
+      qemu_img_path=self.options['qemu-img-path'],
+      vnc_passwd=self.options['passwd']
+    )
+
+    # Runners
+    runner_path = self.createExecutable(
+      self.options['runner-path'],
+      self.substituteTemplate(self.getTemplateFilename('kvm_run.in'), config))
+
+    controller_path = self.createExecutable(
+      self.options['controller-path'],
+      self.substituteTemplate(self.getTemplateFilename('kvm_controller_run.in'),
+                              config))
+
+
+    return [runner_path, controller_path]
--- a/slapos/recipe/zimbra_kvm/template/kvm_controller_run.in
+++ b/slapos/recipe/zimbra_kvm/template/kvm_controller_run.in
+#!%(python_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+
+# Echo client program
+import socket
+import time
+
+# Connect to KVM qmp socket
+so = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+connected = False
+while not connected:
+  try:
+    so.connect('%(socket_path)s')
+  except socket.error:
+    time.sleep(1)
+  else:
+    connected = True
+data = so.recv(1024)
+
+# Enable qmp
+so.send('{ "execute": "qmp_capabilities" }')
+data = so.recv(1024)
+
+# Set VNC password
+so.send('{ "execute": "change", ' \
+        '"arguments": { "device": "vnc", "target": "password", ' \
+        '               "arg": "%(vnc_passwd)s" } }')
+data = so.recv(1024)
+
+# Finish
+so.close()
--- a/slapos/recipe/zimbra_kvm/template/kvm_run.in
+++ b/slapos/recipe/zimbra_kvm/template/kvm_run.in
+#!%(python_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+
+# Echo client program
+import os
+import socket
+import subprocess
+
+def getSocketStatus(host, port):
+  s = None
+  for res in socket.getaddrinfo(host, port,
+      socket.AF_UNSPEC, socket.SOCK_STREAM):
+    af, socktype, proto, canonname, sa = res
+    try:
+      s = socket.socket(af, socktype, proto)
+    except socket.error, msg:
+      s = None
+      continue
+    try:
+      s.connect(sa)
+    except socket.error, msg:
+      s.close()
+      s = None
+      continue
+    break
+  return s
+
+# create disk if doesn't exist
+disk_path = '%(disk_path)s'
+if not os.path.exists(disk_path):
+  subprocess.Popen(['%(qemu_img_path)s', 'create' ,'-f', 'qcow2',
+      disk_path, '%(disk_size)sG'])
+
+# Generate NAT rules
+nat_rules = ",".join("hostfwd=tcp:%(vnc_ip)s:%%s-:%%s" %% (port, port) for port in [25, 80, 110, 143, 443, 465, 587, 993, 995, 7071])
+
+kvm_argument_list = ['%(qemu_path)s',
+  '-enable-kvm', '-net', 'nic,macaddr=%(mac_address)s',
+  '-net', 'user,hostfwd=tcp:%(vnc_ip)s:2222-:22,%%s' %% nat_rules,
+  '-smp', '%(smp_count)s',
+  '-m', '%(ram_size)s',
+  '-drive', 'file=%(disk_path)s,if=%(disk_type)s',
+  #'-drive', 'file=%(boot_disk_path)s,if=%(disk_type)s',
+  '-vnc', '%(vnc_ip)s:1,ipv4,password',
+  '-boot', 'menu=on',
+  '-qmp', 'unix:%(socket_path)s,server',
+  '-pidfile', '%(pid_file_path)s',
+]
+
+os.execv('%(qemu_path)s', kvm_argument_list)
--- a/software/apache-frontend/README.apache_frontend.txt
+++ b/software/apache-frontend/README.apache_frontend.txt
@@ -83,6 +83,7 @@ port
 Port used by Apache. Optional parameter, defaults to 4443.

 plain_http_port
+~~~~~~~~~~~~~~~
 Port used by apache to serve plain http (only used to redirect to https).
 Optional parameter, defaults to 8080.

@@ -117,6 +118,13 @@ Domain name to use as frontend. The frontend will be accessible from this domain
 [instancereference].[masterdomain].
 Example: www.mycustomdomain.com

+https-only
+~~~~~~~~~~
+Specify if website should be accessed using https only. If so, the frontend
+will redirect the user to https if accessed from http.
+Possible values: "true", "false".
+This is an optional parameter. Defaults to false.
+
 path
 ~~~~
 Only used if type is "zope".
@@ -192,7 +200,12 @@ Notes
 =====

 It is not possible with slapos to listen to port <= 1024, because process are
-not run as root. It is a good idea then to go on the node where the instance is
+not run as root.
+
+Solution 1 (IPv4 only)
+----------------------
+
+It is a good idea then to go on the node where the instance is
 and set some iptables rules like (if using default ports)::

  iptables -t nat -A PREROUTING -p tcp -d {public_ipv4} --dport 443 -j DNAT --to-destination {listening_ipv4}:4443
@@ -200,3 +213,12 @@ and set some iptables rules like (if using default ports)::

 Where {public ip} is the public IP of your server, or at least the LAN IP to where your NAT will forward to.
 {listening ip} is the private ipv4 (like 10.0.34.123) that the instance is using and sending as connection parameter.
+
+Solution 2 (IPv6 only)
+----------------------
+
+It is also possible to directly allow the service to listen on 80 and 443 ports using the following command:
+
+  setcap 'cap_net_bind_service=+ep' /opt/slapgrid/$APACHE_FRONTEND_SOFTWARE_RELEASE_MD5/parts/apache-2.2/bin/httpd
+
+Then specify in the instance parameters "port" and "plain_http_port" to be 443 and 80, respectively.
--- a/software/apache-frontend/common.cfg
+++ b/software/apache-frontend/common.cfg
@@ -3,6 +3,7 @@ extends =
  ../../component/binutils/buildout.cfg
  ../../component/lxml-python/buildout.cfg
  ../../component/apache/buildout.cfg
+  ../../component/gzip/buildout.cfg
  ../../component/stunnel/buildout.cfg
  ../../component/varnish/buildout.cfg
  ../../component/dcron/buildout.cfg
@@ -38,14 +39,15 @@ recipe = zc.recipe.egg
 eggs = ${instance-recipe:egg}

 [eggs]
-recipe = zc.recipe.egg
+recipe = z3c.recipe.scripts
 eggs =
  ${lxml-python:egg}
+  slapos.toolbox

 [template]
 # Default template for apache instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = fea902a2b9dbf8c80ff201bcf73f9396
+md5sum = e7b9f57da7eb1450fc15789e239388d4
 output = ${buildout:directory}/template.cfg
-mode = 0644
\ No newline at end of file
+mode = 0644
--- a/software/apache-frontend/instance.cfg
+++ b/software/apache-frontend/instance.cfg
 [buildout]
 parts =
  directory
-  instance
+  apache
  configtest
+  logrotate
+  logrotate-entry-apache

 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -10,15 +12,23 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
 # Create all needed directories
 [directory]
 recipe = slapos.cookbook:mkdirectory
+
+bin = $${buildout:directory}/bin/
 etc = $${buildout:directory}/etc/
-var = $${buildout:directory}/var/
 srv = $${buildout:directory}/srv/
-bin = $${buildout:directory}/bin/
+var = $${buildout:directory}/var/
+
+backup = $${:srv}/backup
+log = $${:var}/log
+run = $${:var}/run
 service = $${:etc}/service

+logrotate-backup = $${:backup}/logrotate
+logrotate-entries = $${:etc}/logrotate.d
+

 # Deploy Apache (old way, with monolithic recipe)
-[instance]
+[apache]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 httpd_home = ${apache-2.2:location}
 httpd_binary = ${apache-2.2:location}/bin/httpd
@@ -31,9 +41,40 @@ rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
 gcc_binary = gcc
 binutils_directory = ${binutils:location}/bin/

+access-log = $${directory:log}/frontend-apache-access.log
+error-log = $${directory:log}/frontend-apache-error.log
+pid-file = $${directory:run}/httpd.pid
+

 # Create wrapper for "apachectl conftest" in bin
 [configtest]
 recipe = slapos.cookbook:wrapper
-command-line = $${instance:httpd_binary} -f $${directory:etc}/apache_frontend.conf -t
-output = $${directory:bin}/apache-configtest
+command-line = $${apache:httpd_binary} -f $${directory:etc}/apache_frontend.conf -t
+wrapper-path = $${directory:bin}/apache-configtest
+
+
+# Deploy Logrotate
+[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 = $${directory:bin}/logrotate
+conf = $${directory:etc}/logrotate.conf
+logrotate-entries = $${directory:logrotate-entries}
+backup = $${directory:logrotate-backup}
+state-file = $${directory:srv}/logrotate.status
+
+[logrotate-entry-apache]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = apache
+log = $${apache:error-log} $${apache:access-log}
+frequency = daily
+rotate-num = 30
+post = ${buildout:bin-directory}/killpidfromfile $${apache:pid-file} SIGUSR1
+sharedscripts = true
+notifempty = true
+create = true
--- a/software/apache-frontend/software.cfg
+++ b/software/apache-frontend/software.cfg
@@ -4,67 +4,101 @@ extends = common.cfg
 [versions]
 Jinja2 = 2.6
 Werkzeug = 0.8.3
+apache-libcloud = 0.12.3
+async = 0.6.1
 buildout-versions = 1.7
-hexagonit.recipe.cmmi = 1.6
+gitdb = 0.5.4
+hexagonit.recipe.cmmi = 2.0
 meld3 = 0.6.10
+pycrypto = 2.6
 rdiff-backup = 1.0.5
-slapos.cookbook = 0.71.1
-slapos.recipe.build = 0.11.5
+slapos.recipe.build = 0.11.6
+slapos.recipe.cmmi = 0.1
 slapos.recipe.template = 2.4.2
+slapos.toolbox = 0.34.0
+smmap = 0.8.2
+z3c.recipe.scripts = 1.0.1

 # Required by:
-# slapos.core==0.33.1
+# slapos.core==0.35.1
+# slapos.toolbox==0.34.0
 Flask = 0.9

 # Required by:
-# hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6nxd002
+# slapos.toolbox==0.34.0
+GitPython = 0.3.2.RC1

 # Required by:
-# slapos.cookbook==0.71.1
+# slapos.toolbox==0.34.0
+atomize = 0.1.1
+
+# Required by:
+# slapos.toolbox==0.34.0
+feedparser = 5.1.3
+
+# Required by:
+# slapos.cookbook==0.77.1
 inotifyx = 0.2.0

 # Required by:
-# slapos.cookbook==0.71.1
-# slapos.core==0.33.1
+# slapos.cookbook==0.77.1
+# slapos.core==0.35.1
 # xml-marshaller==0.9.7
-lxml = 3.0.2
+lxml = 3.1.2

 # Required by:
-# slapos.cookbook==0.71.1
+# slapos.cookbook==0.77.1
 netaddr = 0.7.10

 # Required by:
-# slapos.core==0.33.1
+# slapos.core==0.35.1
 netifaces = 0.8

 # Required by:
-# slapos.cookbook==0.71.1
-pytz = 2012j
+# slapos.toolbox==0.34.0
+paramiko = 1.10.1

 # Required by:
-# slapos.cookbook==0.71.1
-# slapos.core==0.33.1
+# slapos.toolbox==0.34.0
+psutil = 0.7.0
+
+# Required by:
+# slapos.core==0.35.1
+pyflakes = 0.7
+
+# Required by:
+# slapos.cookbook==0.77.1
+pytz = 2013b
+
+# Required by:
+# slapos.cookbook==0.77.1
+# slapos.core==0.35.1
+# slapos.toolbox==0.34.0
 # zc.buildout==1.6.0-dev-SlapOS-010
 # zc.recipe.egg==1.3.2
 setuptools = 0.6c12dev-r88846

 # Required by:
-# slapos.cookbook==0.71.1
-slapos.core = 0.33.1
+# slapos.cookbook==0.77.1
+# slapos.toolbox==0.34.0
+slapos.core = 0.35.1

 # Required by:
-# slapos.core==0.33.1
+# slapos.core==0.35.1
 supervisor = 3.0b1

 # Required by:
-# slapos.cookbook==0.71.1
-xml-marshaller = 0.9.7
+# slapos.core==0.35.1
+unittest2 = 0.5.1

 # Required by:
-# slapos.core==0.33.1
-zope.interface = 4.0.3
+# slapos.cookbook==0.77.1
+# slapos.toolbox==0.34.0
+xml-marshaller = 0.9.7

+# Required by:
+# slapos.core==0.35.1
+zope.interface = 4.0.5

 [networkcache]
 # signature certificates of the following uploaders.

--- a/software/cloudooo/software.cfg
+++ b/software/cloudooo/software.cfg
@@ -14,8 +14,6 @@ parts +=
 # Local development
  slapos.cookbook-repository
  check-recipe
-  slapos.cookbook-python2.6
-  slapos.recipe.template-python2.6
 # Create instance template
  template

@@ -38,19 +36,6 @@ stop-on-error = true
 update-command = ${:command}
 command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link

-[slapos.cookbook-python2.6]
-recipe = zc.recipe.egg
-eggs = slapos.cookbook
-scripts =
-python = python2.6
-ugly-depend-on = ${slapos.cookbook-repository:command} ${slapos.cookbook-repository:update-command}
-
-[slapos.recipe.template-python2.6]
-recipe = zc.recipe.egg
-eggs = slapos.recipe.template
-scripts =
-python = python2.6
-
 [template-jinja2-base]
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/${:filename}.in

--- a/software/helloworld/instance.cfg.in
+++ b/software/helloworld/instance.cfg.in
+#############################
+#
+# Deploy hello-world instance
+#
+#############################
+[buildout]
+parts =
+  directory
+  hello-world
+  publish-connection-parameter
+
+# Define egg directories to be the one from Software Release
+# (/opt/slapgrid/...)
+# Always the same.
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+
+[instance-parameter]
+# Fetches parameters defined in SlapOS Master for this instance.
+# Always the same.
+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}
+
+# Define default parameter(s) that will be used later, in case user didn't
+# specify it
+# All parameters are available through the configuration.XX syntax.
+# All possible parameters should have a default.
+configuration.name = anonymous
+
+
+# Create all needed directories, depending on your needs
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+# Executables put here will be started but not monitored (for startup scripts)
+script = $${:etc}/run/
+# Executables put here will be started and monitored (for daemons)
+service = $${:etc}/service
+# Executables put here will be launched after buildout has completed to see
+# if instance is running
+promise = $${:etc}/promise/
+
+
+# Create a simple shell script that will only output your name if you
+# specified it as instance parameter.
+# Usually, of course, we use more useful commands, like web servers.
+[hello-world]
+# This recipe will try to "exec" the command-line after separating parameters.
+recipe = slapos.cookbook:wrapper
+# Notice that there is only one $ at ${dash:location}, it is because it comes from the Software Release buildout profile.
+command-line = ${dash:location}/bin/dash -c 'echo "Hello $${instance-parameter:configuration.name}!"; sleep 100000;' 
+# Put this shell script in the "etc/service" directory. Every executable of this
+# repository will be started and monitored by supervisord
+wrapper-path = $${directory:service}/hello-world
+
+
+# Publish all the parameters needed for the user to connect to the instance.
+# It can be anything: URL(s), password(s), or arbitrary parameters.
+# Here we'll just echo back the entered name as instance parameter
+[publish-connection-parameter]
+recipe = slapos.cookbook:publish
+name = Hello $${instance-parameter:configuration.name}!
--- a/software/helloworld/software.cfg
+++ b/software/helloworld/software.cfg
+[buildout]
+
+extends = 
+# "slapos" stack describes basic things needed for 99.9% of SlapOS Software
+# Releases
+  ../../stack/slapos.cfg
+# Extend here component profiles, like openssl, apache, mariadb, curl...
+# Or/and extend a stack (lamp, tomcat) that does most of the work for you
+# In this example we only need the dash binary to run a simple "hello world"
+# shell script.
+  ../../component/dash/buildout.cfg
+
+parts =
+# Call installation of slapos.cookbook egg defined in stack/slapos.cfg (needed
+# in 99,9% of Slapos Software Releases)
+  slapos-cookbook
+# Call creation of instance.cfg file that will be called for deployment of
+# instance
+  template
+
+# Download instance.cfg.in (buildout profile used to deployment of instance),
+# replace all ${foo:bar} parameters by real values, and change $${foo:bar} to
+# ${foo:bar}
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg.in
+output = ${buildout:directory}/instance.cfg
+# MD5 checksum can be skipped for development, but must be filled for production
+#md5sum = 
+mode = 0644
--- a/software/hexaglobe-watermarking/common.cfg
+++ b/software/hexaglobe-watermarking/common.cfg
+[buildout]
+extends =
+  ../../component/dash/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/gzip/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/nginx/buildout.cfg
+  ../../component/openssl/buildout.cfg
+  ../../stack/slapos.cfg
+
+parts =
+  slapos-cookbook
+  watermarkingadmin
+  eggs
+  instance-profile
+
+develop =
+  ${buildout:directory}/parts/watermarkingadmin
+
+[watermarkingadmin]
+recipe = hexagonit.recipe.download
+url = http://easicloud-p.cdn.hexaglobe.net/api10.tar.gz
+#md5sum = 
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  watermarkingadmin
+  slapos.toolbox
+
+[watermarkadmin.ini.in]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/template/${:_buildout_section_name_}
+md5sum = 2edc2acd102a465a0f21d8cd982ba4bf
+download-only = true
+#filename = template.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[nginx.conf.in]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/template/${:_buildout_section_name_}
+md5sum = 7e41dfcb633ce52be42457ffd5b123d8
+download-only = true
+#filename = template.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[instance-profile]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg.in
+output = ${buildout:directory}/instance.cfg
+#md5sum = 650cd2527158734fd6ccd9ec374b5e69
+mode = 0644
+
+[watermarking-instance-profile]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-watermarking.cfg.in
+output = ${buildout:directory}/instance-watermarking.cfg
+#md5sum = 76c88bfc59bc9c2d05fa13cc960349c7
+mode = 0644
+
+[edge-instance-profile]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-edge.cfg.in
+output = ${buildout:directory}/instance-edge.cfg
+#md5sum = 650cd2527158734fd6ccd9ec374b5e69
+mode = 0644
--- a/software/hexaglobe-watermarking/development.cfg
+++ b/software/hexaglobe-watermarking/development.cfg
+[buildout]
+extends =
+  ../../component/git/buildout.cfg
+  common.cfg
+
+parts +=
+  slapos.cookbook-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 = hexaglobe-watermarking
+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
+
--- a/software/hexaglobe-watermarking/instance-edge.cfg.in
+++ b/software/hexaglobe-watermarking/instance-edge.cfg.in
+# This instance will request other instances of lamp-generic depending on a
+# list of countries.
+
+[buildout]
+
+parts =
+  request-edge
+  publish-connection-parameter
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[request-edge]
+<= slap-connection
+recipe = slapos.cookbook:request.edge
+# This magic parameter triggers several requests, one request per country.
+name = watermark
+country-list = $${slap-parameter:country-list}
+software-url = $${slap-connection:software-release-url}
+software-type = default
+return = url admin-url admin-url-ipv6
+
+[publish-connection-parameter]
+recipe = slapos.cookbook:publishsection
+section-list = request-edge
--- a/software/hexaglobe-watermarking/instance-watermarking.cfg.in
+++ b/software/hexaglobe-watermarking/instance-watermarking.cfg.in
+[buildout]
+parts =
+  directory
+  nginx
+  watermarkadmin
+  logrotate
+  logrotate-entry-nginx
+  cron
+  cron-entry-logrotate
+  watermarkadmin-promise
+  publish-connection-parameter
+
+# 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
+
+# Fetch parameters defined in SlapOS Master for this instance
+[instance-parameter]
+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}
+
+# Set default parameters
+http-port = 8080
+administration-port = 5000
+
+
+# Create needed directories
+[directory]
+recipe = slapos.cookbook:mkdirectory
+home = $${buildout:directory}
+bin = $${:home}/bin
+etc = $${:home}/etc
+srv = $${:home}/srv
+service = $${:etc}/service
+promise = $${:etc}/promise
+var = $${:home}/var
+
+backup = $${:srv}/backup
+log = $${:var}/log
+run = $${:var}/run
+
+nginx-configuration = $${:etc}/nginx
+nginx-vhost-configuration = $${:nginx-configuration}/vhost
+nginx-log = $${:home}/logs
+nginx-cache = $${:var}/cache
+nginx-temp-path = $${:srv}/nginx-proxy
+
+cron-entries = $${:etc}/cron.d
+crontabs = $${:etc}/crontabs
+cronstamps = $${:etc}/cronstamps
+
+logrotate-entries = $${:etc}/logrotate.d
+logrotate-backup = $${:backup}/logrotate
+
+
+# Deploy nginx
+[nginx-configuration]
+recipe = slapos.cookbook:configurationfile
+configuration-template-path = ${nginx.conf.in:location}/nginx.conf.in
+configuration-file-path = $${directory:nginx-configuration}/nginx.conf
+
+vhost-configuration-directory-location = $${directory:nginx-vhost-configuration}
+nginx-prefix = ${nginx-enable-sub:location}
+nginx-temp-path = $${directory:nginx-temp-path}
+pid-file = $${directory:run}/nginx.pid
+home-directory = $${directory:home}
+
+
+[nginx]
+recipe = slapos.cookbook:wrapper
+nginx-executable = $${:nginx-prefix}/sbin/nginx
+nginx-prefix = ${nginx-enable-sub:location}
+command-line = $${:nginx-executable} -c $${nginx-configuration:configuration-file-path} -p $${directory:home}
+wrapper-path = $${directory:service}/nginx
+
+
+# Deploy administration API server
+[watermarkadmin-configuration]
+recipe = slapos.cookbook:configurationfile
+configuration-template-path = ${watermarkadmin.ini.in:location}/watermarkadmin.ini.in
+configuration-file-path = $${directory:etc}/watermarkadmin.ini
+
+flask-database-location = $${directory:srv}/flask.db
+
+nginx-prefix = $${directory:home}
+nginx-port = $${instance-parameter:http-port}
+nginx-configuration-file-location = $${nginx-configuration:configuration-file-path}
+nginx-executable-location = $${nginx:nginx-executable}
+nginx-pidfile-location = $${nginx-configuration:pid-file}
+nginx-vhost-configuration-directory-location = $${directory:nginx-vhost-configuration}
+nginx-log-directory-location = $${directory:nginx-log}
+nginx-cache-directory-location = $${directory:nginx-cache}
+global-ip = $${instance-parameter:ipv6-random}
+
+[watermarkadmin]
+recipe = slapos.cookbook:wrapper
+command-line =
+  ${buildout:directory}/bin/api $${watermarkadmin-configuration:configuration-file-path}
+wrapper-path = $${directory:service}/watermarkingadmin
+
+
+# Deploy logrotate
+[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 = $${directory:bin}/logrotate
+conf = $${directory:etc}/logrotate.conf
+logrotate-entries = $${directory:logrotate-entries}
+backup = $${directory:logrotate-backup}
+state-file = $${directory:srv}/logrotate.status
+
+[logrotate-entry-nginx]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = nginx
+log = $${watermarkadmin-configuration:nginx-log-directory-location}/*.log
+frequency = daily
+rotate-num = 30
+post = ${buildout:bin-directory}/killpidfromfile $${nginx-configuration:pid-file} SIGUSR1
+sharedscripts = true
+notifempty = true
+create = true
+
+
+# Deploy cron and configure it
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = $${directory:bin}/cron_simplelogger
+log = $${directory: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}
+catcher = $${cron-simplelogger:wrapper}
+binary = $${directory:service}/crond
+
+[cron-entry-logrotate]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+command = $${logrotate:wrapper}
+
+
+
+
+# Request frontend
+[request-frontend]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = Frontend for $${slap-connection:computer-id} $${slap-connection:partition-id}
+# 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 = http://[$${instance-parameter:ipv6-random}]:5000
+return = site_url
+
+
+# Check promises
+[watermarkadmin-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${directory:promise}/watermarkadmin-promise
+hostname = $${instance-parameter:ipv6-random}
+port = $${instance-parameter:administration-port}
+
+[watermarkadmin-promise-frontend]
+recipe = slapos.cookbook:check_page_content
+path = $${directory:promises}/watermarkadmin-frontend-promise
+url = $${request-frontend:connection-site_url}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+match = If you entered the URL manually please check your spelling and try again.
+
+# Publish instance connection parameters
+[publish-connection-parameter]
+recipe = slapos.cookbook:publish
+url = http://[$${instance-parameter:ipv6-random}]:$${instance-parameter:http-port}
+# XXX-Cedric: hardcoded
+admin-url-ipv6 = http://[$${instance-parameter:ipv6-random}]:5000
+admin-url = $${request-frontend:connection-site_url}
+
--- a/software/hexaglobe-watermarking/instance.cfg.in
+++ b/software/hexaglobe-watermarking/instance.cfg.in
+[buildout]
+parts =
+  switch-softwaretype
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${watermarking-instance-profile:output}
+watermarking = ${watermarking-instance-profile:output}
+edge = ${edge-instance-profile:output}
+
--- a/software/hexaglobe-watermarking/template/nginx.conf.in
+++ b/software/hexaglobe-watermarking/template/nginx.conf.in
+daemon off;
+
+worker_processes  1;
+
+pid %(pid-file)s;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    log_format up_log '$remote_addr - $remote_user [$time_local]  $request '
+                  'upstream_response_time $upstream_response_time '
+                  'msec $msec request_time $request_time'
+                  'cache_status $upstream_cache_status';
+
+    log_format  sysl  '"$time_local", "$http_referer", "$host", "$request", '
+                  '"$status", "$http_user_agent", "$remote_addr", '
+                  '"$bytes_sent", "$request_time"';
+
+    proxy_temp_path   %(nginx-temp-path)s;
+
+    include       %(nginx-prefix)s/conf/mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+
+    keepalive_timeout  65;
+
+    include %(vhost-configuration-directory-location)s/*.conf;
+}
--- a/software/hexaglobe-watermarking/template/watermarkadmin.ini.in
+++ b/software/hexaglobe-watermarking/template/watermarkadmin.ini.in
+[nginx]
+vhosts   = %(nginx-vhost-configuration-directory-location)s
+log      = %(nginx-log-directory-location)s
+data     = %(nginx-cache-directory-location)s
+max_size = 1024m
+inactive = 120m
+port     = %(nginx-port)s
+pidfile  = %(nginx-pidfile-location)s
+nginx_bin = %(nginx-executable-location)s
+conf     = %(nginx-configuration-file-location)s
+prefix   = %(nginx-prefix)s
+
+[flask]
+DATABASE = %(flask-database-location)s
+MAX_CONTENT_LENGTH = 4096
+
+[api]
+user = admin
+pass = 276eeed9056ac2486f9c0237bb0be227
+ip   = %(global-ip)s
--- a/software/jio/instance.cfg.in
+++ b/software/jio/instance.cfg.in
+#############################
+#
+# Deploy jio instance
+#
+#############################
+[buildout]
+parts =
+  test-runner
+  phantomjs-wrapper
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+# Create all needed directories, depending on your needs
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+script = $${:etc}/run/
+service = $${:etc}/service
+promise = $${:etc}/promise/
+bin = $${buildout:directory}/bin/
+
+[download-source]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+
+# Local development
+[jio]
+<= download-source
+repository = ${jio-repository:location}
+
+[test-runner]
+recipe = slapos.cookbook:egg_test
+run-test-suite = $${directory:bin}/runTestSuite
+run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
+test-list =
+  $${jio:location}
+prepend-path = ${git:location}/bin:${libxslt:location}/bin:${python2.7:location}/bin:${buildout:bin-directory}
+environment = environment
+
+[environment]
+CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
+LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib -L${fontconfig:location}/lib -L${libexpat:location}/lib -L${freetype:location}/lib
+PYTHONPATH = ${python-setuptools:location}
+LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:location}/lib:${fontconfig:location}/lib:${libexpat:location}/lib:${freetype:location}/lib
+
+[phantomjs-wrapper]
+recipe = slapos.cookbook:wrapper
+command-line = ${phantomjs:location}/bin/phantomjs
+wrapper-path = $${directory:bin}/phantomjs
+parameters_extra = true
\ No newline at end of file
--- a/software/jio/software.cfg
+++ b/software/jio/software.cfg
+[buildout]
+
+extends = 
+  ../../stack/slapos.cfg
+  ../../component/git/buildout.cfg
+  ../../component/phantomjs/buildout.cfg
+  ../../component/git/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/python-setuptools/buildout.cfg
+
+# Local development
+develop =
+  ${:parts-directory}/slapos.cookbook-repository
+parts =
+  slapos.cookbook-repository
+  slapos-cookbook
+  template
+  phantomjs
+  eggs
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  slapos.cookbook
+  erp5.util
+  collective.recipe.template
+entry-points =
+  runTestSuite=erp5.util.testsuite:runTestSuite
+scripts =
+  runTestSuite
+
+# Local development until new egg is published (extra parameters to slapos.cookbook:wrapper
+[slapos.cookbook-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+repository = http://git.erp5.org/repos/slapos.git
+branch = master
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg.in
+output = ${buildout:directory}/instance.cfg
+# MD5 checksum can be skipped for development, but must be filled for production
+md5sum = 1ef1bc6a3fb81300ce7139c512af96d7
+mode = 0644
+
+[jio-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+repository = http://git.erp5.org/repos/jio.git
+branch = master
+
+[versions]
+Jinja2 = 2.6
+Werkzeug = 0.8.3
+buildout-versions = 1.7
+collective.recipe.template = 1.10
+erp5.util = 0.4.34
+hexagonit.recipe.cmmi = 2.0
+lxml = 3.1.1
+meld3 = 0.6.10
+plone.recipe.command = 1.1
+psutil = 0.6.1
+slapos.cookbook = 0.76.0
+slapos.recipe.build = 0.11.6
+slapos.recipe.template = 2.4.2
+
+# Required by:
+# slapos.core==0.35.1
+Flask = 0.9
+
+# Required by:
+# slapos.cookbook==0.76.0
+inotifyx = 0.2.0
+
+# Required by:
+# slapos.cookbook==0.76.0
+netaddr = 0.7.10
+
+# Required by:
+# slapos.core==0.35.1
+netifaces = 0.8
+
+# Required by:
+# slapos.core==0.35.1
+pyflakes = 0.6.1
+
+# Required by:
+# slapos.cookbook==0.76.0
+pytz = 2013b
+
+# Required by:
+# collective.recipe.template==1.10
+# erp5.util==0.4.33
+# hexagonit.recipe.download==1.6nxd002
+# slapos.cookbook==0.76.0
+# slapos.core==0.35.1
+# supervisor==3.0b1
+# zc.buildout==1.6.0-dev-SlapOS-010
+# zope.interface==4.0.5
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.76.0
+slapos.core = 0.35.1
+
+# Required by:
+# slapos.core==0.35.1
+supervisor = 3.0b1
+
+# Required by:
+# slapos.core==0.35.1
+unittest2 = 0.5.1
+
+# Required by:
+# slapos.cookbook==0.76.0
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.core==0.35.1
+zope.interface = 4.0.5
--- a/software/lamp-generic/README.txt
+++ b/software/lamp-generic/README.txt
+This Software Release represents a generic LAMP service.
+The PHP application is given to the instance by parameter as URL of application archive.
+XXX-Cedric: what about application configuration?
\ No newline at end of file
--- a/software/lamp-generic/development.cfg
+++ b/software/lamp-generic/development.cfg
+# Exactly the same as software.cfg, but fetch the slapos.cookbook and
+# slapos.toolbox from git repository instead of fetching stable version,
+# allowing to play with bleeding edge environment.
+
+# You'll need to run buildout twice for this profile.
+[buildout]
+extends =
+  ../../component/git/buildout.cfg
+  software.cfg
+
+parts +=
+# Development parts
+  slapos.cookbook-repository
+  slapos.core-repository
+  slapos.toolbox-repository
+  check-recipe
+
+develop =
+  ${:parts-directory}/slapos.cookbook-repository
+  ${:parts-directory}/slapos.core-repository
+  ${:parts-directory}/slapos.toolbox-repository
+
+[slapos.toolbox-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.toolbox.git
+branch = master
+git-executable = ${git:location}/bin/git
+
+[slapos.cookbook-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
+branch = lamp-edge
+git-executable = ${git:location}/bin/git
+
+[slapos.core-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.core.git
+branch = master
+git-executable = ${git:location}/bin/git
+
+[check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command =
+  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
+  grep parts ${buildout:develop-eggs-directory}/slapos.core.egg-link &&
+  grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
+
+[versions]
+slapos.cookbook =
+slapos.toolbox =
+slapos.core =
--- a/software/lamp-generic/instance-apache-php.cfg.in
+++ b/software/lamp-generic/instance-apache-php.cfg.in
+[buildout]
+
+parts =
+  logrotate
+  logrotate-entry-apache
+  cron
+  cron-entry-logrotate
+  promise
+  frontend-promise
+  publish-connection-informations
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+newest = false
+
+
+#----------------
+#--
+#-- 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
+cron-entries = $${rootdirectory:etc}/cron.d
+crontabs = $${rootdirectory:etc}/crontabs
+cronstamps = $${rootdirectory:etc}/cronstamps
+ca-dir = $${rootdirectory:srv}/ssl
+httpd-log = $${basedirectory:log}/apache
+php-ini-dir = $${rootdirectory:etc}/php
+tmp-php = $${rootdirectory:tmp}/php
+logrotate-entries = $${rootdirectory:etc}/logrotate.d
+logrotate-backup = $${basedirectory:backup}/logrotate
+report = $${rootdirectory:etc}/report
+stunnel-conf = $${rootdirectory:etc}/stunnel
+xml-report = $${rootdirectory:var}/xml_report
+www = $${rootdirectory:srv}/www/
+
+[cadirectory]
+recipe = slapos.cookbook:mkdirectory
+requests = $${directory:ca-dir}/requests
+private = $${directory:ca-dir}/private
+certs = $${directory:ca-dir}/certs
+newcerts = $${directory:ca-dir}/newcerts
+crl = $${directory:ca-dir}/crl
+
+
+#----------------
+#--
+#-- 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
+
+
+#----------------
+#--
+#-- Deploy Apache + PHP application.
+
+[apache-php]
+recipe = slapos.cookbook:lamp.generic
+url = $${slap-parameter:application-location}
+strip-top-level-dir = true
+# md5sum = 
+# XXX-Cedric: add some "template" configuration
+
+htdocs = $${directory:www}
+pid-file = $${basedirectory:run}/apache.pid
+lock-file = $${basedirectory:run}/apache.lock
+ip = $${slap-network-information:global-ipv6}
+port = 8080
+error-log = $${directory:httpd-log}/error.log
+access-log = $${directory:httpd-log}/access.log
+php-ini-dir = $${directory:php-ini-dir}
+tmp-dir = $${directory:tmp-php}
+httpd-conf = $${rootdirectory:etc}/apache.conf
+wrapper = $${basedirectory:services}/apache
+httpd-binary = ${apache:location}/bin/httpd
+
+
+[logrotate-entry-apache]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = apache
+log = $${apache-php:error-log} $${apache-php:access-log}
+frequency = daily
+rotate-num = 30
+sharedscripts = true
+notifempty = true
+create = true
+
+
+#----------------
+#--
+#-- Request frontend.
+
+[request-frontend]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = Frontend
+# XXX We have hardcoded SR URL here.
+software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+slave = true
+config = url custom_domain
+config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
+return = site_url
+config-custom_domain = $${slap-parameter:domain}
+
+
+#----------------
+#--
+#-- Publish instance parameters.
+
+[publish-connection-informations]
+recipe = slapos.cookbook:publish
+backend-url = http://[$${apache-php:ip}]:$${apache-php:port}/
+url = $${request-frontend:connection-site_url}
+
+
+#----------------
+#--
+#-- Deploy promises scripts.
+
+[promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${basedirectory:promises}/apache
+hostname = $${apache-php:ip}
+port = $${apache-php:port}
+
+[frontend-promise]
+recipe = slapos.cookbook:check_url_available
+path = $${basedirectory:promises}/frontend
+url = $${request-frontend:connection-site_url}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+
+
+
+[slap-parameter]
+# Default value if no domain is specified
+domain =
+# Default value if no ssh parameter is specified
+logbox-ip =
+logbox-port =
+logbox-user =
+logbox-passwd =
--- a/software/lamp-generic/instance-edge.cfg.in
+++ b/software/lamp-generic/instance-edge.cfg.in
+# This instance will request other instances of lamp-generic depending on a
+# list of countries.
+
+[buildout]
+
+parts =
+  request-edge
+  publish-connection-parameter
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[request-edge]
+<= slap-connection
+recipe = slapos.cookbook:request.edge
+# This magic parameter triggers several requests, one request per country.
+name = lamp
+return = url backend-url
+country-list = $${slap-parameter:country-list}
+software-url = $${slap-connection:software-release-url}
+software-type = default
+config = application-location
+config-application-location = $${slap-parameter:application-location}
+return = backend-url
+
+[publish-connection-parameter]
+recipe = slapos.cookbook:publishsection
+section-list = request-edge
--- a/software/lamp-generic/instance.cfg.in
+++ b/software/lamp-generic/instance.cfg.in
+[buildout]
+
+parts =
+  switch_softwaretype
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[switch_softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${instance-apache-php:output}
+edge = ${instance-edge:output}
--- a/software/lamp-generic/software.cfg
+++ b/software/lamp-generic/software.cfg
+[buildout]
+extends =
+  ../../stack/lamp/buildout.cfg
+
+parts +=
+  instance-edge
+
+# XXX: switch to ngnix
+
+[instance]
+url = ${:_profile_base_location_}/instance.cfg.in
+md5sum = 26ac6629a83869140189a85e581e822f
+
+[instance-apache-php]
+url = ${:_profile_base_location_}/instance-apache-php.cfg.in
+md5sum = fdc849c9f49b9d2fb043bf229d24076b
+
+[instance-edge]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-edge.cfg.in
+output = ${buildout:directory}/instance-edge.cfg
+#md5sum = 6b7a6caf44e3a94bed7f89c04003a171
+mode = 0644
--- a/software/maarch/development.cfg
+++ b/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]

--- a/software/maarch/migration.txt
+++ b/software/maarch/migration.txt
+
+**************************************************************************
+This howto is for private networks only, in case the customer is migrating
+from a previously installed Maarch.
+**************************************************************************
+
+
+Hot to install Maarch with SlapOS
+=================================
+
+ 1) Require the right Software Release ({insert SR number/URL here})
+
+ 2) Request an instance of that Software Release.
+    Since we need to provide a parameter (type=resilient) that is not available through
+    the SlapOS web site, it must be done at command line.
+
+    If you are migrating data from an existing Maarch installation:
+
+    2.1) copy a 'data only' SQL dump - no schema - to the server that contains
+         the instance. Let's say it is /tmp/data.sql
+         The file must be readable by world, because we don't know yet the number
+         of the partition that will need to access it.
+         Remember to remove it afterwards.
+
+     The command line to request a partition is:
+
+     slapos request /etc/opt/slapos/slapos-client.cfg maarch-instance-name \
+            http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.159:/software/maarch/software.cfg \
+            --type=resilient --configuration maarch-sql-data-file=/tmp/data.sql
+
+     If you are not migrating data, don't provide the maarch-sql-data-file parameter.
+     A minimal working database will be created.
+
+ 3) deploy the instance.
+    You should be able to connect to both Maarch (user 'superadmin')
+    and Postgres (user 'postgres') with the (very long)
+    passport reported in the connection parameters of the partition 'apache0'.
+
+    NB: even if you copied the SQL data from a previous installation, the 'superadmin' password
+        is set from the published connection parameter. If there are other admin accounts,
+        their password is not changed.
+
+ 4) Again, only if you are migrating:
+    connect to the server, inside the partition of type apache-export
+    copy the docservers data inside the folders:
+        srv/docservers/ai
+        srv/docservers/manual
+        srv/docservers/OAIS_main
+        srv/docservers/OAIS_safe
+        srv/docservers/offline
+        srv/docservers/templates
+
+    also, change the owner and group of the copied files to the user that owns the partition.
+
--- a/software/maarch/software.cfg
+++ b/software/maarch/software.cfg
@@ -13,8 +13,31 @@ parts +=
  instance
  instance-apache-php
  slapos-recipe-maarch-egg
+  slapos.cookbook-repository
+  check-recipe


+develop =
+  ${:parts-directory}/slapos.cookbook-repository
+
+
+extensions = buildout-versions
+
+
+[slapos.cookbook-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
+revision = 7285bc913e6ea46a36ad2a887af6e9fab010ca74
+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
+

 #----------------
 #--

--- a/software/reverse-proxy-nginx/common.cfg
+++ b/software/reverse-proxy-nginx/common.cfg
+[buildout]
+
+# XXX-Cedric: cahnge name to reverse-proxy-nginx
+
+extends =
+  ../../component/dcron/buildout.cfg
+  ../../component/gzip/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/nginx/buildout.cfg
+  ../../component/openssl/buildout.cfg
+  ../../stack/slapos.cfg
+
+parts =
+  slapos-cookbook
+  eggs
+  instance-profile
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  slapos.toolbox
+
+[instance-profile]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg.in
+output = ${buildout:directory}/instance.cfg
+#md5sum = 650cd2527158734fd6ccd9ec374b5e69
+mode = 0644
+
--- a/software/reverse-proxy-nginx/development.cfg
+++ b/software/reverse-proxy-nginx/development.cfg
+[buildout]
+extends =
+  ../../component/git/buildout.cfg
+  common.cfg
+
+parts +=
+  slapos.cookbook-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
--- a/software/reverse-proxy-nginx/instance.cfg.in
+++ b/software/reverse-proxy-nginx/instance.cfg.in
+[buildout]
+parts =
+  directory
+  reverse-proxy
+  certificate-authority
+  ca-nginx
+  logrotate
+  logrotate-entry-nginx
+  cron
+  cron-entry-logrotate
+  smtp-port-promise
+  publish-connection-parameter
+
+# 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
+
+# Fetch parameters defined in SlapOS Master for this instance
+[instance-parameter]
+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}
+
+# Set default parameters
+configuration.slave-instance-list =
+configuration.domain = un-hardcode-me
+#configuration.http-port = 80
+#configuration.https-port = 443
+configuration.smtp-port = 25
+configuration.public-ipv4 =
+
+# Create needed directories
+[directory]
+recipe = slapos.cookbook:mkdirectory
+home = $${buildout:directory}
+bin = $${:home}/bin
+etc = $${:home}/etc
+srv = $${:home}/srv
+var = $${:home}/var
+
+service = $${:etc}/service
+promise = $${:etc}/promise
+backup = $${:srv}/backup
+log = $${:var}/log
+run = $${:var}/run
+
+ca-dir = $${:srv}/ssl
+ca-requests = $${:ca-dir}/requests
+ca-private = $${:ca-dir}/private
+ca-certs = $${:ca-dir}/certs
+ca-newcerts = $${:ca-dir}/newcerts
+ca-crl = $${:ca-dir}/crl
+
+nginx-configuration = $${:etc}/nginx
+nginx-ssl = $${:ca-dir}/nginx
+nginx-log = $${:home}/logs
+nginx-htdocs = $${:srv}/www
+
+cron-entries = $${:etc}/cron.d
+crontabs = $${:etc}/crontabs
+cronstamps = $${:etc}/cronstamps
+
+logrotate-entries = $${:etc}/logrotate.d
+logrotate-backup = $${:backup}/logrotate
+
+
+# Deploy nginx and publish connection parameters inside of the recipe
+[reverse-proxy]
+recipe = slapos.cookbook:reverseproxy.nginx
+nginx-executable = ${nginx-unstable:location}/sbin/nginx
+wrapper = $${directory:bin}/nginx
+
+configuration-file = $${directory:nginx-configuration}/nginx.conf
+
+ipv6 = $${instance-parameter:ipv6-random}
+ipv4 = $${instance-parameter:ipv4-random}
+slave-instance-list = $${instance-parameter:slave-instance-list}
+#http-port = $${instance-parameter:http-port}
+#https-port = $${instance-parameter:https-port}
+smtp-port = $${instance-parameter:configuration.smtp-port}
+domain = $${instance-parameter:configuration.domain}
+
+access-log = $${directory:nginx-log}/access.log
+error-log = $${directory:nginx-log}/error.log
+
+key-file = $${directory:nginx-configuration}/nginx.key
+cert-file = $${directory:nginx-configuration}/nginx.crt
+
+pid-file = $${directory:run}/nginx
+
+htdocs = $${directory:nginx-htdocs}
+home-directory = $${directory:home}
+
+# Set the public IPs (if possible) as slave connection parameter so that user knows what IP
+# to bind to its domain name
+public-ipv4 = $${instance-parameter:configuration.public-ipv4}
+
+# Create and handle certificate related stuffs, including encapsulating run of nginx executable
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = ${openssl:location}/bin/openssl
+ca-dir = $${directory:ca-dir}
+requests-directory = $${directory:ca-requests}
+wrapper = $${directory:service}/ca
+ca-private = $${directory:ca-private}
+ca-certs = $${directory:ca-certs}
+ca-newcerts = $${directory:ca-newcerts}
+ca-crl = $${directory:ca-crl}
+
+[ca-nginx]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+executable = $${reverse-proxy:wrapper}
+wrapper = $${directory:service}/nginx
+key-file = $${reverse-proxy:key-file}
+cert-file = $${reverse-proxy:cert-file}
+
+
+# Deploy logrotate
+[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 = $${directory:bin}/logrotate
+conf = $${directory:etc}/logrotate.conf
+logrotate-entries = $${directory:logrotate-entries}
+backup = $${directory:logrotate-backup}
+state-file = $${directory:srv}/logrotate.status
+
+[logrotate-entry-nginx]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = nginx
+log = $${reverse-proxy:access-log} $${reverse-proxy:error-log}
+frequency = daily
+rotate-num = 30
+post = ${buildout:bin-directory}/killpidfromfile $${reverse-proxy:pid-file} SIGUSR1
+sharedscripts = true
+notifempty = true
+create = true
+
+
+# Deploy cron and configure it
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = $${directory:bin}/cron_simplelogger
+log = $${directory: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}
+catcher = $${cron-simplelogger:wrapper}
+binary = $${directory:service}/crond
+
+[cron-entry-logrotate]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+command = $${logrotate:wrapper}
+
+
+# Check promises
+[smtp-port-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${directory:promise}/smtp-port-promise
+hostname = $${instance-parameter:ipv6-random}
+port = $${instance-parameter:configuration.smtp-port}
+
+
+# Publish instance connection parameters
+# Note: Parameters of slaves are published in the reverse-proxy recipe
+[publish-connection-parameter]
+recipe = slapos.cookbook:publish
+ipv4 = $${instance-parameter:ipv4-random}
+ipv6 = $${instance-parameter:ipv6-random}
+
--- a/software/slaprunner/software.cfg
+++ b/software/slaprunner/software.cfg
@@ -61,26 +61,26 @@ 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.1
+slapos.toolbox = 0.34.0
 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.1
+# slapos.toolbox==0.34.0
 Flask = 0.9

 # Required by:
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.34.0
 GitPython = 0.3.2.RC1

 # Required by:
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.34.0
 atomize = 0.1.1

 # Required by:
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.34.0
 feedparser = 5.1.3

 # Required by:
@@ -92,11 +92,11 @@ hexagonit.recipe.download = 1.6nxd002
 netifaces = 0.8

 # Required by:
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.34.0
 paramiko = 1.9.0

 # Required by:
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.34.0
 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.1
+# slapos.toolbox==0.34.0
 # supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-010
 # zope.interface==4.0.3

--- a/software/tt-rss/instance-custom.cfg.in
+++ b/software/tt-rss/instance-custom.cfg.in
+[buildout]
+
+# Run a SQL script to populate DB at first run
+[tt-rss-init]
+recipe = slapos.cookbook:apachephpconfigure
+table_name = db.ttrss_users
+#constraint = `pn_id`>0
+lampconfigure = ${buildout:bin-directory}/lampconfigure
+htdocs = $${apache-php:htdocs}
+mysql-username = $${apache-php:mysql-username}
+mysql-password = $${apache-php:mysql-password}
+mysql-database = $${apache-php:mysql-database}
+mysql-host = $${apache-php:mysql-host}
+mysql-port = $${apache-php:mysql-port}
+configureinstall-location = $${basedirectory:scripts}/configureInstall
+sql-script = ${sql-script:location}/${sql-script:filename}
\ No newline at end of file
--- a/software/tt-rss/script/tt-rss.sql
+++ b/software/tt-rss/script/tt-rss.sql
+SET NAMES utf8;
+SET CHARACTER SET utf8;
+
+
+begin;
+
+create table ttrss_users (id integer primary key not null auto_increment,
+	login varchar(120) not null unique,
+	pwd_hash varchar(250) not null,
+	last_login datetime default null,
+	access_level integer not null default 0,
+	theme_id integer default null,
+	email varchar(250) not null default '',
+	full_name varchar(250) not null default '',
+	email_digest bool not null default false,
+	last_digest_sent datetime default null,
+	salt varchar(250) not null default '',
+	created datetime default null,
+	twitter_oauth longtext default null,
+	otp_enabled boolean not null default false,
+	index (theme_id)) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+insert into ttrss_users (login,pwd_hash,access_level) values ('admin',
+	'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8', 10);
+
+create table ttrss_feed_categories(id integer not null primary key auto_increment,
+	owner_uid integer not null,
+	title varchar(200) not null,
+	collapsed bool not null default false,
+	order_id integer not null default 0,
+	parent_cat integer,
+	index(parent_cat),
+	foreign key (parent_cat) references ttrss_feed_categories(id) ON DELETE SET NULL,
+	index(owner_uid),
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create table ttrss_archived_feeds (id integer not null primary key,
+	owner_uid integer not null,
+	title varchar(200) not null,
+	feed_url text not null,
+	site_url varchar(250) not null default '',
+	index(owner_uid),
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create table ttrss_counters_cache (
+	feed_id integer not null,
+	owner_uid integer not null,
+	value integer not null default 0,
+	updated datetime not null,
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE
+);
+
+create index ttrss_counters_cache_feed_id_idx on ttrss_counters_cache(feed_id);
+create index ttrss_counters_cache_owner_uid_idx on ttrss_counters_cache(owner_uid);
+create index ttrss_counters_cache_value_idx on ttrss_counters_cache(value);
+
+create table ttrss_cat_counters_cache (
+	feed_id integer not null,
+	owner_uid integer not null,
+	value integer not null default 0,
+	updated datetime not null,
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE
+);
+
+create index ttrss_cat_counters_cache_owner_uid_idx on ttrss_cat_counters_cache(owner_uid);
+
+create table ttrss_feeds (id integer not null auto_increment primary key,
+	owner_uid integer not null,
+	title varchar(200) not null,
+	cat_id integer default null,
+	feed_url text not null,
+	icon_url varchar(250) not null default '',
+	update_interval integer not null default 0,
+	purge_interval integer not null default 0,
+	last_updated datetime default 0,
+	last_error varchar(250) not null default '',
+	site_url varchar(250) not null default '',
+	auth_login varchar(250) not null default '',
+	auth_pass varchar(250) not null default '',
+	parent_feed integer default null,
+	private bool not null default false,
+	rtl_content bool not null default false,
+	hidden bool not null default false,
+	include_in_digest boolean not null default true,
+	cache_images boolean not null default false,
+	hide_images boolean not null default false,
+	cache_content boolean not null default false,
+	auth_pass_encrypted boolean not null default false,
+	last_viewed datetime default null,
+	last_update_started datetime default null,
+	always_display_enclosures boolean not null default false,
+	update_method integer not null default 0,
+	order_id integer not null default 0,
+	mark_unread_on_update boolean not null default false,
+	update_on_checksum_change boolean not null default false,
+	strip_images boolean not null default false,
+	pubsub_state integer not null default 0,
+	favicon_last_checked datetime default null,
+	index(owner_uid),
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE,
+	index(cat_id),
+	foreign key (cat_id) references ttrss_feed_categories(id) ON DELETE SET NULL,
+	index(parent_feed),
+	foreign key (parent_feed) references ttrss_feeds(id) ON DELETE SET NULL) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create index ttrss_feeds_owner_uid_index on ttrss_feeds(owner_uid);
+create index ttrss_feeds_cat_id_idx on ttrss_feeds(cat_id);
+
+insert into ttrss_feeds (owner_uid, title, feed_url) values
+	(1, 'Tiny Tiny RSS: New Releases', 'http://tt-rss.org/releases.rss');
+
+insert into ttrss_feeds (owner_uid, title, feed_url) values
+	(1, 'Tiny Tiny RSS: Forum', 'http://tt-rss.org/forum/rss.php');
+
+create table ttrss_entries (id integer not null primary key auto_increment,
+	title text not null,
+	guid varchar(255) not null unique,
+	link text not null,
+	updated datetime not null,
+	content longtext not null,
+	content_hash varchar(250) not null,
+	cached_content longtext,
+	no_orig_date bool not null default 0,
+	date_entered datetime not null,
+	date_updated datetime not null,
+	num_comments integer not null default 0,
+	plugin_data longtext,
+	comments varchar(250) not null default '',
+	author varchar(250) not null default '') ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create index ttrss_entries_date_entered_index on ttrss_entries(date_entered);
+create index ttrss_entries_guid_index on ttrss_entries(guid);
+create index ttrss_entries_updated_idx on ttrss_entries(updated);
+
+create table ttrss_user_entries (
+	int_id integer not null primary key auto_increment,
+	ref_id integer not null,
+	uuid varchar(200) not null,
+	feed_id int,
+	orig_feed_id int,
+	owner_uid integer not null,
+	marked bool not null default 0,
+	published bool not null default 0,
+	tag_cache text not null,
+	label_cache text not null,
+	last_read datetime,
+	score int not null default 0,
+	note longtext,
+	last_marked datetime,
+	last_published datetime,
+	unread bool not null default 1,
+	index (ref_id),
+	foreign key (ref_id) references ttrss_entries(id) ON DELETE CASCADE,
+	index (feed_id),
+	foreign key (feed_id) references ttrss_feeds(id) ON DELETE CASCADE,
+	index (orig_feed_id),
+	foreign key (orig_feed_id) references ttrss_archived_feeds(id) ON DELETE SET NULL,
+	index (owner_uid),
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create index ttrss_user_entries_owner_uid_index on ttrss_user_entries(owner_uid);
+create index ttrss_user_entries_ref_id_index on ttrss_user_entries(ref_id);
+create index ttrss_user_entries_feed_id on ttrss_user_entries(feed_id);
+create index ttrss_user_entries_unread_idx on ttrss_user_entries(unread);
+
+create table ttrss_entry_comments (id integer not null primary key,
+	ref_id integer not null,
+	owner_uid integer not null,
+	private bool not null default 0,
+	date_entered datetime not null,
+	index (ref_id),
+	foreign key (ref_id) references ttrss_entries(id) ON DELETE CASCADE,
+	index (owner_uid),
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create table ttrss_filter_types (id integer primary key,
+	name varchar(120) unique not null,
+	description varchar(250) not null unique) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+insert into ttrss_filter_types (id,name,description) values (1, 'title', 'Title');
+insert into ttrss_filter_types (id,name,description) values (2, 'content', 'Content');
+insert into ttrss_filter_types (id,name,description) values (3, 'both',
+	'Title or Content');
+insert into ttrss_filter_types (id,name,description) values (4, 'link',
+	'Link');
+insert into ttrss_filter_types (id,name,description) values (5, 'date',
+	'Article Date');
+insert into ttrss_filter_types (id,name,description) values (6, 'author', 'Author');
+insert into ttrss_filter_types (id,name,description) values (7, 'tag', 'Article Tags');
+
+create table ttrss_filter_actions (id integer not null primary key,
+	name varchar(120) unique not null,
+	description varchar(250) not null unique) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+insert into ttrss_filter_actions (id,name,description) values (1, 'filter',
+	'Delete article');
+
+insert into ttrss_filter_actions (id,name,description) values (2, 'catchup',
+	'Mark as read');
+
+insert into ttrss_filter_actions (id,name,description) values (3, 'mark',
+	'Set starred');
+
+insert into ttrss_filter_actions (id,name,description) values (4, 'tag',
+	'Assign tags');
+
+insert into ttrss_filter_actions (id,name,description) values (5, 'publish',
+	'Publish article');
+
+insert into ttrss_filter_actions (id,name,description) values (6, 'score',
+	'Modify score');
+
+insert into ttrss_filter_actions (id,name,description) values (7, 'label',
+	'Assign label');
+
+create table ttrss_filters (id integer not null primary key auto_increment,
+	owner_uid integer not null,
+	feed_id integer default null,
+	filter_type integer not null,
+	reg_exp varchar(250) not null,
+	filter_param varchar(250) not null default '',
+	inverse bool not null default false,
+	enabled bool not null default true,
+	cat_filter bool not null default false,
+	cat_id integer default null,
+	action_id integer not null default 1,
+	action_param varchar(250) not null default '',
+	index (filter_type),
+	foreign key (filter_type) references ttrss_filter_types(id) ON DELETE CASCADE,
+	index (owner_uid),
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE,
+	index (feed_id),
+	foreign key (feed_id) references ttrss_feeds(id) ON DELETE CASCADE,
+	index (cat_id),
+	foreign key (cat_id) references ttrss_feed_categories(id) ON DELETE CASCADE,
+	index (action_id),
+	foreign key (action_id) references ttrss_filter_actions(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create table ttrss_filters2(id integer primary key auto_increment,
+	owner_uid integer not null,
+	match_any_rule boolean not null default false,
+	enabled boolean not null default true,
+	index(owner_uid),
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create table ttrss_filters2_rules(id integer primary key auto_increment,
+	filter_id integer not null references ttrss_filters2(id) on delete cascade,
+	reg_exp varchar(250) not null,
+	filter_type integer not null,
+	feed_id integer default null,
+	cat_id integer default null,
+	cat_filter boolean not null default false,
+	index (filter_id),
+	foreign key (filter_id) references ttrss_filters2(id) on delete cascade,
+	index (filter_type),
+	foreign key (filter_type) references ttrss_filter_types(id) ON DELETE CASCADE,
+	index (feed_id),
+	foreign key (feed_id) references ttrss_feeds(id) ON DELETE CASCADE,
+	index (cat_id),
+	foreign key (cat_id) references ttrss_feed_categories(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create table ttrss_filters2_actions(id integer primary key auto_increment,
+	filter_id integer not null,
+	action_id integer not null default 1 references ttrss_filter_actions(id) on delete cascade,
+	action_param varchar(250) not null default '',
+	index (filter_id),
+	foreign key (filter_id) references ttrss_filters2(id) on delete cascade,
+	index (action_id),
+	foreign key (action_id) references ttrss_filter_actions(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create table ttrss_tags (id integer primary key auto_increment,
+	owner_uid integer not null,
+	tag_name varchar(250) not null,
+	post_int_id integer not null,
+	index (post_int_id),
+	foreign key (post_int_id) references ttrss_user_entries(int_id) ON DELETE CASCADE,
+	index (owner_uid),
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+insert into ttrss_version values (106);
+
+create table ttrss_enclosures (id integer primary key auto_increment,
+	content_url text not null,
+	content_type varchar(250) not null,
+	post_id integer not null,
+	title text not null,
+	duration text not null,
+	index (post_id),
+	foreign key (post_id) references ttrss_entries(id) ON DELETE cascade) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create index ttrss_enclosures_post_id_idx on ttrss_enclosures(post_id);
+
+create table ttrss_settings_profiles(id integer primary key auto_increment,
+	title varchar(250) not null,
+	owner_uid integer not null,
+	index (owner_uid),
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create table ttrss_prefs_types (id integer not null primary key,
+	type_name varchar(100) not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+insert into ttrss_prefs_types (id, type_name) values (1, 'bool');
+insert into ttrss_prefs_types (id, type_name) values (2, 'string');
+insert into ttrss_prefs_types (id, type_name) values (3, 'integer');
+
+create table ttrss_prefs_sections (id integer not null primary key,
+	order_id integer not null,
+	section_name varchar(100) not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+insert into ttrss_prefs_sections (id, section_name, order_id) values (1, 'General', 0);
+insert into ttrss_prefs_sections (id, section_name, order_id) values (2, 'Interface', 1);
+insert into ttrss_prefs_sections (id, section_name, order_id) values (3, 'Advanced', 3);
+insert into ttrss_prefs_sections (id, section_name, order_id) values (4, 'Digest', 2);
+
+create table ttrss_prefs (pref_name varchar(250) not null primary key,
+	type_id integer not null,
+	section_id integer not null default 1,
+	short_desc text not null,
+	help_text varchar(250) not null default '',
+	access_level integer not null default 0,
+	def_value text not null,
+	index(type_id),
+	foreign key (type_id) references ttrss_prefs_types(id),
+	index(section_id),
+	foreign key (section_id) references ttrss_prefs_sections(id)) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create index ttrss_prefs_pref_name_idx on ttrss_prefs(pref_name);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('PURGE_OLD_DAYS', 3, '60', 'Purge articles after this number of days (0 - disables)',1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('DEFAULT_UPDATE_INTERVAL', 3, '30', 'Default interval between feed updates',1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('DEFAULT_ARTICLE_LIMIT', 3, '30', 'Amount of articles to display at once',2);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ALLOW_DUPLICATE_POSTS', 1, 'true', 'Allow duplicate posts',1, 'This option is useful when you are reading several planet-type aggregators with partially colliding userbase. When disabled, it forces same posts from different feeds to appear only once.');
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_FEED_CATS', 1, 'true', 'Enable feed categories',2);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('SHOW_CONTENT_PREVIEW', 1, 'true', 'Show content preview in headlines list',2);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('SHORT_DATE_FORMAT', 2, 'M d, G:i', 'Short date format',3);
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('LONG_DATE_FORMAT', 2, 'D, M d Y - G:i', 'Long date format',3);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display',2, 'Display expanded list of feed articles, instead of separate displays for headlines and article content');
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('HIDE_READ_FEEDS', 1, 'false', 'Hide feeds with no unread messages',2);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ON_CATCHUP_SHOW_NEXT_FEED', 1, 'false', 'On catchup show next feed',2, 'Automatically open next feed with unread articles after marking one as read');
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('FEEDS_SORT_BY_UNREAD', 1, 'false', 'Sort feeds by unread articles count',2);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('REVERSE_HEADLINES', 1, 'false', 'Reverse headline order (oldest first)',2);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DIGEST_ENABLE', 1, 'false', 'Enable e-mail digest',4, 'This option enables sending daily digest of new (and unread) headlines on your configured e-mail address');
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CONFIRM_FEED_CATCHUP', 1, 'true', 'Confirm marking feed as read',2);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('CDM_AUTO_CATCHUP', 1, 'false', 'Automatically mark articles as read',2, 'This option enables marking articles as read automatically while you scroll article list.');
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_VIEW_MODE', 2, 'adaptive', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_VIEW_LIMIT', 3, '30', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_ACTIVE_TAB', 2, '', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('STRIP_UNSAFE_TAGS', 1, 'true', 'Strip unsafe tags from articles', 3, 'Strip all but most common HTML tags when reading articles.');
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('BLACKLISTED_TAGS', 2, 'main, generic, misc, uncategorized, blog, blogroll, general, news', 'Blacklisted tags', 3, 'When auto-detecting tags in articles these tags will not be applied (comma-separated list).');
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('FRESH_ARTICLE_MAX_AGE', 3, '24', 'Maximum age of fresh articles (in hours)',2);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('DIGEST_CATCHUP', 1, 'false', 'Mark articles in e-mail digest as read',4);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('CDM_EXPANDED', 1, 'true', 'Automatically expand articles in combined mode',2);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('PURGE_UNREAD_ARTICLES', 1, 'true', 'Purge unread articles',3);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('HIDE_READ_SHOWS_SPECIAL', 1, 'true', 'Show special feeds when hiding read feeds',2);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('VFEED_GROUP_BY_FEED', 1, 'false', 'Group headlines in virtual feeds',2, 'When this option is enabled, headlines in Special feeds and Labels are grouped by feeds');
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('STRIP_IMAGES', 1, 'false', 'Do not embed images in articles', 2);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_VIEW_ORDER_BY', 2, 'default', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_API_ACCESS', 1, 'false', 'Enable external API', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_COLLAPSED_SPECIAL', 1, 'false', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_COLLAPSED_LABELS', 1, 'false', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_COLLAPSED_UNCAT', 1, 'false', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_COLLAPSED_FEEDLIST', 1, 'false', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_ENABLE_CATS', 1, 'false', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_SHOW_IMAGES', 1, 'false', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_HIDE_READ', 1, 'false', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_SORT_FEEDS_UNREAD', 1, 'false', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_THEME_ID', 2, '0', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('USER_TIMEZONE', 2, 'UTC', 'User timezone', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('USER_STYLESHEET', 2, '', 'Customize stylesheet', 2, 'Customize CSS stylesheet to your liking');
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SORT_HEADLINES_BY_FEED_DATE', 1, 'true', 'Sort headlines by feed date',2, 'Use feed-specified date to sort headlines instead of local import date.');
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_BROWSE_CATS', 1, 'true', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SSL_CERT_SERIAL', 2, '', 'Login with an SSL certificate',3, 'Click to register your SSL client certificate with tt-rss');
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('DIGEST_PREFERRED_TIME', 2, '00:00', 'Try to send digests around specified time', 4, 'Uses UTC timezone');
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_PREFS_SHOW_EMPTY_CATS', 1, 'false', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_INCLUDE_CHILDREN', 1, 'false', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('AUTO_ASSIGN_LABELS', 1, 'true', 'Assign articles to labels automatically', 3);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_ENABLED_PLUGINS', 2, '', '', 1);
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_REVERSE_HEADLINES', 1, 'false', '', 1);
+
+update ttrss_prefs set access_level = 1 where pref_name in ('ON_CATCHUP_SHOW_NEXT_FEED',
+	'SORT_HEADLINES_BY_FEED_DATE',
+	'VFEED_GROUP_BY_FEED',
+	'FRESH_ARTICLE_MAX_AGE',
+	'CDM_EXPANDED',
+	'SHOW_CONTENT_PREVIEW',
+	'AUTO_ASSIGN_LABELS',
+	'HIDE_READ_SHOWS_SPECIAL');
+
+create table ttrss_user_prefs (
+   owner_uid integer not null,
+   pref_name varchar(250),
+   value longtext not null,
+	profile integer,
+	index (profile),
+  	foreign key (profile) references ttrss_settings_profiles(id) ON DELETE CASCADE,
+	index (owner_uid),
+ 	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE,
+	index (pref_name),
+	foreign key (pref_name) references ttrss_prefs(pref_name) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create index ttrss_user_prefs_owner_uid_index on ttrss_user_prefs(owner_uid);
+create index ttrss_user_prefs_pref_name_idx on ttrss_user_prefs(pref_name);
+
+create table ttrss_sessions (id varchar(250) unique not null primary key,
+	data text,
+	expire integer not null,
+	index (id),
+	index (expire)) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create table ttrss_feedbrowser_cache (
+	feed_url text not null,
+	site_url text not null,
+	title text not null,
+	subscribers integer not null) DEFAULT CHARSET=UTF8;
+
+create table ttrss_labels2 (id integer not null primary key auto_increment,
+	owner_uid integer not null,
+	caption varchar(250) not null,
+	fg_color varchar(15) not null default '',
+	bg_color varchar(15) not null default '',
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create table ttrss_user_labels2 (label_id integer not null,
+	article_id integer not null,
+	foreign key (label_id) references ttrss_labels2(id) ON DELETE CASCADE,
+	foreign key (article_id) references ttrss_entries(id) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create table ttrss_access_keys (id integer not null primary key auto_increment,
+	access_key varchar(250) not null,
+	feed_id varchar(250) not null,
+	is_cat bool not null default false,
+	owner_uid integer not null,
+  	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create table ttrss_linked_instances (id integer not null primary key auto_increment,
+	last_connected datetime not null,
+	last_status_in integer not null,
+	last_status_out integer not null,
+	access_key varchar(250) not null unique,
+	access_url text not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create table ttrss_linked_feeds (
+	feed_url text not null,
+	site_url text not null,
+	title text not null,
+	created datetime not null,
+	updated datetime not null,
+	instance_id integer not null,
+	subscribers integer not null,
+ 	foreign key (instance_id) references ttrss_linked_instances(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+create table ttrss_plugin_storage (
+	id integer not null auto_increment primary key,
+	name varchar(100) not null,
+	owner_uid integer not null,
+	content longtext not null,
+  	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+
+commit;
+
--- a/software/tt-rss/software.cfg
+++ b/software/tt-rss/software.cfg
+[buildout]
+extends =
+  ../../stack/lamp/buildout.cfg
+
+[application]
+recipe = slapos.recipe.build:download-unpacked
+url = https://github.com/gothfox/Tiny-Tiny-RSS/archive/1.7.5.tar.gz
+#md5sum = a81cea71701404cebf64c07b7ac6c948
+strip-top-level-dir = true
+
+[application-template]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/template/config.php.in
+#md5sum = Student may put here md5sum of this file, this is good idea
+filename = template.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[application-configuration]
+location = config.php
+
+
+[sql-script]
+recipe = slapos.recipe.download
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+url = ${:_profile_base_location_}/script/tt-rss.sql
+#md5sum = c4d5f87d8f02cad3f20e679160195f48
+filename = tt-rss.sql
+mode = 0744
+
+# XXX Should disappear and be integrated into apachephpconfigure
+[configure-script]
+recipe = slapos.recipe.download
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+url = ${:_profile_base_location_}/configure-tt-rss.py
+#md5sum = c4d5f87d8f02cad3f20e679160195f48
+filename = configure-tt-rss.py
+mode = 0744
+
+[custom-application-deployment-template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-custom.cfg.in
+output = ${buildout:directory}/instance-custom.cfg
+#md5sum = 283cb53ff8cd34635703e771062db919
+mode = 0644
+
+[custom-application-deployment]
+path = ${custom-application-deployment-template:output}
+part-list = tt-rss-init
--- a/software/tt-rss/template/config.php.in
+++ b/software/tt-rss/template/config.php.in
+<?php
+  // *******************************************
+	// *** Database configuration (important!) ***
+	// *******************************************
+
+	define('DB_TYPE', "mysql"); // or mysql
+	define('DB_HOST', "%(mysql_host)s");
+	define('DB_USER', "%(mysql_user)s");
+	define('DB_NAME', "%(mysql_database)s");
+	define('DB_PASS', "%(mysql_password)s");
+
+	define('MYSQL_CHARSET', 'UTF8');
+	// Connection charset for MySQL. If you have a legacy database and/or experience
+	// garbage unicode characters with this option, try setting it to a blank string.
+
+	// ***********************************
+	// *** Basic settings (important!) ***
+	// ***********************************
+
+  //FIXME set frontend URL
+	define('SELF_URL_PATH', 'http://%(ip)s:%(port)s');
+	// Full URL of your tt-rss installation. This should be set to the
+	// location of tt-rss directory, e.g. http://yourserver/tt-rss/
+	// You need to set this option correctly otherwise several features
+	// including PUSH, bookmarklets and browser integration will not work properly.
+
+	define('SINGLE_USER_MODE', true);
+	// Operate in single user mode, disables all functionality related to
+	// multiple users.
+
+  define('SIMPLE_UPDATE_MODE', false);
+	// Enables fallback update mode where tt-rss tries to update feeds in
+	// background while tt-rss is open in your browser. 
+	// If you don't have a lot of feeds and don't want to or can't run 
+	// background processes while not running tt-rss, this method is generally 
+	// viable to keep your feeds up to date.
+	// Still, there are more robust (and recommended) updating methods 
+	// available, you can read about them here: http://tt-rss.org/wiki/UpdatingFeeds
+
+
+	// *****************************
+	// *** Files and directories ***
+	// *****************************
+
+  //FIXME
+	define('PHP_EXECUTABLE', '/usr/bin/php');
+	// Path to PHP executable, used for various command-line tt-rss programs
+
+
+  define('LOCK_DIRECTORY', 'lock');
+	// Directory for lockfiles, must be writable to the user you run
+	// daemon process or cronjobs under.
+
+	define('CACHE_DIR', 'cache');
+	// Local cache directory for RSS feed content.
+
+	define('ICONS_DIR', "feed-icons");
+	define('ICONS_URL', "feed-icons");
+	// Local and URL path to the directory, where feed favicons are stored.
+	// Unless you really know what you're doing, please keep those relative
+	// to tt-rss main directory.
+
+	// **********************
+	// *** Authentication ***
+	// **********************
+
+	// Please see PLUGINS below to configure various authentication modules.
+
+	define('AUTH_AUTO_CREATE', true);
+	// Allow authentication modules to auto-create users in tt-rss internal
+	// database when authenticated successfully.
+
+	define('AUTH_AUTO_LOGIN', true);
+	// Automatically login user on remote or other kind of externally supplied
+	// authentication, otherwise redirect to login form as normal.
+	// If set to true, users won't be able to set application language
+	// and settings profile.
+
+	// *********************
+	// *** Feed settings ***
+	// *********************
+
+	define('FORCE_ARTICLE_PURGE', 0);
+	// When this option is not 0, users ability to control feed purging
+	// intervals is disabled and all articles (which are not starred) 
+	// older than this amount of days are purged.
+
+	// *** PubSubHubbub settings ***
+
+	define('PUBSUBHUBBUB_HUB', '');
+	// URL to a PubSubHubbub-compatible hub server. If defined, "Published
+	// articles" generated feed would automatically become PUSH-enabled.
+
+	define('PUBSUBHUBBUB_ENABLED', false);
+	// Enable client PubSubHubbub support in tt-rss. When disabled, tt-rss
+	// won't try to subscribe to PUSH feed updates.
+
+	// *********************
+	// *** Sphinx search ***
+	// *********************
+
+	define('SPHINX_ENABLED', false);
+	// Enable fulltext search using Sphinx (http://www.sphinxsearch.com)
+	// Please see http://tt-rss.org/wiki/SphinxSearch for more information.
+
+	define('SPHINX_INDEX', 'ttrss');
+	// Index name in Sphinx configuration. You can specify multiple indexes
+	// as a comma-separated string.
+
+	// ***********************************
+	// *** Self-registrations by users ***
+	// ***********************************
+
+	define('ENABLE_REGISTRATION', false);
+	// Allow users to register themselves. Please be vary that allowing
+	// random people to access your tt-rss installation is a security risk
+	// and potentially might lead to data loss or server exploit. Disabled
+	// by default.
+
+	define('REG_NOTIFY_ADDRESS', 'user@your.domain.dom');
+	// Email address to send new user notifications to.
+
+	define('REG_MAX_USERS', 10);
+	// Maximum amount of users which will be allowed to register on this
+	// system. 0 - no limit.
+
+	// **********************************
+	// *** Cookies and login sessions ***
+	// **********************************
+	
+	define('SESSION_COOKIE_LIFETIME', 86400*30);
+	// Default lifetime of a session (e.g. login) cookie. In seconds, 
+	// 0 means cookie will be deleted when browser closes.
+	// Setting this to zero will affect several user preferences
+	// like widescreen mode not saving.
+
+	define('SESSION_EXPIRE_TIME', 86400*30);
+	// Hard expiration limit for sessions. Should be
+	// greater or equal to SESSION_COOKIE_LIFETIME
+
+	define('SESSION_CHECK_ADDRESS', 1);
+	// Check client IP address when validating session:
+	// 0 - disable checking
+	// 1 - check first 3 octets of an address (recommended)
+	// 2 - check first 2 octets of an address
+	// 3 - check entire address
+
+	// *********************************
+	// *** Email and digest settings ***
+	// *********************************
+
+	define('SMTP_FROM_NAME', 'Tiny Tiny RSS');
+	define('SMTP_FROM_ADDRESS', 'noreply@your.domain.dom');
+	// Name, address and subject for sending outgoing mail. This applies
+	// to password reset notifications, digest emails and any other mail.
+
+	define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours');
+	// Subject line for email digests
+
+	define('SMTP_HOST', '');
+	// SMTP Host to send outgoing mail. Blank - use system MTA.
+	
+	define('SMTP_PORT','');
+	// SMTP port to sent outgoing mail. Default is 25.
+
+	define('SMTP_LOGIN', '');
+	define('SMTP_PASSWORD', '');
+	// These two options enable SMTP authentication when sending
+	// outgoing mail. Only used with SMTP_HOST
+
+	// ***************************************
+	// *** Other settings (less important) ***
+	// ***************************************
+
+	define('CHECK_FOR_NEW_VERSION', false);
+	// Check for new versions of tt-rss automatically.
+
+	define('ENABLE_GZIP_OUTPUT', false);
+	// Selectively gzip output to improve wire performance. This requires
+	// PHP Zlib extension on the server.
+	// Enabling this can break tt-rss in several httpd/php configurations,
+	// if you experience weird errors and tt-rss failing to start, blank pages
+	// after login, or content encoding errors, disable it.
+
+	define('PLUGINS', 'auth_remote, auth_internal, note');
+	// Comma-separated list of plugins to load automatically for all users.
+	// System plugins have to be specified here. Please enable at least one
+	// authentication plugin here (auth_*).
+	// Users may enable other user plugins from Preferences/Plugins but may not
+	// disable plugins specified in this list.
+
+	define('CONFIG_VERSION', 26);
+	// Expected config version. Please update this option in config.php
+	// if necessary (after migrating all new options from this file).
+
+	// vim:ft=php
+?>
--- a/software/zimbra-kvm/README.txt
+++ b/software/zimbra-kvm/README.txt
+zimbra-kvm
+==========
+
+Introduction
+------------
+
+Zimbra single-machine deployment inside of a virtual machine.
+
+
+Internals
+---------
+
+The following ports are reachable from the outside world:
+22 -> 2222
+443 -> 4443
+Others?
+
+For each port, KVM does a NAT redirection from the VM to the local ipv4. Then, 6tunnel is called to redirect it to the outside world using ipv6.
+
+
+Deployment
+----------
+
+To deploy a new Zimbra service, you just need to request a new instance of it,
+then connect the the machine using ssh with root:zimbra credentials, reconfigure
+Zimbra to use another domain name, and change root password.
+
+Disk Image content
+------------------
+
+Ubuntu 12.04, Zimbra install from official packages, 8.0.3
+admin password: Cedric de Saint Martin has it.
+bind9: http://wiki.zimbra.com/index.php?title=Split_dns
+resolv.conf: http://askubuntu.com/questions/30942/why-does-my-resolv-conf-file-get-regenerated-every-time
+
+
+Todo
+----
+
+ * SMTP master/slave design implemented
+ * Reverse proxy for web works
+ * Automatically download the proper boot disk image.
+ * Have two virtual disks: one for system/zimbra, one for data.
+ * Unify smtp frontend and web frontend
+
--- a/software/zimbra-kvm/common.cfg
+++ b/software/zimbra-kvm/common.cfg
+[buildout]
+
+extends =
+  ../../component/6tunnel/buildout.cfg
+  ../../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/slapos.cfg
+
+parts =
+  template
+  eggs
+
+[eggs]
+recipe = z3c.recipe.scripts
+eggs =
+  ${lxml-python:egg}
+  websockify
+  slapos.cookbook
+  slapos.toolbox
+
+[template-kvm]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-kvm.cfg.in
+#md5sum = d4f7203365bacd70ad62f6b6de9f74d4
+output = ${buildout:directory}/template-kvm.cfg
+mode = 0644
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg.in
+#md5sum = 68788763d23f70f24b9e575871c903a8
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[versions]
+# Numpy 1.7.0 doesn't install well
+numpy = 1.6.2
--- a/software/zimbra-kvm/development.cfg
+++ b/software/zimbra-kvm/development.cfg
+[buildout]
+extends =
+  ../../component/git/buildout.cfg
+  common.cfg
+
+parts +=
+  slapos.cookbook-repository
+  slapos.toolbox-repository
+  check-recipe
+
+develop =
+  ${:parts-directory}/slapos.cookbook-repository
+  ${:parts-directory}/slapos.toolbox-repository
+
+[slapos.cookbook-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
+branch = zimbra-kvm
+git-executable = ${git:location}/bin/git
+
+[slapos.toolbox-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.toolbox.git
+branch = master
+git-executable = ${git:location}/bin/git
+
+[check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command =
+  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
+  grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
--- a/software/zimbra-kvm/instance-kvm.cfg.in
+++ b/software/zimbra-kvm/instance-kvm.cfg.in
+#############################
+#
+# Instanciate kvm
+#
+#############################
+[buildout]
+parts =
+  certificate-authority
+  request-web-frontend
+  kvm-promise
+  tunnel-ipv6-kvm-https
+  tunnel-ipv6-kvm-ssh
+  tunnel-ipv6-kvm-zimbra-admin
+  tunnel-ipv6-kvm-smtp
+  tunnel-ipv6-kvm-smtp-submission
+  websockify-sighandler
+  novnc-promise
+  publish-kvm-connection-information
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+bin = $${buildout:directory}/bin
+srv = $${buildout:directory}/srv
+var = $${buildout:directory}/var
+scripts = $${:etc}/run
+services = $${:etc}/service
+promises = $${:etc}/promise
+novnc-conf = $${:etc}/novnc
+run = $${:var}/run
+ca-dir = $${:srv}/ssl
+
+[create-mac]
+recipe = slapos.cookbook:generate.mac
+storage-path = $${directory:srv}/mac
+
+[gen-passwd]
+recipe = slapos.cookbook:generate.password
+storage-path = $${directory:srv}/passwd
+bytes = 4
+
+[kvm-instance]
+# XXX-Cedric: change "KVM" recipe to simple "create wrappers". No need for this
+# Specific code
+recipe = slapos.cookbook:zimbra.kvm
+vnc-ip = $${slap-network-information:local-ipv4}
+vnc-port = 5901
+boot-disk-path = $${directory:srv}/boot.qcow2
+data-disk-path = $${directory:srv}/virtual.qcow2
+data-disk-size = $${slap-parameter:disk-size}
+data-disk-type = $${slap-parameter:disk-type}
+socket-path = $${directory:var}/qmp_socket
+pid-path = $${directory:run}/pid_file
+smp-count = $${slap-parameter:cpu-count}
+ram-size = $${slap-parameter:ram-size}
+disk-type = virtio
+mac-address = $${create-mac:mac-address}
+runner-path = $${directory:services}/kvm
+controller-path = $${directory:scripts}/kvm_controller
+shell-path = ${dash:location}/bin/dash
+qemu-path = ${kvm:location}/bin/qemu-system-x86_64
+qemu-img-path = ${kvm:location}/bin/qemu-img
+passwd = $${gen-passwd:passwd}
+
+[kvm-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${directory:promises}/vnc_promise
+hostname = $${kvm-instance:vnc-ip}
+port = $${kvm-instance:vnc-port}
+
+
+# 6tunnel
+# Refers to http://wiki.zimbra.com/wiki/Ports#External_Access
+[tunnel-ipv6-kvm-https]
+recipe = slapos.cookbook:ipv6toipv4
+ipv6 = $${slap-network-information:global-ipv6}
+ipv6-port = 443
+ipv4 = $${slap-network-information:local-ipv4}
+ipv4-port = 443
+shell-path = ${dash:location}/bin/dash
+6tunnel-path = ${6tunnel:location}/bin/6tunnel
+runner-path = $${directory:services}/6tunnel-https
+
+[tunnel-ipv6-kvm-zimbra-admin]
+recipe = slapos.cookbook:ipv6toipv4
+ipv6 = $${slap-network-information:global-ipv6}
+ipv6-port = 7071
+ipv4 = $${slap-network-information:local-ipv4}
+ipv4-port = 7071
+shell-path = ${dash:location}/bin/dash
+6tunnel-path = ${6tunnel:location}/bin/6tunnel
+runner-path = $${directory:services}/6tunnel-zimbra_admin
+
+[tunnel-ipv6-kvm-ssh]
+recipe = slapos.cookbook:ipv6toipv4
+ipv6 = $${slap-network-information:global-ipv6}
+ipv6-port = 2222
+ipv4 = $${slap-network-information:local-ipv4}
+ipv4-port = 2222
+shell-path = ${dash:location}/bin/dash
+6tunnel-path = ${6tunnel:location}/bin/6tunnel
+runner-path = $${directory:services}/6tunnel-ssh
+
+[tunnel-ipv6-kvm-smtp]
+recipe = slapos.cookbook:ipv6toipv4
+ipv6 = $${slap-network-information:global-ipv6}
+ipv6-port = 25
+ipv4 = $${slap-network-information:local-ipv4}
+ipv4-port = 25
+shell-path = ${dash:location}/bin/dash
+6tunnel-path = ${6tunnel:location}/bin/6tunnel
+runner-path = $${directory:services}/6tunnel-smtp
+
+[tunnel-ipv6-kvm-smtp-submission]
+recipe = slapos.cookbook:ipv6toipv4
+ipv6 = $${slap-network-information:global-ipv6}
+ipv6-port = 587
+ipv4 = $${slap-network-information:local-ipv4}
+ipv4-port = 587
+shell-path = ${dash:location}/bin/dash
+6tunnel-path = ${6tunnel:location}/bin/6tunnel
+runner-path = $${directory:services}/6tunnel-smtp-submission
+
+
+
+
+
+[novnc-instance]
+recipe = slapos.cookbook:novnc
+path = $${ca-novnc:executable}
+ip = $${slap-network-information:global-ipv6}
+port = 6080
+vnc-ip = $${kvm-instance:vnc-ip}
+vnc-port = $${kvm-instance:vnc-port}
+novnc-location = ${noVNC:location}
+websockify-path = ${buildout:directory}/bin/websockify
+ssl-key-path = $${ca-novnc:key-file}
+ssl-cert-path = $${ca-novnc:cert-file}
+
+[websockify-sighandler]
+recipe = slapos.cookbook:signalwrapper
+wrapper-path = $${directory:services}/websockify
+wrapped-path = $${novnc-instance:path}
+
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = ${openssl:location}/bin/openssl
+ca-dir = $${directory:ca-dir}
+requests-directory = $${cadirectory:requests}
+wrapper = $${directory:services}/certificate_authority
+ca-private = $${cadirectory:private}
+ca-certs = $${cadirectory:certs}
+ca-newcerts = $${cadirectory:newcerts}
+ca-crl = $${cadirectory:crl}
+
+[cadirectory]
+recipe = slapos.cookbook:mkdirectory
+requests = $${directory:ca-dir}/requests/
+private = $${directory:ca-dir}/private/
+certs = $${directory:ca-dir}/certs/
+newcerts = $${directory:ca-dir}/newcerts/
+crl = $${directory:ca-dir}/crl/
+
+[ca-novnc]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+key-file = $${directory:novnc-conf}/novnc.key
+cert-file = $${directory:novnc-conf}/novnc.crt
+executable = $${directory:bin}/novnc
+wrapper = $${directory:bin}/websockify
+
+[novnc-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${directory:promises}/novnc_promise
+hostname = $${novnc-instance:ip}
+port = $${novnc-instance:port}
+
+
+[kvm-monitor]
+recipe = slapos.cookbook:generic.slapmonitor
+db-path = $${directory:srv}/slapmonitor_database
+
+
+[request-slave-frontend]
+recipe = slapos.cookbook:requestoptional
+software-url = $${slap-parameter:frontend-software-url}
+server-url = $${slap-connection:server-url}
+key-file = $${slap-connection:key-file}
+cert-file = $${slap-connection:cert-file}
+computer-id = $${slap-connection:computer-id}
+partition-id = $${slap-connection:partition-id}
+name = VNC Frontend
+software-type = $${slap-parameter:frontend-software-type}
+slave = true
+config = host port
+config-host = $${novnc-instance:ip}
+config-port = $${novnc-instance:port}
+return = url resource port domainname
+sla = instance_guid
+sla-instance_guid = $${slap-parameter:frontend-instance-guid}
+
+[request-web-frontend]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = Web Frontend
+# XXX We have hardcoded SR URL here.
+software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+slave = true
+config = url custom_domain
+config-url = https://[$${tunnel-ipv6-kvm-https:ipv6}]:$${tunnel-ipv6-kvm-https:ipv6-port}/
+return = site_url
+config-custom_domain = $${slap-parameter:domain}
+
+[request-smtp-frontend]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = SMTP Frontend
+# XXX We have hardcoded SR URL here.
+#software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/zimbra-kvm:/software/reverse-proxy-nginx/development.cfg
+software-url = /opt/slapdev/software/reverse-proxy-nginx/development.cfg
+slave = true
+config = smtp-upstream-host smtp-upstream-port
+config-smtp-upstream-host = $${tunnel-ipv6-kvm-smtp:ipv6}
+config-smtp-upstream-port = $${tunnel-ipv6-kvm-smtp:port}
+return = listening-ipv4
+
+[publish-kvm-connection-information]
+recipe = slapos.cookbook:publish
+web-backend-url = https://[$${tunnel-ipv6-kvm-https:ipv6}]:$${tunnel-ipv6-kvm-https:ipv6-port}/
+web-url = $${request-web-frontend:connection-site_url}
+vnc-backend-url = https://[$${novnc-instance:ip}]:$${novnc-instance:port}/vnc_auto.html?host=[$${novnc-instance:ip}]&port=$${novnc-instance:port}&encrypt=1
+vnc-password = $${kvm-instance:passwd}
+vnc-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}
+ssh = ssh root@$${tunnel-ipv6-kvm-ssh:ipv6} -p $${tunnel-ipv6-kvm-ssh:ipv6-port}
+smtp-listening-ipv4 = $${request-smtp-frontend:connection-listening-ipv4}
+
+[slap-parameter]
+# Default values if not specified
+frontend-instance-guid =
+frontend-software-type = frontend
+frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg
+
+ram-size = 4096
+disk-size = 50
+disk-type = virtio
+
+cpu-count = 4
+
+domain =
+
--- a/software/zimbra-kvm/instance.cfg.in
+++ b/software/zimbra-kvm/instance.cfg.in
+[buildout]
+parts =
+  switch-softwaretype
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${template-kvm:output}
+
+[slap-connection]
+# part to migrate to new - separated words
+computer-id = $${slap_connection:computer_id}
+partition-id = $${slap_connection:partition_id}
+server-url = $${slap_connection:server_url}
+software-release-url = $${slap_connection:software_release_url}
+key-file = $${slap_connection:key_file}
+cert-file = $${slap_connection:cert_file}
--- a/software/zimbra-kvm/software.cfg
+++ b/software/zimbra-kvm/software.cfg
+[buildout]
+extends = common.cfg
+
+[networkcache]
+# signature certificates of the following uploaders.
+#   Romain Courteaud
+#   Cedric de Saint Martin
+#   Test Agent
+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-----
+  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]
+numpy = 1.6.2
+Jinja2 = 2.6
+Werkzeug = 0.8.3
+apache-libcloud = 0.12.1
+async = 0.6.1
+buildout-versions = 1.7
+gitdb = 0.5.4
+hexagonit.recipe.cmmi = 1.6
+lxml = 3.1.0
+meld3 = 0.6.10
+plone.recipe.command = 1.1
+pycrypto = 2.6
+slapos.cookbook = 0.73.1
+slapos.recipe.template = 2.4.2
+slapos.toolbox = 0.33.1
+smmap = 0.8.2
+websockify = 0.3.0
+z3c.recipe.scripts = 1.0.1
+
+# Required by:
+# slapos.core==0.35.1
+# slapos.toolbox==0.33.1
+Flask = 0.9
+
+# Required by:
+# slapos.toolbox==0.33.1
+GitPython = 0.3.2.RC1
+
+# Required by:
+# slapos.toolbox==0.33.1
+atomize = 0.1.1
+
+# Required by:
+# slapos.toolbox==0.33.1
+feedparser = 5.1.3
+
+# Required by:
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.6nxd002
+
+# Required by:
+# slapos.cookbook==0.73.1
+inotifyx = 0.2.0
+
+# Required by:
+# slapos.cookbook==0.73.1
+netaddr = 0.7.10
+
+# Required by:
+# slapos.core==0.35.1
+netifaces = 0.8
+
+# Required by:
+# slapos.toolbox==0.33.1
+paramiko = 1.10.0
+
+# Required by:
+# slapos.toolbox==0.33.1
+psutil = 0.6.1
+
+# Required by:
+# slapos.core==0.35.1
+pyflakes = 0.6.1
+
+# Required by:
+# slapos.cookbook==0.73.1
+pytz = 2012j
+
+# Required by:
+# slapos.cookbook==0.73.1
+# slapos.core==0.35.1
+# slapos.toolbox==0.33.1
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.73.1
+# slapos.toolbox==0.33.1
+slapos.core = 0.35.1
+
+# Required by:
+# slapos.core==0.35.1
+supervisor = 3.0b1
+
+# Required by:
+# slapos.core==0.35.1
+unittest2 = 0.5.1
+
+# Required by:
+# slapos.cookbook==0.73.1
+# 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
--- a/stack/cloudooo.cfg
+++ b/stack/cloudooo.cfg
@@ -36,7 +36,6 @@ extends =
  ../component/libreoffice-bin/buildout.cfg 
  ../component/libpng/buildout.cfg
  ../component/lxml-python/buildout.cfg
-  ../component/python-2.6/buildout.cfg
  ../component/python-2.7/buildout.cfg
  ../component/xorg/buildout.cfg
  ../component/fonts/buildout.cfg
@@ -77,7 +76,6 @@ parts =
  poppler
  ffmpeg

-  bootstrap2.6
  rdiff-backup
  cloudooo

@@ -85,9 +83,6 @@ parts =
 develop +=
  ${:parts-directory}/cloudooo

-[bootstrap2.6]
-python = python2.6
-
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.6.0-dev-SlapOS-006
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -19,7 +19,7 @@ allow-hosts += pybrary.net

 extends =
 # Exact version of Zope
-  http://svn.zope.org/repos/main/Zope/tags/2.12.26/versions.cfg
+  http://svn.zope.org/repos/main/Zope/tags/2.13.19/versions.cfg
  ../../stack/slapos.cfg
  ../../component/logrotate/buildout.cfg
  ../../component/dcron/buildout.cfg
@@ -44,7 +44,6 @@ extends =
  ../../component/pil-python/buildout.cfg
  ../../component/pycrypto-python/buildout.cfg
  ../../component/pysvn-python/buildout.cfg
-  ../../component/python-2.6/buildout.cfg
  ../../component/python-2.7/buildout.cfg
  ../../component/python-ldap-python/buildout.cfg
  ../../component/rdiff-backup/buildout.cfg
@@ -89,7 +88,6 @@ parts =
  w3-validator
  tesseract
  hookbox
-  bootstrap2.6
  perl-DBD-mariadb
  perl-DBI
  percona-toolkit
@@ -132,8 +130,6 @@ parts =
 # Local development
  slapos.cookbook-repository
  check-recipe
-  slapos.cookbook-python2.6
-  slapos.recipe.template-python2.6
 # Create instance template
  template

@@ -155,19 +151,6 @@ stop-on-error = true
 update-command = ${:command}
 command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link

-[slapos.cookbook-python2.6]
-recipe = zc.recipe.egg
-eggs = slapos.cookbook
-scripts =
-python = python2.6
-ugly-depend-on = ${slapos.cookbook-repository:repository} ${slapos.cookbook-repository:branch}
-
-[slapos.recipe.template-python2.6]
-recipe = zc.recipe.egg
-eggs = slapos.recipe.template
-scripts =
-python = python2.6
-
 [template-jinja2-base]
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/${:filename}.in
@@ -344,9 +327,6 @@ command =
  ${buildout:executable} ${:genbt5list} ${local-bt5-repository:list}
 update-command = ${:command}

-[bootstrap2.6]
-python = python2.6
-
 [erp5_repository_list]
 repository_id_list = erp5

@@ -368,7 +348,7 @@ update-command = ${:command}
 # XXX: Workaround for fact ERP5Type is not an distribution and does not
 #      expose entry point for test runner
 recipe = zc.recipe.egg
-python = python2.6
+python = python2.7
 eggs = ${eggs:eggs}
 extra-paths = ${eggs:extra-paths}
 entry-points =
@@ -399,12 +379,13 @@ initialization =
  sys.path[:0] = sum((
    glob.glob(os.path.join(x, 'Products', '*', 'tests'))
    for x in os.getenv('INSERT_PRODUCTS_PATH', '').split(os.pathsep)), [])
+  os.environ['CGI_PATH'] = '${w3-validator:location}/httpd/cgi-bin'

 [test_suite_runner]
 # XXX: Workaround for fact ERP5Type is not an distribution and does not
 #      expose entry point for test runner
 recipe = zc.recipe.egg
-python = python2.6
+python = python2.7
 eggs = ${eggs:eggs}
 extra-paths = ${eggs:extra-paths}
 entry-points =
@@ -423,7 +404,7 @@ initialization =

 [eggs]
 recipe = zc.recipe.egg
-python = python2.6
+python = python2.7
 eggs =
  ${mysql-python:egg}
  ${lxml-python:egg}
@@ -445,6 +426,7 @@ eggs =
  ordereddict
  paramiko
  ply
+  pyflakes
  pyPdf # should be replaced by PyPDF2, but it is not installable
  python-magic
  python-memcached
@@ -492,6 +474,10 @@ eggs =
  Products.TIDStorage
  Products.LongRequestLogger

+# BBB: Temporarily keep zope.app.testing awaiting we use newer version of CMF
+#      (for tests like testCookieCrumbler).
+  zope.app.testing
+
 # Currently forked in our repository
 #    Products.PortalTransforms
 # Dependency for our fork of PortalTransforms
@@ -503,7 +489,7 @@ eggs =
 # parameterizing the version of the generated python interpreter name by the
 # python section version causes dependency between this egg section and the
 # installation of python, which we don't want on an instance
-interpreter = python2.6
+interpreter = python2.7
 scripts =
  repozo
  runzope
@@ -517,7 +503,7 @@ extra-paths =

 [zodbanalyze]
 recipe = zc.recipe.egg
-python = python2.6
+python = python2.7
 eggs =
  ZODB3
  erp5.util
@@ -527,22 +513,22 @@ scripts = zodbanalyze

 [cloudooo-repository]
 branch = master
-revision = 6629837c96ae58e96cac019044ce95d19cb7a659
+revision = 168786a4c747d4dc4578a6428d39b3b2b3e1eb10

 [mysql-python]
-python = python2.6
+python = python2.7

 [lxml-python]
-python = python2.6
+python = python2.7

 [pil-python]
-python = python2.6
+python = python2.7

 [python-ldap-python]
-python = python2.6
+python = python2.7

 [pysvn-python]
-python = python2.6
+python = python2.7

 [slapos-toolbox]
 recipe = zc.recipe.egg
@@ -606,6 +592,16 @@ Products.CMFDefault = 2.2.2
 Products.CMFTopic = 2.2.1
 Products.CMFUid = 2.2.1

+# newer version requires zope.traversing>=4.0.0a2.
+zope.app.appsetup = 3.16.0
+
+# newer version requires zope.i18n>=4.0.0a3
+zope.app.publication = 3.14.0
+
+# BBB: Temporarily keep zope.app.testing awaiting we use newer version of CMF
+#      (for tests like testCookieCrumbler).
+zope.app.testing = 3.8.1
+
 # Pinned versions
 Flask = 0.9
 GitPython = 0.3.2.RC1
@@ -623,6 +619,7 @@ Products.LongRequestLogger = 1.1.0
 Products.MimetypesRegistry = 2.0.4
 Products.PluginRegistry = 1.3
 Products.TIDStorage = 5.4.8
+Products.ZSQLMethods = 2.13.4
 Pygments = 1.6
 StructuredText = 2.11.1
 WSGIUtils = 0.7
@@ -641,6 +638,7 @@ erp5.util = 0.4.33
 erp5diff = 0.8.1.5
 eventlet = 0.12.1
 feedparser = 5.1.3
+five.formlib = 1.0.4
 five.localsitemanager = 2.0.5
 fpconst = 0.7.2
 gitdb = 0.5.4
@@ -652,7 +650,7 @@ inotifyx = 0.2.0
 ipdb = 0.7
 ipython = 0.13.1
 meld3 = 0.6.10
-mr.developer = 1.24
+mr.developer = 1.25
 netaddr = 0.7.10
 netifaces = 0.8
 ordereddict = 1.1
@@ -665,7 +663,7 @@ pyPdf = 1.13
 pyflakes = 0.6.1
 python-ldap = 2.4.10
 python-magic = 0.4.3
-qrcode = 2.4.2
+qrcode = 2.5.1
 requests = 1.1.0
 restkit = 4.2.1
 rtjp-eventlet = 0.3.2
@@ -684,3 +682,6 @@ uuid = 1.30
 validictory = 0.9.0
 xml-marshaller = 0.9.7
 xupdate-processor = 0.4
+zope.app.debug = 3.4.1
+zope.app.dependable = 3.5.1
+zope.app.form = 4.0.2
--- a/stack/lamp/apache/instance-apache-php.cfg.in
+++ b/stack/lamp/apache/instance-apache-php.cfg.in
 [buildout]
+extends = ${custom-application-deployment:path}

 parts =
  certificate-authority
@@ -13,6 +14,8 @@ parts =
  frontend-promise
  content-promise
  publish-connection-informations
+  ${custom-application-deployment:part-list}
+

 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -35,6 +38,7 @@ tmp = $${buildout:directory}/tmp
 recipe = slapos.cookbook:mkdirectory
 log = $${rootdirectory:var}/log
 services = $${rootdirectory:etc}/service
+scripts = $${rootdirectory:etc}/run
 run = $${rootdirectory:var}/run
 backup = $${rootdirectory:srv}/backup
 promises = $${rootdirectory:etc}/promise

--- a/stack/lamp/buildout.cfg
+++ b/stack/lamp/buildout.cfg
@@ -74,7 +74,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
 output = ${buildout:directory}/instance-apache-php.cfg
-md5sum = af0d52de4c10d5a3a64f7c92283ad959
+md5sum = 296ba845c8ffe75fbc6352dd0e8ce836
 mode = 0644

 [instance-apache-import]
@@ -95,7 +95,7 @@ context = key templateapache instance-apache-php:output
 import-list = file parts template-parts:destination
              file replicated template-replicated:destination

-md5sum = 4704f2788f096c7494694db72a9f6193
+md5sum = 24c5d0db063e5343a3cb0db9d5fbc738
 mode = 0644

 [instance-resilient]
@@ -135,6 +135,19 @@ md5sum = 0352896921ca1766b64f0b54f0f8c27e
 mode = 0644


+#----------------
+#--
+#-- Optional part allowing applications using this stack to run a custom
+#-- instance.cfg at the end of Apache/PHP instance deployment.
+#-- To use it in your application, just override those two parameters, like:
+
+[custom-application-deployment]
+# path = /path/to/instance-custom.cfg
+# part-list = part1 part2
+# See software/maarch/software.cfg for an example.
+path =
+part-list =
+
 #----------------
 #-- Dummy parts in case no application configuration file is needed

@@ -145,13 +158,25 @@ location =
 [application-configuration]
 location =

-#----------------
+
+[custom-application-deployment]
+# Optional part allowing applications using this stack to run a custom
+# instance.cfg at the end of Apache/PHP instance deployment.
+# To use it in your application, just override those two parameters, like:
+# path = /path/to/instance-custom.cfg
+# part-list =
+#  part1
+#  part2
+# See software/tt-rss/software.cfg for an example.
+path =
+part-list =
+

 [eggs]
 recipe = zc.recipe.egg
 eggs =
  ${lxml-python:egg}
-  slapos.toolbox
+  slapos.toolbox[lampconfigure]

 [networkcache]
 # Romain Courteaud + Sebastien Robin + Alain Takoudjou
@@ -287,41 +312,42 @@ signature-certificate-list =

 [versions]
 Jinja2 = 2.6
+MySQL-python = 1.2.4
 Werkzeug = 0.8.3
-apache-libcloud = 0.12.1
+apache-libcloud = 0.12.3
 async = 0.6.1
 buildout-versions = 1.7
 gitdb = 0.5.4
 hexagonit.recipe.cmmi = 1.6
 inotifyx = 0.2.0
-lxml = 3.1.0
+lxml = 3.1.1
 meld3 = 0.6.10
 netaddr = 0.7.10
 pycrypto = 2.6
-pytz = 2012j
+pytz = 2013b
 rdiff-backup = 1.0.5
-slapos.cookbook = 0.74.0
+slapos.cookbook = 0.76.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
+slapos.toolbox = 0.34.0
 smmap = 0.8.2

 # Required by:
 # slapos.core==0.35.1
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.34.0
 Flask = 0.9

 # Required by:
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.34.0
 GitPython = 0.3.2.RC1

 # Required by:
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.34.0
 atomize = 0.1.1

 # Required by:
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.34.0
 feedparser = 5.1.3

 # Required by:
@@ -329,11 +355,11 @@ feedparser = 5.1.3
 netifaces = 0.8

 # Required by:
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.34.0
 paramiko = 1.10.0

 # Required by:
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.34.0
 psutil = 0.6.1

 # Required by:
@@ -341,16 +367,17 @@ psutil = 0.6.1
 pyflakes = 0.6.1

 # Required by:
-# slapos.cookbook==0.74.0
+# hexagonit.recipe.download==1.6nxd002
+# slapos.cookbook==0.76.0
 # slapos.core==0.35.1
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.34.0
 # supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-010
 # zope.interface==4.0.5
 setuptools = 0.6c12dev-r88846

 # Required by:
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.34.0
 slapos.core = 0.35.1

 # Required by:
@@ -362,9 +389,10 @@ supervisor = 3.0b1
 unittest2 = 0.5.1

 # Required by:
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.34.0
 xml-marshaller = 0.9.7

 # Required by:
 # slapos.core==0.35.1
-zope.interface = 4.0.5
\ No newline at end of file
+zope.interface = 4.0.5
+
--- a/stack/lapp/buildout.cfg
+++ b/stack/lapp/buildout.cfg
@@ -311,100 +311,115 @@ signature-certificate-list =
 [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.cookbook = 0.72.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.6nxd002
+# slapos.cookbook==0.74.1-dev
+inotifyx = 0.2.0

 # Required by:
-# slapos.core==0.33.2-dev
+# 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.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.cookbook==0.70.1-dev
-# slapos.core==0.33.2-dev
-# slapos.toolbox==0.32.1-dev
+# slapos.core==0.35.1
+pyflakes = 0.6.1
+
+# Required by:
+# 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
-supervisor = 3.0b1
+# slapos.cookbook==0.74.1-dev
+# slapos.toolbox==0.33.1
+slapos.core = 0.35.1

 # Required by:
-# slapos.toolbox==0.32.1-dev
-xml-marshaller = 0.9.7
+# slapos.core==0.35.1
+supervisor = 3.0b1

 # Required by:
-# slapos.core==0.33.2-dev
-zope.interface = 4.0.2
-
-cp.recipe.cmd = 0.4
-plone.recipe.command = 1.1
-slapos.recipe.build = 0.11.5
-slapos.toolbox = 0.33
+# slapos.core==0.35.1
+unittest2 = 0.5.1

 # Required by:
-# slapos.toolbox==0.33
-slapos.core = 0.35
+# slapos.cookbook==0.74.1-dev
+# slapos.toolbox==0.33.1
+xml-marshaller = 0.9.7

 # Required by:
-# slapos.core==0.35
-unittest2 = 0.5.1
+# zope.testing==4.1.2
+zope.exceptions = 4.0.6

 # Required by:
-# zope.testing==4.1.1
-zope.exceptions = 4.0.5
+# 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.1
+zope.testing = 4.1.2

--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -3,7 +3,7 @@

 [buildout]
 # Developers need to add explicitely this part in their software profile
-parts = slapos-cookbook
+# parts = slapos-cookbook

 # Generate list of automatically chosen eggs version
 extensions +=
@@ -60,6 +60,7 @@ recipe = zc.recipe.egg
 eggs =
  ${lxml-python:egg}
  slapos.cookbook
+  hexagonit.recipe.download
  inotifyx
  netaddr
  slapos.core
@@ -71,8 +72,10 @@ eggs =
 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 2.x is for Buildout 2
 zc.recipe.egg = 1.3.2
+# Use own version of h.r.download to be able to open xz-like archives
+hexagonit.recipe.download = 1.6nxd002

 [networkcache]
 download-cache-url = http://www.shacache.org/shacache