Merge branch 'master' into kvm

4fe3a808 · Cédric de Saint Martin · 367bcc9e · c7d16ba5 · 4fe3a808 · 4fe3a808
Commit 4fe3a808 authored Mar 16, 2012 by Cédric de Saint Martin
59 changed files
--- a/CHANGES.txt
+++ b/CHANGES.txt
 Changes
 =======

-0.39 (unreleased)
+0.40.1 (2012-03-01)
 -----------------

- * No changes yet.
+ * Fix manifest to include files needed for apache. [Cedric de Saint Martin]
+
+0.40 (2012-03-01)
+-----------------
+
+ * apache_frontend initial release. [Cedric de Saint Martin]
+ 
+0.39 (2012-02-20)
+-----------------
+
+ * seleniumrunner initial release. [Cedric de Saint Martin]

 0.38 (2011-12-05)
 -----------------
@@ -190,9 +200,10 @@ Changes
 -----------------

 * Add PHPMyAdmin software release used in SlapOS tutorials
-   [Cedric de Saint Martin]
+ [Cedric de Saint Martin]
 * Add slaprunner software release [Cedric de Saint Martin]

+
 0.9 (2011-06-24)
 ----------------


--- a/MANIFEST.in
+++ b/MANIFEST.in
 include CHANGES.txt
 include slapos/recipe/generic_zope/template/site.zcml
+include slapos/recipe/apache_frontend/template/notfound.html
 recursive-include slapos/recipe *.in
 recursive-include slapos/recipe *.bin
 recursive-include slapos/recipe README.*.txt
--- a/component/alsa/buildout.cfg
+++ b/component/alsa/buildout.cfg
+[buildout]
+parts =
+  alsa
+
+[alsa]
+# Contains libasound
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.24.1.tar.bz2
+#md5sum = d55a9d7d2a79d738a1b7a511cffda4b6
+configure-options =
+  --disable-static
+  --disable-aload
+  --disable-mixer
+  --disable-pcm
+  --disable-rawmidi
+  --disable-hwdep
+  --disable-seq
+  --disable-ucm
+  --disable-alisp
+  --disable-old-symbols
+  --disable-python
\ No newline at end of file
--- a/component/apache/buildout.cfg
+++ b/component/apache/buildout.cfg
@@ -13,23 +13,13 @@ extends =
  ../sqlite3/buildout.cfg
  ../zlib/buildout.cfg

-[apache-CVE-2011-3368.patch]
-recipe = hexagonit.recipe.download
-md5sum = 1ad598213480ddfc239ce6359b7b2c0b
-url = http://www.apache.org/dist/httpd/patches/apply_to_2.2.21/CVE-2011-3368.patch
-filename = ${:_buildout_section_name_}
-download-only = true
-
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = hexagonit.recipe.cmmi
 depends =
  ${gdbm:version}
-url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.21.tar.bz2
-md5sum = 1696ae62cd879ab1d4dd9ff021a470f2
-patches =
-  ${apache-CVE-2011-3368.patch:location}/${apache-CVE-2011-3368.patch:filename}
-patch-options = -p1
+url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.22.tar.bz2
+md5sum = 9fe3093194c8a57f085ff7c3fc43715f
 configure-options = --disable-static
                    --enable-authn-alias
                    --enable-bucketeer

--- a/component/binutils/buildout.cfg
+++ b/component/binutils/buildout.cfg
+[buildout]
+parts =
+  binutils
+
+[binutils]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnu.org/gnu/binutils/binutils-2.21.1.tar.bz2
+md5sum = bde820eac53fa3a8d8696667418557ad
--- a/component/ca-certificates/buildout.cfg
+++ b/component/ca-certificates/buildout.cfg
@@ -14,7 +14,7 @@ download-only = true

 [ca-certificates]
 recipe = hexagonit.recipe.cmmi
-version = 20111211
+version = 20120212
 url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.gz
 patches =
  ${ca-certificates-sbin-dir.patch:location}/${ca-certificates-sbin-dir.patch:filename}

--- a/component/chromium/buildout.cfg
+++ b/component/chromium/buildout.cfg
+[buildout]
+extends =
+  ../dbus/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../glib/buildout.cfg
+  ../gtk-2/buildout.cfg
+  ../libpng/buildout.cfg
+  ../xorg/buildout.cfg
+
+parts = 
+  chromium
+  
+[chromium]
+recipe = slapos.recipe.build
+slapos_promise =
+  file:chrome
+  file:chrome-wrapper
+  file:chrome-slapos
+
+#chromium zip files for linux seem to be corrupted : rights are not correctly
+#set (+x) when unzipping using python, but it works when doing "unzip chromium.zip"
+#AND it works when unzipping any other archive with python.
+#Conclusion : Google, please, learn how to make zip files.
+linux_x86 = http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/109696/chrome-linux.zip 8ba6c022849b2a882b6e65163c147eb9
+linux_x86-64 = http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/109696/chrome-linux.zip a3ed3feb285ecfe7c722576db80d5099
+mac_x86-64 = http://commondatastorage.googleapis.com/chromium-browser-continuous/Mac/100142/chrome-mac.zip cb3a76b8a1a93be94df2f500fb621131
+
+script =
+  #If part directory already exist, will just throw an error.
+  import sys
+  platform = '%%s_%%s' %% (guessOperatingSystem(), guessPlatform())
+  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[platform].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", "chrome-slapos")
+  wrapper = open(wrapper_location, 'w')
+  wrapper.write("""#!/bin/sh
+  export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${dbus-glib:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:${gtk-2:location}/lib:${libpng:location}/lib:%(location)s
+  %(location)s/chrome""")
+  wrapper.flush()
+  wrapper.close()
+  os.chmod(wrapper_location, 0766)
+  os.chmod(os.path.join("%(location)s", 'chrome'), 0766)
+  os.chmod(os.path.join("%(location)s", 'chrome-wrapper'), 0766)
+
+# requirements : libXrender1 libxss1 x11-common
\ No newline at end of file
--- a/component/cloudooo/buildout.cfg
+++ b/component/cloudooo/buildout.cfg
 [buildout]
-software_home = ${:directory}
-
 extends =
-  ../profiles/versions-common.cfg
-  ../profiles/software-definition.cfg
-  ../profiles/common.cfg
-  ../xpdf/buildout.cfg
-  ../imagemagick/buildout.cfg
-  ../file/buildout.cfg
-  ../pdftk/buildout.cfg
-  ../ffmpeg/buildout.cfg
-  ../python-2.6/buildout.cfg
-  ../libreoffice-bin/buildout.cfg
  ../lxml-python/buildout.cfg

-python = software_definition
-versions = versions
 parts =
-  instance_template
  cloudooo
-  imagemagick
-  instance-egg
-  libreoffice-bin
-  file
-  xpdf
-  pdftk
-  ffmpeg
-  python2.6
-  bootstrap2.6

-cloudooo-packages = 
-  cloudooo.handler.ooo
-  cloudooo.handler.pdf
-  cloudooo.handler.ffmpeg
-  cloudooo.handler.imagemagick
-  cloudooo
+sources = sources

+[sources]
+# Include information related to official cloudooo source code.
+cloudooo = git http://git.erp5.org/repos/cloudooo.git

-[instance-egg]
-recipe = zc.recipe.egg
+[lxml-python]
 python = python2.6
-eggs = 
-  erp5.recipe.cloudoooinstance
-  z3c.recipe.mkdir
-  ${buildout:cloudooo-packages}
-

 [cloudooo]
 recipe = zc.recipe.egg
 python = python2.6
-interpreter = pycloudoo
-scripts = 
 eggs =
  ${lxml-python:egg}
-  collective.recipe.supervisor
-  plone.recipe.command
-  erp5.extension.sectionextender
-  supervisor
-  ${buildout:cloudooo-packages}
-
-[software_definition]
-software_home = ${buildout:directory}
-executable = ${python2.6:executable}
+  cloudooo
+  PasteScript
+scripts =
+  paster=cloudooo_paster
--- a/component/dbus/buildout.cfg
+++ b/component/dbus/buildout.cfg
+[buildout]
+extends =
+  ../libxml2/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../libexpat/buildout.cfg
+
+parts =
+  dbus
+
+[dbus]
+recipe = hexagonit.recipe.cmmi
+url = http://dbus.freedesktop.org/releases/dbus/dbus-1.4.10.tar.gz
+md5sum = 402a2f8102bedbe236e2891b2b0f31c2
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig
+  CPPFLAGS=-I${libexpat:location}/include
+  LDFLAGS=-L${libexpat:location}/lib
+
+[dbus-glib]
+recipe = hexagonit.recipe.cmmi
+url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.94.tar.gz
+md5sum = e1f1506a6f4941e67bffd614b1ad5af6
+environment =
+  PATH=${pkgconfig:location}/bin:${glib:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
+  CPPFLAGS=-I${libexpat:location}/include
+  LDFLAGS=-L${libexpat:location}/lib -L${gettext:location}/lib
--- a/component/dropbear/buildout.cfg
+++ b/component/dropbear/buildout.cfg
@@ -32,6 +32,13 @@ url = ${:_profile_base_location_}/${:filename}
 filename = no-shell-checking.patch
 download-only = true

+[dropbear-static_build_fix.patch]
+recipe = hexagonit.recipe.download
+md5sum = 6e0ccc1949dfa31b4bc3951b9bb6472e
+url = ${:_profile_base_location_}/${:filename}
+filename = dropbear-0.53.1-static_build_fix.patch
+download-only = true
+
 [dropbear]
 recipe = hexagonit.recipe.cmmi
 md5sum = 0284ea239083f04c8b874e08e1aca243
@@ -52,6 +59,7 @@ patches=
  ${dropbear-userspace-patch:location}/${dropbear-userspace-patch:filename}
  ${dropbear-ipv6-patch:location}/${dropbear-ipv6-patch:filename}
  ${dropbear-no-shell-check-patch:location}/${dropbear-no-shell-check-patch:filename}
+  ${dropbear-static_build_fix.patch:location}/${dropbear-static_build_fix.patch:filename}

 patch-options=
  -p1
--- a/component/dropbear/dropbear-0.53.1-static_build_fix.patch
+++ b/component/dropbear/dropbear-0.53.1-static_build_fix.patch
+--- a/Makefile.in	2012-02-13 18:01:23.505279581 +0100
+++ b/Makefile.in	2012-02-13 18:04:17.070140233 +0100
+@@ -77,7 +77,7 @@
+ INSTALL=@INSTALL@
+ CPPFLAGS=@CPPFLAGS@
+ CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
+-LIBS+=@LIBS@
+LIBS+=@CRYPTLIB@ @LIBS@
+ LDFLAGS=@LDFLAGS@
+ 
+ EXEEXT=@EXEEXT@
--- a/component/firefox/buildout.cfg
+++ b/component/firefox/buildout.cfg
+[buildout]
+extends =
+  ../alsa/buildout.cfg
+  ../xorg/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../dbus/buildout.cfg
+  ../gtk-2/buildout.cfg
+  ../libpng/buildout.cfg
+
+parts =
+  firefox
+
+[firefox]
+recipe = slapos.recipe.build
+slapos_promise =
+  file:firefox
+  file:firefox-bin
+
+depends =
+  ${liberation-fonts:location}
+  ${ipaex-fonts:location}
+
+x86 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/7.0.1/linux-i686/fr/firefox-7.0.1.tar.bz2 42c2559892f26ed2a0563faaf693a00f
+x86-64 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/7.0.1/linux-x86_64/en-US/firefox-7.0.1.tar.bz2 20d6c8e3dfc97d08d1dec7d0479f924f
+
+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", "firefox-slapos")
+  wrapper = open(wrapper_location, 'w')
+  wrapper.write("""#!/bin/sh
+  cd %(location)s
+  export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${dbus-glib:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:${libpng:location}/lib:${libSM:location}/lib:${libICE:location}/lib:${alsa:location}/lib:%(location)s
+  export PATH=${fontconfig:location}/bin:$PATH
+  %(location)s/firefox $*""")
+  wrapper.close()
+  os.chmod(wrapper_location, 0777)
+
--- a/component/fontconfig/buildout.cfg
+++ b/component/fontconfig/buildout.cfg
@@ -13,6 +13,7 @@ parts =
 recipe = hexagonit.recipe.cmmi
 url = http://fontconfig.org/release/fontconfig-2.8.0.tar.gz
 md5sum = 77e15a92006ddc2adbb06f840d591c0e
+# XXX-Cedric : should we use --with-add-fonts={somefont:location}/share,{someotherfont:location}/share?
 configure-options =
  --disable-static
  --disable-docs

--- a/component/gtk-2/buildout.cfg
+++ b/component/gtk-2/buildout.cfg
+[buildout]
+extends = 
+  ../glib/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../libpng/buildout.cfg
+  ../xorg/buildout.cfg
+  ../zlib/buildout.cfg
+  ../freetype/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../gettext/buildout.cfg
+  ../libtiff/buildout.cfg
+  ../libjpeg/buildout.cfg
+    
+parts =
+  gtk-2
+
+[cairo]
+recipe = hexagonit.recipe.cmmi
+url = http://cairographics.org/releases/cairo-1.10.2.tar.gz
+md5sum = f101a9e88b783337b20b2e26dfd26d5f
+configure-options = 
+  --enable-tee=yes
+environment = 
+  PATH=${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig
+  CPPFLAGS=-I${libpng:location}/include/ -I${zlib:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib
+  LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib
+
+[pango]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnome.org/pub/gnome/sources/pango/1.29/pango-1.29.3.tar.bz2
+md5sum = be4e3891353fae6b62a6f8d7689c4266
+configure-options = 
+  --disable-static
+# XXX-Cedric : Why, god, why do I have to supply the -lXrender option to linker?
+environment = 
+  PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig::${libXrender:location}/lib/pkgconfig
+  CPPFLAGS=-I${cairo:location}/include/cairo
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -lXrender
+  LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib
+
+[gdk-pixbuf]
+recipe = hexagonit.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 = 
+  --disable-static
+  --without-libintl-prefix
+environment = 
+  PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gettext:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig
+  CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib
+  
+[atk]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnome.org/pub/gnome/sources/atk/2.0/atk-2.0.1.tar.bz2
+md5sum = 87f20b78deaedef858ac54358c0786b1
+environment = 
+  PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${gettext:location}/lib
+  LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib
+
+[gtk-2]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.6.tar.bz2
+md5sum = 421100f6597e613234f8dead6091a9fe
+configure-options = 
+  --disable-static
+  --disable-cups
+  --disable-papi
+  --enable-explicit-deps
+environment = 
+  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gettext:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig
+  CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include -I${cairo:location}/include/cairo
+  LDFLAGS=-L${gettext:location}/lib -L${glib:location}/lib -L${libtiff:location}/lib -L${libjpeg:location}/lib -L${libpng:location}/lib -L${zlib:location}/lib -L${libXrender:location}/lib -L${libX11:location}/lib -L${libXext:location}/lib -L${pango:location}/lib
+  LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib:${libX11:location}/lib
--- a/component/intltool/buildout.cfg
+++ b/component/intltool/buildout.cfg
+[buildout]
+extends =
+  ../gettext/buildout.cfg
+  ../perl/buildout.cfg
+  ../perl-XML-Parser/buildout.cfg
+
+parts = 
+  intltool
+
+[intltool]
+recipe = hexagonit.recipe.cmmi
+url = http://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz
+md5sum = d6c91bf06681919ccfdf3624035b75dc
+depends =
+  ${perl:version}
+  ${perl-XML-Parser:location}
+environment =
+  PATH=${perl:location}/bin:${gettext:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${perl:location}/lib/pkgconfig
--- a/component/mesa/buildout.cfg
+++ b/component/mesa/buildout.cfg
+[buildout]
+extends = 
+  ../xorg/buildout.cfg
+
+parts = 
+  mesa
+
+[libdrm]
+#does not seem to compile with -jX
+recipe = hexagonit.recipe.cmmi
+url = http://dri.freedesktop.org/libdrm/libdrm-2.4.26.tar.bz2
+md5sum = 062569426773f69b11a47a7712bba770
+configure-options = 
+  --enable-nouveau-experimental-api
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${xorg-libpthread-stubs:location}/lib/pkgconfig:${pciaccess:location}/lib/pkgconfig
+
+
+[mesa]
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.freedesktop.org//pub/mesa/7.11/MesaLib-7.11.tar.bz2
+md5sum = ff03aca82d0560009a076a87c888cf13
+configure-options = 
+  --disable-static
+  --disable-driglx-direct
+  --disable-glu
+  --disable-glw
+  --disable-glut
+  --disable-egl
+  --disable-gallium-llvm
+  --with-gallium-drivers=
+  --with-dri-drivers=
+  --with-expat=${libexpat:location}
+  --with-driver=xlib
+environment =
+  PATH=${pkgconfig:location}/bin:${makedepend:location}/bin:${flex:location}/bin:${bison:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libdrm:location}/lib/pkgconfig:${dri2proto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${pciaccess:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${glproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig
+  CPPFLAGS=-I${libexpat:location}/include -I${libdrm:location}/include/libdrm -I${libdrm:location}/include -I${xproto:location}/include -I${libX11:location}/include -I${libXext:location}/include/ -I${xextproto:location}/include
+  LDFLAGS=-L${libexpat:location}/lib
+  PYTHON=${buildout:executable}
--- a/component/opera/buildout.cfg
+++ b/component/opera/buildout.cfg
+[buildout]
+# Work in progress
+extends = 
+  ../xorg/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../dbus/buildout.cfg
+  ../gtk-2/buildout.cfg
+  ../libpng/buildout.cfg
+
+parts = 
+  opera
+  
+[opera]
+recipe = slapos.recipe.build
+slapos_promise =
+  file:opera
+
+depends = 
+  ${liberation-fonts:location}
+  ${ipaex-fonts:location}
+
+x86 = http://arc.opera.com/pub/opera/linux/1151/opera-11.51-1087.i386.linux.tar.bz2 91db21fc001e736a6432627fbf93062f
+x86-64 = todohttp://arc.opera.com/pub/opera/linux/1151/opera-11.51-1087.i386.linux.tar.bz2 91db21fc001e736a6432627fbf93062f
+
+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", "opera-slapos")
+  wrapper = open(wrapper_location, 'w')
+  wrapper.write("""#!/bin/sh
+  cd %(location)s
+  export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${dbus-glib:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:${libpng:location}/lib:${libSM:location}/lib:${libICE:location}/lib:%(location)s
+  export PATH=${fontconfig:location}/bin:$PATH
+  %(location)s/opera $*""")
+  wrapper.close()
+  profile_directory = os.path.join("%(location)s", "profile")
+  os.mkdir(profile_directory)
+  opera_config = open(os.path.join(profile_directory, "opera6.ini"), "w")
+  opera_config.write("""[State]
+  Reading Plugins=0
+  Accept License=1
+  Run=0""")
+  opera_config.close()
+  os.chmod(wrapper_location, 0766)
+
--- a/component/perl-XML-Parser/buildout.cfg
+++ b/component/perl-XML-Parser/buildout.cfg
+[buildout]
+extends =
+  ../libexpat/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../perl/buildout.cfg
+  ../perl-libwww-perl/buildout.cfg
+  ../zlib/buildout.cfg
+parts =
+  perl-XML-Parser
+
+[perl-XML-Parser]
+recipe = hexagonit.recipe.cmmi
+depends =
+  ${perl:version}
+  ${perl-libwww-perl:location}
+url = http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz
+md5sum = 1b868962b658bd87e1563ecd56498ded
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL \
+    EXPATINCPATH=${libexpat:location}/include \
+    EXPATLIBPATH=${libexpat:location}/lib \
+    INC="-I${libxml2:location}/include/libxml2" \
+    LIBS="-L${libxml2:location}/lib -L${zlib:location}/lib"
+# Parallel make does not work for this package on fast machines
+# with many cores
+make-options =
+  OTHERLDFLAGS=" -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${zlib:location}/lib" -j1
+environment =
+  LD_LIBRARY_PATH=${libxml2:location}/lib:${zlib:location}/lib
+  PERLLIB=blib/lib
--- a/component/qt/buildout.cfg
+++ b/component/qt/buildout.cfg
+[buildout]
+
+parts = 
+  qt
+  
+[qt]
+recipe = slapos.recipe.build
+slapos_promisee =
+  file:plop
+
+# Online installer
+x86 = http://get.qt.nokia.com/qtsdk/Qt_SDK_Lin32_online_v1_1_3_en.run eae2e2a1396fec1369b66c71d7df6eab
+x86-64 =  http://get.qt.nokia.com/qtsdk/Qt_SDK_Lin64_online_v1_1_3_en.run a4d929bc4d6511290c07c3745477b77b
+# Offline installer
+#x86 = http://get.qt.nokia.com/qtsdk/Qt_SDK_Lin32_offline_v1_1_3_en.run 106fdae4ec8947c491ab0a827a02da12
+#x86-64 = http://get.qt.nokia.com/qtsdk/Qt_SDK_Lin64_offline_v1_1_3_en.run 8c280beb11ee763840464572ed80e8b8
+
+# Needs many dependencies.
+
+script =
+  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
+  download_file = self.download(self.options['url'], self.options.get('md5sum'))
+  extract_dir = tempfile.mkdtemp(self.name)
+  os.chdir(extract_dir)
+  (download_dir, filename) = os.path.split(download_file)
+  auto_extract_bin = os.path.join(extract_dir, filename)
+  shutil.move(download_file, auto_extract_bin)
+  os.chmod(auto_extract_bin, 0777)
+  subprocess.call([auto_extract_bin])
+  self.cleanup_dir_list.append(extract_dir)
+  workdir = guessworkdir(extract_dir)
+  import pdb; pdb.set_trace()
+  self.copyTree(os.path.join(workdir, "jre1.6.0_27"), "%(location)s")
+
+
+
+#ldd qt.run
+#	linux-gate.so.1 =>  (0xb7827000)
+#	libutil.so.1 => /lib/i686/cmov/libutil.so.1 (0xb781c000)
+#	libgobject-2.0.so.0 => not found
+#	libSM.so.6 => not found
+#	libICE.so.6 => not found
+#	libXrender.so.1 => not found
+#	libfontconfig.so.1 => not found
+#	libfreetype.so.6 => /usr/lib/libfreetype.so.6 (0xb77a4000)
+#	libz.so.1 => /usr/lib/libz.so.1 (0xb778f000)
+#	libXext.so.6 => /usr/lib/libXext.so.6 (0xb7780000)
+#	libX11.so.6 => /usr/lib/libX11.so.6 (0xb7663000)
+#	libdl.so.2 => /lib/i686/cmov/libdl.so.2 (0xb765f000)
+#	libgthread-2.0.so.0 => not found
+#	librt.so.1 => /lib/i686/cmov/librt.so.1 (0xb7655000)
+#	libglib-2.0.so.0 => not found
+#	libpthread.so.0 => /lib/i686/cmov/libpthread.so.0 (0xb763c000)
+#	libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0xb754d000)
+#	libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb7527000)
+#	libgcc_s.so.1 => /lib/libgcc_s.so.1 (0xb7508000)
+#	libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb73c2000)
+#	libxcb.so.1 => /usr/lib/libxcb.so.1 (0xb73a9000)
+#	/lib/ld-linux.so.2 (0xb7828000)
+#	libXau.so.6 => /usr/lib/libXau.so.6 (0xb73a6000)
+#	libXdmcp.so.6 => /usr/lib/libXdmcp.so.6 (0xb73a1000)
\ No newline at end of file
--- a/component/slapos/buildout.cfg
+++ b/component/slapos/buildout.cfg
@@ -123,14 +123,14 @@ hexagonit.recipe.cmmi = 1.5.0
 lxml = 2.3.3
 meld3 = 0.6.8
 netaddr = 0.7.6
-slapos.core = 0.22
+slapos.core = 0.23
 slapos.libnetworkcache = 0.12
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1 
 zc.recipe.egg = 1.3.2

 # Required by:
-# slapos.core==0.22
+# slapos.core==0.23
 Flask = 0.8

 # Required by:
@@ -138,11 +138,11 @@ Flask = 0.8
 hexagonit.recipe.download = 1.5.0

 # Required by:
-# slapos.core==0.22
+# slapos.core==0.23
 netifaces = 0.8

 # Required by:
-# slapos.core==0.22
+# slapos.core==0.23
 # slapos.libnetworkcache==0.12
 # supervisor==3.0a12
 # zc.buildout==1.6.0-dev-SlapOS-004
@@ -150,9 +150,9 @@ netifaces = 0.8
 setuptools = 0.6c12dev-r88846

 # Required by:
-# slapos.core==0.22
+# slapos.core==0.23
 supervisor = 3.0a12

 # Required by:
-# slapos.core==0.22
+# slapos.core==0.23
 zope.interface = 3.8.0
--- a/component/xorg/buildout.cfg
+++ b/component/xorg/buildout.cfg
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os

-version = '0.39-dev'
+version = '0.40.1'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
    open("CHANGES.txt").read() + "\n"
@@ -40,6 +40,7 @@ setup(name=name,
      zip_safe=True,
      entry_points={
        'zc.buildout': [
+          'apache.frontend = slapos.recipe.apache_frontend:Recipe',
          'apachephp = slapos.recipe.apachephp:Recipe',
          'apacheproxy = slapos.recipe.apacheproxy:Recipe',
          'apache.zope.backend = slapos.recipe.apache_zope_backend:Recipe',
@@ -94,6 +95,7 @@ setup(name=name,
          'pwgen = slapos.recipe.pwgen:Recipe',
          'proactive = slapos.recipe.proactive:Recipe',
          'request = slapos.recipe.request:Recipe',
+          'seleniumrunner = slapos.recipe.seleniumrunner:Recipe',
          'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',
          'shell = slapos.recipe.shell:Recipe',
          'shellinabox = slapos.recipe.shellinabox:Recipe',

--- a/slapos/recipe/README.apache_frontend.txt
+++ b/slapos/recipe/README.apache_frontend.txt
+apache_frontend
+==========
+
+Frontend using Apache, allowing to rewrite and proxy URLs like myinstance.myfrontenddomainname.com to real IP/URL of myinstance.
\ No newline at end of file
--- a/slapos/recipe/README.helloworld.txt
+++ b/slapos/recipe/README.helloworld.txt
-helloworld
-==========
-
-It only installs a dummy wrapper saying "Hello World!" and sends to the master an "HelloWorld" parameter.
--- a/slapos/recipe/README.seleniumrunner.txt
+++ b/slapos/recipe/README.seleniumrunner.txt
+seleniumrunner
+==========
+Allows to run selenium tests through browser and xvfb. Posts the results on
+Nexedi ERP5.
+
+Parameters
+=====
+  * project : name of the project inside of ERP5 test result instance
+  * user : username to use in ERP5 instance to test
+  * password : password to use in ERP5 instance to test
+  * suite_name : name of test suite to launch 
+  * url : url to portal_test of ERP5 isntance to test
+  * test_report_instance_url : url of test_result_module to put results
+
+  * Example :
+    <?xml version="1.0" encoding="utf-8"?>
+    <instance>
+    <parameter id="project">Vifib</parameter>
+    <parameter id="user">myuser</parameter>
+    <parameter id="password">mypassword</parameter>
+    <parameter id="suite_name">my_zuite</parameter>
+    <parameter id="url">https://myerp5totest/erp5/portal_tests</parameter>
+    <parameter id="test_report_instance_url">https://user:passwordwww.myerp5withtestresults.com/test_result_module/</parameter>
+    </instance>
--- a/slapos/recipe/apache_frontend/__init__.py
+++ b/slapos/recipe/apache_frontend/__init__.py
--- a/slapos/recipe/apache_frontend/certificate_authority.py
+++ b/slapos/recipe/apache_frontend/certificate_authority.py
+import os
+import subprocess
+import time
+import ConfigParser
+import uuid
+
+
+def popenCommunicate(command_list, input=None):
+  subprocess_kw = dict(stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+  if input is not None:
+    subprocess_kw.update(stdin=subprocess.PIPE)
+  popen = subprocess.Popen(command_list, **subprocess_kw)
+  result = popen.communicate(input)[0]
+  if popen.returncode is None:
+    popen.kill()
+  if popen.returncode != 0:
+    raise ValueError('Issue during calling %r, result was:\n%s' % (
+      command_list, result))
+  return result
+
+
+class CertificateAuthority:
+  def __init__(self, key, certificate, openssl_binary,
+      openssl_configuration, request_dir):
+    self.key = key
+    self.certificate = certificate
+    self.openssl_binary = openssl_binary
+    self.openssl_configuration = openssl_configuration
+    self.request_dir = request_dir
+
+  def checkAuthority(self):
+    file_list = [ self.key, self.certificate ]
+    ca_ready = True
+    for f in file_list:
+      if not os.path.exists(f):
+        ca_ready = False
+        break
+    if ca_ready:
+      return
+    for f in file_list:
+      if os.path.exists(f):
+        os.unlink(f)
+    try:
+      # no CA, let us create new one
+      popenCommunicate([self.openssl_binary, 'req', '-nodes', '-config',
+          self.openssl_configuration, '-new', '-x509', '-extensions', 'v3_ca',
+          '-keyout', self.key, '-out', self.certificate, '-days', '10950'],
+          # Authority name will be random, so no instance has the same issuer
+          'Certificate Authority %s\n' % uuid.uuid1())
+    except:
+      try:
+        for f in file_list:
+          if os.path.exists(f):
+            os.unlink(f)
+      except:
+        # do not raise during cleanup
+        pass
+      raise
+
+  def _checkCertificate(self, common_name, key, certificate):
+    file_list = [key, certificate]
+    ready = True
+    for f in file_list:
+      if not os.path.exists(f):
+        ready = False
+        break
+    if ready:
+      return False
+    for f in file_list:
+      if os.path.exists(f):
+        os.unlink(f)
+    csr = certificate + '.csr'
+    try:
+      popenCommunicate([self.openssl_binary, 'req', '-config',
+        self.openssl_configuration, '-nodes', '-new', '-keyout',
+        key, '-out', csr, '-days', '3650'],
+        common_name + '\n')
+      try:
+        popenCommunicate([self.openssl_binary, 'ca', '-batch', '-config',
+          self.openssl_configuration, '-out', certificate,
+          '-infiles', csr])
+      finally:
+        if os.path.exists(csr):
+          os.unlink(csr)
+    except:
+      try:
+        for f in file_list:
+          if os.path.exists(f):
+            os.unlink(f)
+      except:
+        # do not raise during cleanup
+        pass
+      raise
+    else:
+      return True
+
+  def checkRequestDir(self):
+    for request_file in os.listdir(self.request_dir):
+      parser = ConfigParser.RawConfigParser()
+      parser.readfp(open(os.path.join(self.request_dir, request_file), 'r'))
+      if self._checkCertificate(parser.get('certificate', 'name'),
+          parser.get('certificate', 'key_file'), parser.get('certificate',
+            'certificate_file')):
+        print 'Created certificate %r' % parser.get('certificate', 'name')
+
+def runCertificateAuthority(args):
+  ca_conf = args[0]
+  ca = CertificateAuthority(ca_conf['key'], ca_conf['certificate'],
+      ca_conf['openssl_binary'], ca_conf['openssl_configuration'],
+      ca_conf['request_dir'])
+  while True:
+    ca.checkAuthority()
+    ca.checkRequestDir()
+    time.sleep(60)
--- a/slapos/recipe/apache_frontend/template/apache.conf.in
+++ b/slapos/recipe/apache_frontend/template/apache.conf.in
+# Apache configuration file for Zope
+# Automatically generated
+
+# Basic server configuration
+PidFile "%(pid_file)s"
+LockFile "%(lock_file)s"
+ServerName %(server_name)s
+DocumentRoot %(document_root)s
+
+%(listen)s
+
+ServerAdmin %(server_admin)s
+DefaultType text/plain
+TypesConfig conf/mime.types
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+
+# As backend is trusting REMOTE_USER header unset it always
+RequestHeader unset REMOTE_USER
+
+# SSL Configuration
+%(ssl_snippet)s
+
+# Log configuration
+ErrorLog "%(error_log)s"
+LogLevel warn
+LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
+LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common
+CustomLog "%(access_log)s" common
+
+# Directory protection
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+</Directory>
+
+%(path_enable)s
+
+# Rewrite part
+RewriteEngine On
+
+# Define the two rewritemaps : one for zope, one generic
+RewriteMap apachemapzope txt:%(apachemapzope_path)s
+RewriteMap apachemapgeneric txt:%(apachemap_path)s
+
+# First, we check if we have a zope backend server
+# If so, let's use Virtual Host Daemon rewrite
+#RewriteCond ${apachemapzope:%%{SERVER_NAME}} >""
+#RewriteRule ^/(\w+)($|/.*) ${apachemapzope:$1}/VirtualHostBase/https/%(apache_domain)s:%(port)s/VirtualHostRoot/_vh_$1$2 [L,P]
+
+# If we have generic backend server, let's rewrite without virtual host daemon
+RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >""
+RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P]
+
+# If nothing exist : put a nice error
+ErrorDocument 404 /notfound.html
+
+# List of modules
+LoadModule 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 ssl_module modules/mod_ssl.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 antiloris_module modules/mod_antiloris.so
--- a/slapos/recipe/apache_frontend/template/apache.conf.path-protected.in
+++ b/slapos/recipe/apache_frontend/template/apache.conf.path-protected.in
+# Path protected
+<Location %(path)s>
+  Order Deny,Allow
+  Allow from %(access_control_string)s
+</Location>
--- a/slapos/recipe/apache_frontend/template/apache.location-snippet.conf.in
+++ b/slapos/recipe/apache_frontend/template/apache.location-snippet.conf.in
+<Location %(location)s>
+  Order Deny,Allow
+  Deny from all
+  Allow from %(allow_string)s
+</Location>
--- a/slapos/recipe/apache_frontend/template/apache.ssl-snippet.conf.in
+++ b/slapos/recipe/apache_frontend/template/apache.ssl-snippet.conf.in
+SSLEngine on
+SSLProxyEngine on
+SSLCertificateFile %(login_certificate)s
+SSLCertificateKeyFile %(login_key)s
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
--- a/slapos/recipe/apache_frontend/template/logrotate_entry.in
+++ b/slapos/recipe/apache_frontend/template/logrotate_entry.in
+%(file_list)s {
+  daily
+  dateext
+  rotate 30
+  compress
+  notifempty
+  sharedscripts
+  create
+  postrotate
+    %(postrotate)s
+  endscript
+  olddir %(olddir)s
+}
--- a/slapos/recipe/apache_frontend/template/notfound.html
+++ b/slapos/recipe/apache_frontend/template/notfound.html
+<html>
+<head>
+  <title>Instance not found</title>
+</head>
+<body>
+<h1>This instance has not been found.</h1>
+<p>If this error persists, please check your instance URL and status on SlapOS Master.</p>
+</body>
+</html>
--- a/slapos/recipe/apache_frontend/template/openssl.cnf.ca.in
+++ b/slapos/recipe/apache_frontend/template/openssl.cnf.ca.in
--- a/slapos/recipe/apache_frontend/template/stunnel.conf.entry.in
+++ b/slapos/recipe/apache_frontend/template/stunnel.conf.entry.in
+[%(name)s]
+accept = %(public_ip)s:%(public_port)s
+connect = %(private_ip)s:%(private_port)s
--- a/slapos/recipe/apache_frontend/template/stunnel.conf.in
+++ b/slapos/recipe/apache_frontend/template/stunnel.conf.in
+foreground = yes
+output = %(log)s
+pid = %(pid_file)s
+syslog = no
+client = yes
+CApath = %(ca_path)s
+key = %(key)s
+CRLpath = %(ca_crl)s
+cert = %(cert)s
+sslVersion = SSLv3
+socket = l:TCP_NODELAY=1
+socket = r:TCP_NODELAY=1
+
+%(entry_str)s
--- a/slapos/recipe/apache_frontend/template/varnish.vcl.in
+++ b/slapos/recipe/apache_frontend/template/varnish.vcl.in
+# This is a basic VCL configuration file for varnish.  See the vcl(7)
+# man page for details on VCL syntax and semantics.
+# 
+# Default backend definition.  Set this to point to your content
+# server.
+# 
+backend default {
+    .host = "%(backend_host)s";
+    .port = "%(backend_port)s";
+    .probe = { 
+        .url = "/";
+        .timeout = 10s;
+        .interval = 10s;
+        .window = 4;
+        .threshold = 3;
+    }
+}
+# 
+# Below is a commented-out copy of the default VCL logic.  If you
+# redefine any of these subroutines, the built-in logic will be
+# appended to your code.
+# 
+# sub vcl_recv {
+#     if (req.http.x-forwarded-for) {
+#   set req.http.X-Forwarded-For =
+#       req.http.X-Forwarded-For ", " client.ip;
+#     } else {
+#   set req.http.X-Forwarded-For = client.ip;
+#     }
+#     if (req.request != "GET" &&
+#       req.request != "HEAD" &&
+#       req.request != "PUT" &&
+#       req.request != "POST" &&
+#       req.request != "TRACE" &&
+#       req.request != "OPTIONS" &&
+#       req.request != "DELETE") {
+#         /* Non-RFC2616 or CONNECT which is weird. */
+#         return (pipe);
+#     }
+#     if (req.request != "GET" && req.request != "HEAD") {
+#         /* We only deal with GET and HEAD by default */
+#         return (pass);
+#     }
+#     if (req.http.Authorization || req.http.Cookie) {
+#         /* Not cacheable by default */
+#         return (pass);
+#     }
+#     return (lookup);
+# }
+sub vcl_recv {
+    if (req.http.cache-control ~ "no-cache") {
+        purge_url(req.url);
+    }
+
+    if (req.url ~ "\.(css|js|ico)$") {
+        unset req.http.cookie;
+    }
+
+    # remove bogus cookies
+    if (req.http.Cookie) {
+        set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *__utm.=[^;]+;? *", "\1");
+        set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *__ac_name=\x22\x22;? *", "\1");
+        set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *__ac=\x22Og.3D.3D\x22;? *", "\1");
+    }
+    if (req.http.Cookie == "") {
+        remove req.http.Cookie;
+    }
+
+    if (req.http.x-forwarded-for) {
+  set req.http.X-Forwarded-For =
+      req.http.X-Forwarded-For ", " client.ip;
+    } else {
+  set req.http.X-Forwarded-For = client.ip;
+    }
+    if (req.request != "GET" &&
+      req.request != "HEAD" &&
+      req.request != "PUT" &&
+      req.request != "POST" &&
+      req.request != "TRACE" &&
+      req.request != "OPTIONS" &&
+      req.request != "DELETE") {
+        /* Non-RFC2616 or CONNECT which is weird. */
+        return (pipe);
+    }
+    if (req.request != "GET" && req.request != "HEAD") {
+        /* We only deal with GET and HEAD by default */
+        return (pass);
+    }
+    if (req.http.Authorization) {
+        /* Not cacheable by default */
+        return (pass);
+    }
+    if (req.http.Cookie && req.http.Cookie ~ "(^|; ) *__ac=") {
+        /* Not cacheable for authorised users,
+     but KM images are cacheable */
+  if (!(req.url ~ "/km_img/.*\.(png|gif)$")) {
+    return (pass);
+  }
+    }
+    # XXX login form can defer based on __ac_name cookie value
+    if (req.url ~ "/(login_form|WebSite_viewLoginDialog)($|\?)") {
+        return (pass);
+    }
+    if (req.backend.healthy) {
+        set req.grace = 1h;
+    } else {
+        set req.grace = 1w;
+    }
+    return (lookup);
+}
+# 
+# sub vcl_pipe {
+#     # Note that only the first request to the backend will have
+#     # X-Forwarded-For set.  If you use X-Forwarded-For and want to
+#     # have it set for all requests, make sure to have:
+#     # set req.http.connection = "close";
+#     # here.  It is not set by default as it might break some broken web
+#     # applications, like IIS with NTLM authentication.
+#     return (pipe);
+# }
+# 
+# sub vcl_pass {
+#     return (pass);
+# }
+# 
+# sub vcl_hash {
+#     set req.hash += req.url;
+#     if (req.http.host) {
+#         set req.hash += req.http.host;
+#     } else {
+#         set req.hash += server.ip;
+#     }
+#     return (hash);
+# }
+# 
+# sub vcl_hit {
+#     if (!obj.cacheable) {
+#         return (pass);
+#     }
+#     return (deliver);
+# }
+# 
+# sub vcl_miss {
+#     return (fetch);
+# }
+# 
+# sub vcl_fetch {
+#     if (!beresp.cacheable) {
+#         return (pass);
+#     }
+#     if (beresp.http.Set-Cookie) {
+#         return (pass);
+#     }
+#     return (deliver);
+# }
+sub vcl_fetch {
+    # we only cache 200 (OK) and 304 (Not Modified) responses.
+    if (beresp.status != 200 && beresp.status != 304) {
+        set beresp.cacheable = false;
+    }
+
+    if (beresp.http.cache-control ~ "no-cache") {
+        set beresp.cacheable = false;
+    }
+
+    if (!beresp.cacheable) {
+        unset beresp.http.expires;
+        set beresp.http.cache-control = "no-cache";
+        return (pass);
+    }
+
+    # we don't care haproxy's cookie.
+    if (beresp.http.Set-Cookie && beresp.http.Set-Cookie !~ "^SERVERID=[^;]+; path=/$") {
+        return (pass);
+    }
+
+    if (req.url ~ "\.(css|js|ico)$") {
+        unset beresp.http.set-cookie;
+        set beresp.http.cache-control = regsub(beresp.http.cache-control, "^", "public,");
+        set beresp.http.cache-control = regsub(beresp.http.cache-control, ",$", "");
+    }
+
+    # remove some headers added by caching policy manager to avoid
+    # '304 Not Modified' in case of login <-> logout switching.
+    if (beresp.http.content-type ~ "^text/html") {
+  unset beresp.http.last-modified;
+    }
+
+    if (beresp.cacheable) {
+        /* Remove Expires from backend, it's not long enough */
+        unset beresp.http.expires;
+        /* Set the clients TTL on this object */
+        set beresp.http.cache-control = "max-age = 900";
+        /* Set how long Varnish will keep it */
+        set beresp.ttl = 1w;
+        /* marker for vcl_deliver to reset Age: */
+        set beresp.http.magicmarker = "1";
+    }
+
+    set beresp.grace = 1w;
+
+    return (deliver);
+}
+# 
+# sub vcl_deliver {
+#     return (deliver);
+# }
+sub vcl_deliver {
+    if (resp.http.magicmarker) {
+        /* Remove the magic marker */
+        unset resp.http.magicmarker;
+        /* By definition we have a fresh object */
+        set resp.http.age = "0";
+    }
+    if (obj.hits > 0) {
+        set resp.http.X-Cache = obj.hits;
+    } else {
+      set resp.http.X-Cache = "MISS";
+    }
+    return (deliver);
+}
+
+# 
+# sub vcl_error {
+#     set obj.http.Content-Type = "text/html; charset=utf-8";
+#     synthetic {"
+# <?xml version="1.0" encoding="utf-8"?>
+# <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+#  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+# <html>
+#   <head>
+#     <title>"} obj.status " " obj.response {"</title>
+#   </head>
+#   <body>
+#     <h1>Error "} obj.status " " obj.response {"</h1>
+#     <p>"} obj.response {"</p>
+#     <h3>Guru Meditation:</h3>
+#     <p>XID: "} req.xid {"</p>
+#     <hr>
+#     <p>Varnish cache server</p>
+#   </body>
+# </html>
+# "};
+#     return (deliver);
+# }
--- a/slapos/recipe/pulse2/__init__.py
+++ b/slapos/recipe/pulse2/__init__.py
@@ -267,7 +267,7 @@ class Recipe(BaseSlapRecipe):
        memcached_ip=config['memcached_ip'],
        memcached_port=config['memcached_port'])
  
-    def createHtdocs(self, source, document_root):
+  def createHtdocs(self, source, document_root):
    source = self.options['source'].strip()
    document_root = self.createDataDirectory('htdocs')
    for p in os.listdir(document_root):

--- a/slapos/recipe/seleniumrunner/ERP5TypeFunctionalTestCase.py
+++ b/slapos/recipe/seleniumrunner/ERP5TypeFunctionalTestCase.py
--- a/slapos/recipe/helloworld.py
+++ b/slapos/recipe/helloworld.py
@@ -23,22 +23,85 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-##############################################################################
+#############################################################################
+
+import os
+import sys
+import zc.buildout
 from slapos.recipe.librecipe import BaseSlapRecipe

 class Recipe(BaseSlapRecipe):
-
  def _install(self):
-    parameter_dict = self.computer_partition.getInstanceParameterDict()
-    dummy_wrapper = self.createRunningWrapper('dummy', """#!/bin/sh
-while [ true ]
-do
-   sleep 10
-   echo "Hello World!"
-done""")
-
-    self.computer_partition.setConnectionDict(dict(
-      hello_world="Hello World!",
-      ))
-    return [dummy_wrapper]
-    
\ No newline at end of file
+    """Set the connection dictionnary for the computer partition and create a list
+    of paths to the different wrappers."""
+    self.path_list = []
+    self.requirements, self.ws = self.egg.working_set()
+
+    self.installTestrunner(self.getDisplay())
+    self.linkBinary()
+
+    return self.path_list
+
+  def getDisplay(self):
+    """Generate display id for the instance."""
+    display_list = [":%s" % i for i in range(123,144)]
+    for display_try in display_list:
+      lock_filepath = '/tmp/.X%s-lock' % display_try.replace(":", "")
+      if not os.path.exists(lock_filepath):
+        display = display_try
+        break
+    return display
+
+  def installTestrunner(self, display):
+    """Instanciate a wrapper for the browser and the test reports."""
+    arguments = dict(
+        xvfb_binary    = self.options['xvfb_binary'],
+        display        = display,
+        suite_name     = self.parameter_dict['suite_name'],
+        base_url       = self.parameter_dict['url'],
+        browser_argument_list = [],
+        user           = self.parameter_dict['user'],
+        password       = self.parameter_dict['password'],
+        project       = self.parameter_dict['project'],
+        test_report_instance_url = \
+            self.parameter_dict['test_report_instance_url'],
+        etc_directory  = self.etc_directory)
+
+    # Check wanted browser XXX-Cedric not yet used but can be useful
+    #if self.parameter_dict.get('browser', None) is None:
+    arguments['browser_binary'] = self.options['firefox_binary']
+    #elif self.parameter_dict['browser'].strip().lowercase() == 'chrome' or
+    #    self.parameter_dict['browser'].strip().lowercase() == 'chromium':
+    #  arguments['browser_binary'] = self.options['chromium_binary']
+    #  arguments['browser_argument_list'].extend['--ignore-certificate-errors',
+    #      option_translate = '--disable-translate',
+    #      option_security = '--disable-web-security']
+    #elif self.parameter_dict['browser'].strip().lowercase() == 'firefox':
+    #  arguments['browser_binary'] = self.options['firefox_binary']
+
+    self.path_list.extend(zc.buildout.easy_install.scripts([(
+        'testrunner',__name__+'.testrunner', 'run')], self.ws,
+        sys.executable, self.wrapper_directory,
+        arguments=[arguments]))
+
+  def linkBinary(self):
+    """Links binaries to instance's bin directory for easier exposal"""
+    for linkline in self.options.get('link_binary_list', '').splitlines():
+      if not linkline:
+        continue
+      target = linkline.split()
+      if len(target) == 1:
+        target = target[0]
+        path, linkname = os.path.split(target)
+      else:
+        linkname = target[1]
+        target = target[0]
+      link = os.path.join(self.bin_directory, linkname)
+      if os.path.lexists(link):
+        if not os.path.islink(link):
+          raise zc.buildout.UserError(
+            'Target link already %r exists but it is not link' % link)
+        os.unlink(link)
+      os.symlink(target, link)
+      self.logger.debug('Created link %r -> %r' % (link, target))
+      self.path_list.append(link)
--- a/slapos/recipe/seleniumrunner/erp5functionaltestreporthandler.py
+++ b/slapos/recipe/seleniumrunner/erp5functionaltestreporthandler.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 re
+import urlparse
+import urllib
+import httplib
+import mimetools
+from random import randint
+import tempfile
+import os
+import stat
+import zipfile
+import mimetypes
+import datetime
+
+TB_SEP = "============================================================="\
+    "========="
+
+# REGEX FOR ZELENIUM TESTS
+TEST_PASS_RE = re.compile('<th[^>]*>Tests passed</th>\n\s*<td[^>]*>([^<]*)')
+TEST_FAILURE_RE = re.compile('<th[^>]*>Tests failed</th>\n\s*<td[^>]*>([^<]*)')
+IMAGE_RE = re.compile('<img[^>]*?>')
+TEST_ERROR_TITLE_RE = re.compile('(?:error.gif.*?>|title status_failed"><td[^>]*>)([^>]*?)</td></tr>', re.S)
+TEST_RESULT_RE = re.compile('<div style="padding-top: 10px;">\s*<p>\s*'
+                          '<img.*?</div>\s.*?</div>\s*', re.S)
+DURATION_RE = re.compile('<th[^>]*>Elapsed time \(sec\)</th>\n\s*<td[^>]*>([^<]*)')
+
+TEST_ERROR_RESULT_RE = re.compile('.*(?:error.gif|title status_failed).*', re.S)
+
+def get_content_type(f):
+  return mimetypes.guess_type(f.name)[0] or 'application/octet-stream'
+
+class ConnectionHelper:
+  def __init__(self, url):
+    self.conn = urlparse.urlparse(url)
+    if self.conn.scheme == 'http':
+      connection_type = httplib.HTTPConnection
+      if self.conn.port is None:
+        self.port = 80
+    else:
+      connection_type = httplib.HTTPSConnection
+      if self.conn.port is None:
+        self.port = 443
+    self.connection_type = connection_type
+
+  def _connect(self):
+    self.connection = self.connection_type(self.conn.hostname + ':' +
+        str(self.conn.port or self.port))
+
+  def POST(self, path, parameter_dict, file_list=None):
+    self._connect()
+    parameter_dict.update(__ac_name=self.conn.username,
+                          __ac_password=self.conn.password)
+    header_dict = {'Content-type': "application/x-www-form-urlencoded"}
+    if file_list is None:
+      body = urllib.urlencode(parameter_dict)
+    else:
+      boundary = mimetools.choose_boundary()
+      header_dict['Content-type'] = 'multipart/form-data; boundary=%s' % (
+          boundary,)
+      body = ''
+      for k, v in parameter_dict.iteritems():
+        body += '--%s\r\n' % boundary
+        body += 'Content-Disposition: form-data; name="%s"\r\n' % k
+        body += '\r\n'
+        body += '%s\r\n' % v
+      for name, filename in file_list:
+        f = open(filename, 'r')
+        body += '--%s\r\n' % boundary
+        body += 'Content-Disposition: form-data; name="%s"; filename="%s"\r\n'\
+                % (name, name)
+        body += 'Content-Type: %s\r\n' % get_content_type(f)
+        body += 'Content-Length: %d\r\n' % os.fstat(f.fileno())[stat.ST_SIZE]
+        body += '\r\n'
+        body += f.read()
+        f.close()
+        body += '\r\n'
+    self.connection.request("POST", self.conn.path + '/' + path,
+          body, header_dict)
+    self.response = self.connection.getresponse()
+
+
+class ERP5TestReportHandler:
+  def __init__(self, url, suite_name):
+    # random test id
+    self.test_id = "%s-%X" % (
+       ("%s" % datetime.date.today()).replace("-", ""),
+       randint(1, 10000000000000000),
+     )
+    self.connection_helper = ConnectionHelper(url)
+    self.suite_name = suite_name
+
+  def reportStart(self):
+    # report that test is running
+    print 'Starting test with id %s' % self.test_id
+    self.connection_helper.POST('TestResultModule_reportRunning', dict(
+      test_suite=self.suite_name,
+      test_report_id=self.test_id,
+      ))
+
+  def reportFinished(self, out_file):
+    # make file parsable by erp5_test_results
+    out_file, success, failure, duration = self.processResult(out_file)
+
+    # XXX-Cedric : make correct display in test_result_module
+    tempcmd = tempfile.mkstemp()[1]
+    tempcmd2 = tempfile.mkstemp()[1]
+    tempout = tempfile.mkstemp()[1]
+    templog = tempfile.mkstemp()[1]
+    tl = open(templog, 'w')
+    tl.write(TB_SEP + '\n')
+    tl.write(out_file)
+
+    tl.write("----------------------------------------------------------------------\n")
+    tl.write('Ran 1 test in %.2fs\n' % duration)
+    if success:
+      tl.write('OK\n')
+    else:
+      tl.write('FAILED (failures=1)\n')
+    tl.write(TB_SEP + '\n')
+    tl.close()
+    open(tempcmd, 'w').write(""" %s""" % self.suite_name)
+    # create nice zip archive
+    tempzip = tempfile.mkstemp()[1]
+    # XXX-Cedric : support multiple tests
+    zip = zipfile.ZipFile(tempzip, 'w')
+    zip.write(tempout, '%s/001/stdout' % self.suite_name)
+    zip.write(templog, '%s/001/stderr' % self.suite_name)
+    zip.write(tempcmd, '%s/001/cmdline' % self.suite_name)
+    zip.close()
+    os.unlink(templog)
+    os.unlink(tempcmd)
+    os.unlink(tempout)
+    os.unlink(tempcmd2)
+
+    # post it to ERP5
+    self.connection_helper.POST('TestResultModule_reportCompleted',
+        dict(test_report_id=self.test_id), file_list=[('filepath', tempzip)])
+    os.unlink(tempzip)
+
+  def processResult(self, out_file):
+    file_content = out_file
+    sucess_amount = TEST_PASS_RE.search(file_content).group(1)
+    failure_amount = TEST_FAILURE_RE.search(file_content).group(1)
+    error_title_list = [re.compile('\s+').sub(' ', x).strip()
+                    for x in TEST_ERROR_TITLE_RE.findall(file_content)]
+    duration = DURATION_RE.search(file_content).group(1)
+    detail = ''
+    for test_result in TEST_RESULT_RE.findall(file_content):
+      if  TEST_ERROR_RESULT_RE.match(test_result):
+        detail += test_result
+
+    detail = IMAGE_RE.sub('', detail)
+    if detail:
+      detail = IMAGE_RE.sub('', detail)
+      detail = '''<html>
+<head>
+ <style type="text/css">tr.status_failed { background-color:red };</style>
+</head>
+<body>%s</body>
+</html>''' % detail
+    return detail, int(sucess_amount), int(failure_amount), float(duration)
--- a/slapos/recipe/seleniumrunner/template/xvfb_run.in
+++ b/slapos/recipe/seleniumrunner/template/xvfb_run.in
+#!/bin/sh
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+
+%(xvfb_binary) :%(display) -screen %(display) 1024x768x24
\ No newline at end of file
--- a/slapos/recipe/seleniumrunner/testrunner.py
+++ b/slapos/recipe/seleniumrunner/testrunner.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 datetime import datetime
+from erp5functionaltestreporthandler import ERP5TestReportHandler
+from ERP5TypeFunctionalTestCase import Xvfb, Firefox, TimeoutError
+from time import sleep
+import time
+import os
+import urllib2
+
+def run(args):
+  config = args[0]
+
+  test_url = assembleTestUrl(config['base_url'], config['suite_name'],
+      config['user'], config['password'])
+
+  # There is no test that can take more them 24 hours
+  timeout = 2.0 * 60 * 60
+  
+  while True:
+    erp5_report = ERP5TestReportHandler(config['test_report_instance_url'],
+        config['project'] + '@' + config['suite_name'])
+    try:
+      os.environ['DISPLAY'] = config['display']
+      xvfb = Xvfb(config['etc_directory'], config['xvfb_binary'])
+      profile_dir = os.path.join(config['etc_directory'], 'profile')
+      # XXX-Cedric : change Firefox prefs.js generation so that it can take a
+      #              list of websites supposed to be reached instead of config['base_url']
+      browser = Firefox(profile_dir, config['base_url'], config['browser_binary'])
+      try:
+        start = time.time()
+        xvfb.run()
+        profile_dir = os.path.join(config['etc_directory'], 'profile')
+        browser.run(test_url , xvfb.display)
+        erp5_report.reportStart()
+        while not isTestFinished(config['base_url']):
+          time.sleep(10)
+          print("Test not finished yet.")
+          if (time.time() - start) > float(timeout):
+            raise TimeoutError("Test took more than %s seconds" % timeout)
+      except TimeoutError:
+        continue
+      finally:
+        browser.quit()
+        xvfb.quit()
+      print("Test has finished and Firefox has been killed.")
+      
+      erp5_report.reportFinished(getStatus(config['base_url']).encode("utf-8",
+          "replace"))
+      
+      
+      print("Test finished and report sent, sleeping.")
+    except urllib2.URLError, urlError:
+        print "Error: %s" % urlError.msg
+    sleep(3600)
+
+def openUrl(url):
+    # Send Accept-Charset headers to activate the UnicodeConflictResolver
+    # (imitating firefox 3.5.9 here)
+    headers = { 'Accept-Charset' : 'ISO-8859-1,utf-8;q=0.7,*;q=0.7' }
+    request = urllib2.Request(url, headers=headers)
+    # Try to use long timeout, this is needed when there is many
+    # activities runing
+    try:
+      f = urllib2.urlopen(request, timeout=3600*4)
+    except TypeError:
+      f = urllib2.urlopen(request)
+    file_content = f.read()
+    f.close()
+    return file_content
+
+def isTestFinished(url):
+  """Fetch latest report. If report has been created less than 60 seconds ago,
+  it must be the current one.
+  Return true if test is finished, else return false.
+  """
+  latest_report = openUrl('%s/portal_tests/TestTool_getLatestReportId/' % url)
+  if latest_report is '':
+    return False
+  latest_report_date = latest_report[7:]
+  time_delta = datetime.now() - \
+      datetime.strptime(latest_report_date, '%Y%m%d_%H%M%S' )
+  if time_delta.days is not 0:
+    return False
+  if time_delta.seconds < 120:
+    return True
+  return False
+
+def getStatus(url):
+    try:
+      # Try 5 times.
+      for i in range(5):
+        try:
+          status = openUrl('%s/portal_tests/TestTool_getResults/' % (url))
+          break
+        except urllib2.URLError, urlError:
+          if i is 4: raise
+          print("Warning : %s while getting status" % urlError.msg)
+    except urllib2.HTTPError, e:
+      if e.msg == "No Content":
+        status = ""
+      else:
+        raise
+    return status
+
+def assembleTestUrl(base_url, suite_name, user, password):
+      """
+      Create the full url to the testrunner
+      """
+      test_url = "%s/%s/core/TestRunner.html?test=../test_suite_html&"\
+          "resultsUrl=%s/postResults&auto=on&__ac_name=%s&__ac_password=%s" % (
+          base_url, suite_name, base_url, user, password)
+      return test_url
\ No newline at end of file
--- a/slapos/recipe/slaprunner/__init__.py
+++ b/slapos/recipe/slaprunner/__init__.py
@@ -62,17 +62,24 @@ class Recipe(BaseSlapRecipe):
        ipv6_address=ipv6,
        proxy_host=ipv4,
        proxy_port=proxy_port,
-        proxy_database=os.path.join(workdir, 'proxy.db')
+        proxy_database=os.path.join(workdir, 'proxy.db'),
+	git=self.options['git'],
+	ssh_client=self.options['ssh_client'],
+	public_key=self.options['public_key'],
+	private_key=self.options['private_key']
    )
    config_file = self.createConfigurationFile('slapos.cfg',
        self.substituteTemplate(pkg_resources.resource_filename(__name__,
          'template/slapos.cfg.in'), configuration))
    self.path_list.append(config_file)
    
-    execute_arguments = dict(path = os.environ['PATH'],
-        launch_args = [self.options['slaprunner'].strip(), config_file])
+    environment = dict(
+        PATH=os.path.dirname(self.options['git']) + ':' + os.environ['PATH'],
+        GIT_SSH=self.options['ssh_client']
+    )
+    launch_args = [self.options['slaprunner'].strip(), config_file, '--debug']
    self.path_list.extend(zc.buildout.easy_install.scripts([('slaprunner',
-      'slapos.recipe.slaprunner.execute', 'execute')], self.ws, sys.executable,
-      self.wrapper_directory, arguments=execute_arguments))
+      'slapos.recipe.librecipe.execute', 'executee')], self.ws, sys.executable,
+      self.wrapper_directory, arguments=[launch_args, environment]))
    self.setConnectionDict(dict(url='http://[%s]:%s' % (ipv6, runner_port)))
    return self.path_list
--- a/slapos/recipe/slaprunner/template/slapos.cfg.in
+++ b/slapos/recipe/slaprunner/template/slapos.cfg.in
@@ -23,3 +23,11 @@ ipv6_address = %(ipv6_address)s
 host = %(proxy_host)s
 port = %(proxy_port)s
 database_uri = %(proxy_database)s
+
+[sshkeys_authority]
+ssh_client = %(ssh_client)s
+public_key = %(public_key)s
+private_key = %(private_key)s
+
+[gitclient]
+git = %(git)s
--- a/software/apache-frontend/instance.cfg
+++ b/software/apache-frontend/instance.cfg
+[buildout]
+parts =
+  instance
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+[instance]
+recipe = ${instance-recipe:egg}:${instance-recipe:module}
+httpd_binary = ${apache:location}/bin/httpd
+logrotate_binary = ${logrotate:location}/usr/sbin/logrotate
+openssl_binary = ${openssl:location}/bin/openssl
+dcrond_binary = ${dcron:location}/sbin/crond
+varnishd_binary = ${varnish-2.1:location}/sbin/varnishd
+stunnel_binary = ${stunnel:location}/bin/stunnel
+rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
+gcc_binary = ${gcc-java-minimal:location}/bin/gcc
+binutils_directory = ${binutils:location}/bin/
--- a/software/apache-frontend/software.cfg
+++ b/software/apache-frontend/software.cfg
+[buildout]
+versions = versions
+
+extends =
+  ../../component/binutils/buildout.cfg
+  ../../component/gcc/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../component/apache/buildout.cfg
+  ../../component/stunnel/buildout.cfg
+  ../../component/varnish/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/rdiff-backup/buildout.cfg
+  ../../stack/slapos.cfg
+
+parts =
+  template
+  binutils
+  gcc-java-minimal
+  apache
+  apache-antiloris
+
+  stunnel
+  varnish-2.1
+
+  dcron
+  logrotate
+  rdiff-backup
+
+# Buildoutish
+  eggs
+  instance-recipe-egg
+
+[instance-recipe]
+# Note: In case if specific instantiation recipe is used this is the place to
+# put its name
+egg = slapos.cookbook
+module = apache.frontend
+
+[instance-recipe-egg]
+recipe = zc.recipe.egg
+eggs = ${instance-recipe:egg}
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+
+[template]
+# Default template for apache instance.
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = 17180caef7d1c477fbb037d28b705e8b
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[versions]
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.6.0-dev-SlapOS-004
+Jinja2 = 2.6
+Werkzeug = 0.8.3
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.8
+rdiff-backup = 1.0.5
+slapos.recipe.template = 2.2
+slapos.cookbook = 0.40.1
+
+# Required by:
+# slapos.core==0.23
+Flask = 0.8
+
+# Required by:
+# slapos.cookbook==0.40.1
+PyXML = 0.8.4
+
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+
+# Required by:
+# slapos.cookbook==0.40.1
+inotifyx = 0.2.0
+
+# Required by:
+# slapos.cookbook==0.40.1
+# slapos.core==0.23
+# xml-marshaller==0.9.7
+lxml = 2.3.3
+
+# Required by:
+# slapos.cookbook==0.40.1
+netaddr = 0.7.6
+
+# Required by:
+# slapos.core==0.23
+netifaces = 0.8
+
+# Required by:
+# slapos.cookbook==0.40.1
+# slapos.core==0.23
+# zc.buildout==1.6.0-dev-SlapOS-004
+# zc.recipe.egg==1.3.2
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.40.1
+slapos.core = 0.23
+
+# Required by:
+# slapos.core==0.23
+supervisor = 3.0a12
+
+# Required by:
+# slapos.cookbook==0.40.1
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.cookbook==0.40.1
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.23
+zope.interface = 3.8.0
+
+[networkcache]
+# Cedric de Saint Martin signature certificate
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----
--- a/software/cloudooo/development.cfg
+++ b/software/cloudooo/development.cfg
+[buildout]
+extends = software.cfg
+auto-checkout = cloudooo
--- a/software/helloworld/instance.cfg
+++ b/software/helloworld/instance.cfg
-[buildout]
-parts =
-  dummy
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-
-[dummy]
-recipe = slapos.recipe.dummy
--- a/software/helloworld/software.cfg
+++ b/software/helloworld/software.cfg
-[buildout]
-
-extensions +=
-  mr.developer
-# activates mr.developer
-auto-checkout = *
-versions = versions
-
-find-links += http://www.nexedi.org/static/packages/source/slapos.buildout/
-
-parts =
-  template
-  eggs
-
-unzip = true
-
-[sources]
-# XXX-Cedric : either publish the egg or use mr.developer properly, but DELETE
-# This repository and use slapos.recipe.helloworld.
-slapos.recipe.dummy = git git://github.com/WaterCooled/slapos.recipe.dummy.git
-
-[versions]	
-zc.buildout = 1.5.3-dev-SlapOS-001
-
-[template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-output = ${buildout:directory}/template.cfg
-mode = 0644
-
-[eggs]
-recipe = zc.recipe.egg
-#eggs = slapos.recipe.helloworld
-eggs = slapos.recipe.dummy
--- a/software/kumofs/software.cfg
+++ b/software/kumofs/software.cfg
@@ -136,19 +136,16 @@ zope.interface = 3.8.0
 [networkcache]
 # Cedric de Saint Martin signature certificate
 signature-certificate-list =
-  -----BEGIN PRIVATE KEY-----
-  MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBANqRqW69hpRtqjuX
-  maEl9cwKPSb/Vu170OUqaNrZYaMnAv1T3pTU8cob5IjuC/HUZiiX/OEIxIsRZuKO
-  H8visw4PQEqSbSKvqOmJONirzXDHyye0Sf9yDRyEubAzbRjsP7wQabAkHhvsUGTK
-  dALIIhoAVTGkDBMryxqMJ9MHzyLjAgMBAAECgYEAmtszIUvUqxsbzob1iTBc+wiS
-  FSw6CZ58/bDTg6Mawz6jppqii+5ntRuYCtAl1Fv5WW998m6E2kclDwVFT+45j0AO
-  JroHGY74Egy54Wl7D2hE5ldJKy4LL6bPdM+FQy3S46Ekc7OyStU2LmMmWHdVMlzx
-  p7UQJ8UeE/UiBj5hUBkCQQD23HriV7cuYqJLzP689CWvWFjjJFtpuJBtYve7aqNb
-  DsL5i64H0eMkDyQzYavZfZg7lO9KAy0PbofInXI9owPHAkEA4qkN5MUZQcNb3zRd
-  TtPdA8WWRuArnAN4U3BZPMHu2UQ9U9gWedY2NzzqYGLw4Hx7XH54fRExG2L35LyA
-  zD9wBQJAS42rZn7mJ6I0ffKdvIMUzZfCjLJh7/d27KOvooK+wG3CKtIfT3FjjXO8
-  5qTsDcKsxv+MRSC3t9NiZ3oYrtinnQJBAJBrozynEYbDkaBQ3ztA50xl83DJmT/Z
-  Piv8JAAAmc26G1F3GCsdgIIFwFkV8eE3r+qpcuBNufp3Pvhx26dIrHkCQQDzFZp4
-  VDhTCQQoEBrGXoz6TRzmGfu8VpQZMXdL7O6aGNVqQGfsWQS7Sh+8iXsOi2APTAjr
-  xUL3fZnXAjr6AnZC
-  -----END PRIVATE KEY-----
+  -----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-----
--- a/software/mysql-5.1/software.cfg
+++ b/software/mysql-5.1/software.cfg
@@ -134,20 +134,16 @@ zope.interface = 3.8.0
 [networkcache]
 # Cedric de Saint Martin signature certificate
 signature-certificate-list =
-  -----BEGIN PRIVATE KEY-----
-  MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBANqRqW69hpRtqjuX
-  maEl9cwKPSb/Vu170OUqaNrZYaMnAv1T3pTU8cob5IjuC/HUZiiX/OEIxIsRZuKO
-  H8visw4PQEqSbSKvqOmJONirzXDHyye0Sf9yDRyEubAzbRjsP7wQabAkHhvsUGTK
-  dALIIhoAVTGkDBMryxqMJ9MHzyLjAgMBAAECgYEAmtszIUvUqxsbzob1iTBc+wiS
-  FSw6CZ58/bDTg6Mawz6jppqii+5ntRuYCtAl1Fv5WW998m6E2kclDwVFT+45j0AO
-  JroHGY74Egy54Wl7D2hE5ldJKy4LL6bPdM+FQy3S46Ekc7OyStU2LmMmWHdVMlzx
-  p7UQJ8UeE/UiBj5hUBkCQQD23HriV7cuYqJLzP689CWvWFjjJFtpuJBtYve7aqNb
-  DsL5i64H0eMkDyQzYavZfZg7lO9KAy0PbofInXI9owPHAkEA4qkN5MUZQcNb3zRd
-  TtPdA8WWRuArnAN4U3BZPMHu2UQ9U9gWedY2NzzqYGLw4Hx7XH54fRExG2L35LyA
-  zD9wBQJAS42rZn7mJ6I0ffKdvIMUzZfCjLJh7/d27KOvooK+wG3CKtIfT3FjjXO8
-  5qTsDcKsxv+MRSC3t9NiZ3oYrtinnQJBAJBrozynEYbDkaBQ3ztA50xl83DJmT/Z
-  Piv8JAAAmc26G1F3GCsdgIIFwFkV8eE3r+qpcuBNufp3Pvhx26dIrHkCQQDzFZp4
-  VDhTCQQoEBrGXoz6TRzmGfu8VpQZMXdL7O6aGNVqQGfsWQS7Sh+8iXsOi2APTAjr
-  xUL3fZnXAjr6AnZC
-  -----END PRIVATE KEY-----
-
+  -----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-----
--- a/software/seleniumrunner/instance.cfg
+++ b/software/seleniumrunner/instance.cfg
+[buildout]
+parts =
+  seleniuminstance
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory} 
+
+[seleniuminstance]
+recipe = ${instance-recipe:egg}:${instance-recipe:module}
+xvfb_binary = ${xserver:location}/bin/Xvfb
+firefox_binary = ${firefox:location}/firefox-slapos
\ No newline at end of file
--- a/software/seleniumrunner/software.cfg
+++ b/software/seleniumrunner/software.cfg
+[buildout]
+extensions = buildout-versions
+
+extends = 
+   ../../component/xorg/buildout.cfg
+   ../../component/lxml-python/buildout.cfg
+   ../../component/python-2.7/buildout.cfg
+   ../../component/firefox/buildout.cfg
+   ../../stack/shacache-client.cfg
+
+versions = versions
+
+find-links +=
+    http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+parts =
+   template
+   eggs
+   instance-recipe-egg
+   xserver
+   firefox
+
+versions = versions
+
+unzip = true
+
+[instance-recipe]
+egg = slapos.cookbook
+module = seleniumrunner
+
+[instance-recipe-egg]
+recipe = zc.recipe.egg
+python = python2.7
+eggs = ${instance-recipe:egg}
+
+[eggs]
+recipe = zc.recipe.egg
+python = python2.7
+eggs =
+  ${lxml-python:egg}
+
+[template]
+# Default template for the instance.
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = 5fc198144831525a196d7394e4b15f80
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[versions]
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-010
--- a/software/slaprunner/instance.cfg
+++ b/software/slaprunner/instance.cfg
 [buildout]
 parts =
  instance
+  sshkeys-authority
+  sshkeys-dropbear
+  dropbear-client

 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -12,4 +15,51 @@ slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
 slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
 slapproxy = ${buildout:directory}/bin/slapproxy
 supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl
+git = ${git:location}/bin/git
+ssh_client = $${sshkeys-dropbear:wrapper}
+public_key = $${sshkeys-dropbear:public-key}
+private_key = $${sshkeys-dropbear:private-key}

+
+[sshkeys-directory]
+recipe = slapos.cookbook:mkdirectory
+requests = $${directory:sshkeys}/requests/
+keys = $${directory:sshkeys}/keys/
+
+[sshkeys-authority]
+recipe = slapos.cookbook:sshkeys_authority
+request-directory = $${sshkeys-directory:requests}
+keys-directory = $${sshkeys-directory:keys}
+wrapper = $${directory:services}/sshkeys_authority
+keygen-binary = ${dropbear:location}/bin/dropbearkey
+
+[sshkeys-dropbear]
+<= sshkeys-authority
+recipe = slapos.cookbook:sshkeys_authority.request
+name = dropbear
+type = rsa
+executable = $${dropbear-client:wrapper}
+public-key = $${dropbear-client:identity-file}.pub
+private-key = $${dropbear-client:identity-file}
+wrapper = $${rootdirectory:bin}/dbclient
+
+[dropbear-client]
+recipe = slapos.cookbook:dropbear.client
+dbclient-binary = ${dropbear:location}/bin/dbclient
+identity-file = $${directory:ssh}/id_rsa
+wrapper = $${rootdirectory:bin}/dbclient_raw
+home = $${rootdirectory:etc}/ssh/
+force-host-key = True
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+var = $${buildout:directory}/var/
+srv = $${buildout:directory}/srv/
+bin = $${buildout:directory}/bin/
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+sshkeys = $${rootdirectory:srv}/sshkeys
+services = $${rootdirectory:etc}/run/
+ssh = $${rootdirectory:etc}/ssh/
--- a/software/slaprunner/software.cfg
+++ b/software/slaprunner/software.cfg
 [buildout]
+extensions =
+  buildout-versions
+
 extends =
+  ../../stack/slapos.cfg
  ../../stack/flask.cfg
  ../../stack/shacache-client.cfg
+  ../../component/dropbear/buildout.cfg
+  ../../component/git/buildout.cfg

 parts =
  template
  eggs
  instance-recipe-egg
-
-find-links +=
-  http://www.nexedi.org/static/packages/source/slapos.buildout/
+  dropbear

 versions = versions

@@ -27,7 +31,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
-md5sum = e2cbd8fe7b8e4c7e92a19cd775de0aa6
+md5sum = cd69efd5c3a7e9adca7387b9a401590a

 [eggs]
 eggs +=
@@ -35,81 +39,119 @@ eggs +=
  slapos.toolbox
  slapos.core

+[networkcache]
+# signature certificates of the following uploaders.
+#   Cedric de Saint Martin
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----
+
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
-
-# Pinned to old version (2.4 does not compile well everywhere)
-pycrypto = 2.3
-
+zc.buildout = 1.6.0-dev-SlapOS-003
 Jinja2 = 2.6
-Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
+Werkzeug = 0.8.3
+apache-libcloud = 0.8.0
+async = 0.6.1
 buildout-versions = 1.7
+gitdb = 0.5.4
 hexagonit.recipe.cmmi = 1.5.0
-meld3 = 0.6.7
-slapos.cookbook = 0.31
-slapos.libnetworkcache = 0.11
+meld3 = 0.6.8
+pycrypto = 2.5
+slapos.cookbook = 0.39
+slapos.libnetworkcache = 0.12
 slapos.recipe.template = 2.2
-slapos.toolbox = 0.8
+slapos.toolbox = 0.18
+smmap = 0.8.2

 # Required by:
-# slapos.core==0.18
+# slapos.core==0.22
 Flask = 0.8

 # Required by:
-# slapos.cookbook==0.31
+# slapos.toolbox==0.18
+GitPython = 0.3.2.RC1
+
+# Required by:
+# slapos.cookbook==0.39
 PyXML = 0.8.4

+# Required by:
+# slapos.toolbox==0.18
+atomize = 0.1.1
+
+# Required by:
+# slapos.toolbox==0.18
+feedparser = 5.1
+
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
 hexagonit.recipe.download = 1.5.0

 # Required by:
-# slapos.cookbook==0.31
-# slapos.core==0.18
+# slapos.cookbook==0.39
+inotifyx = 0.2.0
+
+# Required by:
+# slapos.cookbook==0.39
+# slapos.core==0.22
 # xml-marshaller==0.9.7
-lxml = 2.3.1
+lxml = 2.3.3

 # Required by:
-# slapos.cookbook==0.31
+# slapos.cookbook==0.39
 netaddr = 0.7.6

 # Required by:
-# slapos.core==0.18
-netifaces = 0.6
+# slapos.core==0.22
+netifaces = 0.8

 # Required by:
-# slapos.toolbox==0.8
+# slapos.toolbox==0.18
 paramiko = 1.7.7.1

 # Required by:
-# slapos.toolbox==0.8
-psutil = 0.3.0
+# slapos.toolbox==0.18
+psutil = 0.4.1

 # Required by:
-# slapos.cookbook==0.31
-# slapos.core==0.18
-# zc.buildout==1.5.3-dev-SlapOS-010
+# slapos.cookbook==0.39
+# slapos.core==0.22
+# slapos.libnetworkcache==0.12
+# slapos.toolbox==0.18
+# supervisor==3.0a12
+# zc.buildout==1.6.0-dev-SlapOS-003
 # zc.recipe.egg==1.3.2
+# zope.interface==3.8.0
 setuptools = 0.6c12dev-r88846

 # Required by:
-# slapos.cookbook==0.31
-slapos.core = 0.18
+# slapos.cookbook==0.39
+slapos.core = 0.22

 # Required by:
-# slapos.core==0.18
-supervisor = 3.0a10
+# slapos.core==0.22
+supervisor = 3.0a12

 # Required by:
-# slapos.cookbook==0.31
+# slapos.cookbook==0.39
 xml-marshaller = 0.9.7

 # Required by:
-# slapos.cookbook==0.31
+# slapos.cookbook==0.39
 zc.recipe.egg = 1.3.2

 # Required by:
-# slapos.core==0.18
-zope.interface = 3.8.0
\ No newline at end of file
+# slapos.core==0.22
+zope.interface = 3.8.0
--- a/stack/cloudooo.cfg
+++ b/stack/cloudooo.cfg
@@ -20,6 +20,7 @@ extends =
  ../component/pdftk/buildout.cfg
  ../component/ffmpeg/buildout.cfg
  ../component/file/buildout.cfg
+  ../component/cloudooo/buildout.cfg

 versions = versions

@@ -64,19 +65,6 @@ python = python2.6
 version = 2
 section = python2.7

-[lxml-python]
-python = python2.6
-
-[cloudooo]
-recipe = zc.recipe.egg
-python = python2.6
-eggs =
-  ${lxml-python:egg}
-  cloudooo
-  PasteScript
-scripts =
-  paster=cloudooo_paster
-
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-001
--- a/stack/lamp.cfg
+++ b/stack/lamp.cfg
@@ -13,6 +13,7 @@ allow-hosts =
  dist.repoze.org
  effbot.org
  github.com
+  launchpad.net
  peak.telecommunity.com
  psutil.googlecode.com
  www.dabeaz.com

--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
+# This stack list all parameters used in every Software Release or other stack.
+# Software Releases or Stacks can safely extend this stack.
+
+[buildout]
+# Generate list of automatically chosen eggs version
+extensions +=
+  buildout-versions
+
+# Use shacache
+extends =
+  shacache-client.cfg
+  
+# Separate from site eggs
+allowed-eggs-from-site-packages =
+include-site-packages = false
+exec-sitecustomize = false
+
+# Add location for modified non-official slapos.buildout
+find-links +=
+  http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+# Use only quite well working sites.
+allow-hosts +=
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  alastairs-place.net
+  dist.repoze.org
+  effbot.org
+  github.com
+  peak.telecommunity.com
+  psutil.googlecode.com
+  www.dabeaz.com
+  www.owlfish.com
+  launchpad.net
+
+# XXX: Workaround of SlapOS limitation
+# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
+# development / fast switching environment for whole software
+unzip = true