merge master into erp5 branch

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

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

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

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

component/boa/buildout.cfg

+[buildout]
+
+parts = boa
+
+[boa-patch-ENOSYS]
+recipe = hexagonit.recipe.download
+url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/www-servers/boa/files/boa-0.94.14_rc21-ENOSYS.patch?revision=1.1
+filename = boa-0.94.14_rc21-ENOSYS.patch
+md5sum = 7206b342195961501ed1eae38486e5db
+download-only = true
+
+
+[boa]
+recipe = slapos.recipe.build
+url = http://www.boa.org/boa-0.94.14rc21.tar.gz
+md5sum = e24b570bd767a124fcfb40a34d148ba9
+patches =
+    ${boa-patch-ENOSYS:location}/${boa-patch-ENOSYS:filename}
+slapos_promise =
+    directory:bin/
+    file:bin/boa
+    file:bin/boa_indexer
+script = 
+    import shutil
+    import os
+    url = self.download(self.options['url'], self.options['md5sum'])
+    extract_dir = self.extract(url)
+    workdir = guessworkdir(extract_dir)
+    self.applyPatchList(self.options.get('patches'), '-p1', cwd=workdir)
+    call(['./configure'], cwd=workdir)
+    call(['make'], cwd=workdir)
+    # Installation of boa. Manually, no make install
+    os.makedirs('%(location)s/bin/')
+    shutil.copyfile(workdir + '/src/boa', '%(location)s/bin/boa')
+    os.chmod('%(location)s/bin/boa', 0755)
+    shutil.copyfile(workdir + '/src/boa_indexer', '%(location)s/bin/boa_indexer')
+    os.chmod('%(location)s/bin/boa_indexer', 0755)

component/busybox/buildout.cfg

+[buildout]
+
+parts = busybox
+
+[busybox]
+recipe = slapos.recipe.build
+url = http://busybox.net/downloads/busybox-1.19.3.tar.bz2
+md5sum = c3938e1ac59602387009bbf1dd1af7f6
+script =
+    extract_dir = self.extract(self.download(%(url)r, %(md5sum)r))
+    workdir = guessworkdir(extract_dir)
+    self.logger.info("Creating default configuration")
+    call(['make', 'defconfig'], cwd=workdir, env=env)
+    self.logger.info("Building")
+    call(['make'], cwd=workdir, env=env)
+    self.logger.info("Installing")
+    call(['make', 'CONFIG_PREFIX=%(location)s', 'install'], cwd=workdir, env=env)
+    self.logger.info("Installation finished")

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

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

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

component/dropbear/buildout.cfg

@@ -13,7 +13,7 @@ parts =
 
 [dropbear-userspace-patch]
 recipe = hexagonit.recipe.download
-md5sum = 89f575b9a9586b04ef9073c9c3af13ae
+md5sum = 3d934c2c90e8c57536a4fa2cf8ad216d
 url = ${:_profile_base_location_}/${:filename}
 filename = userspace.patch
 download-only = true
@@ -25,6 +25,20 @@ url = ${:_profile_base_location_}/${:filename}
 filename = ipv6-support.patch
 download-only = true
 
+[dropbear-no-shell-check-patch]
+recipe = hexagonit.recipe.download
+md5sum = bb2ac410bd4cb2b07c23bfcc712e45f7
+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
@@ -35,7 +49,7 @@ url = http://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-zlib=${zlib:location}
-  CFLAGS="-DENABLE_SINGLEUSER "
+  CFLAGS="-DENABLE_SINGLEUSER -D__DIRTY_NO_SHELL_CHECKING"
 
 environment =
   CPPFLAGS =-I${zlib:location}/include
@@ -44,6 +58,8 @@ environment =
 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

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@

component/dropbear/no-shell-checking.patch

+diff --git a/svr-auth.c b/svr-auth.c
+index 87e3c5e..8b93a22 100644
+--- a/svr-auth.c
++++ b/svr-auth.c
+@@ -267,6 +267,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) {
+ 		usershell = "/bin/sh";
+ 	}
+ 
++#ifndef __DIRTY_NO_SHELL_CHECKING
+ 	/* check the shell is valid. If /etc/shells doesn't exist, getusershell()
+ 	 * should return some standard shells like "/bin/sh" and "/bin/csh" (this
+ 	 * is platform-specific) */
+@@ -288,6 +289,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) {
+ 	
+ goodshell:
+ 	endusershell();
++#endif
+ 	TRACE(("matching shell"))
+ 
+ 	TRACE(("uid = %d", ses.authstate.pw_uid))

component/dropbear/userspace.patch

@@ -48,7 +48,7 @@ index 87e3c5e..adb2e8b 100644
 +	if (svr_opts.singleuser) {
 +		m_free(username);
 +		/* Get the current login of the user running dropbear */
-+		username = m_strdup(getlogin());
++		username = m_strdup(getpwuid(getuid())->pw_name);
 +	}
 +#endif /* ifdef ENABLE_SINGLEUSER */
  	servicename = buf_getstring(ses.payload, &servicelen);

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)
+

component/fontconfig/buildout.cfg

@@ -14,6 +14,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

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

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

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}

component/mydumper/buildout.cfg

+[buildout]
+
+extends =
+    ../cmake/buildout.cfg
+    ../glib/buildout.cfg
+    ../pcre/buildout.cfg
+    ../mariadb/buildout.cfg
+
+parts = mydumper
+
+# XXX-Antoine:
+# This is really dirty, but it's the only way to install
+# mydumper that works
+[mydumper]
+recipe = slapos.recipe.build
+url = http://launchpad.net/mydumper/0.2/0.2.3/+download/mydumper-0.2.3.tar.gz
+md5sum = 36e6a1c97a9634a6882ddaac5e2697d5
+buildout-bin-dir = ${buildout:bin-directory}
+cmake-command = ${cmake:location}/bin/cmake
+mysql-config = ${mariadb:location}/bin/mysql_config
+doc-dependency = ${mydumper-doc:eggs}
+mysqllib = ${mariadb:location}/lib
+pkg-config-path = ${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/
+libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/mysql/
+includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include/mysql/
+cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include/mysql/
+mydumper-patches =
+   ${:_profile_base_location_}/mydumper-remove-warnings-errors.patch 917fea16b5ddea195cfa33fbd9827f57 -p1
+slapos_promise =
+    directory:bin
+    file:bin/mydumper
+    file:bin/myloader
+script =
+    import os
+    url = self.download(self.options['url'], self.options.get('md5sum'))
+    extract_dir = self.extract(url)
+    workdir = guessworkdir(extract_dir)
+    self.applyPatchList(self.options['mydumper-patches'], cwd=workdir)
+    env['PATH'] = self.options['buildout-bin-dir'] + ':' + env.get('PATH', '')
+    env['PKG_CONFIG_PATH'] = self.options['pkg-config-path'] + ':' + \
+                             env.get('PKG_CONFIG_PATH', '')
+    env['CMAKE_INCLUDE_PATH'] = self.options['includes']
+    env['CMAKE_LIBRARY_PATH'] = self.options['libraries']
+    env['CFLAGS'] = self.options['cflags']
+    command_line = [self.options['cmake-command'],
+                    '-DCMAKE_INSTALL_PREFIX=%%s' %% self.options['location'],
+                    '-DMYSQL_CONFIG=%%s' %% self.options['mysql-config'],
+                    '-DCMAKE_C_FLAGS=%%s' %% self.options['cflags'],
+                    '-DCMAKE_INSTALL_RPATH=%%s' %% self.options['libraries'],
+                    '.']
+    call(command_line, cwd=workdir, env=env)
+    call(['make'], cwd=workdir, env=env)
+    call(['make', 'install'], cwd=workdir, env=env)
+
+[mydumper-doc]
+recipe = zc.recipe.egg
+eggs =
+    Sphinx
+dependent-scripts = true
+
+# XXX-Antoine: here's what I did using hexagonit.recipe.cmmi.
+# and it wasn't working !
+#[mydumper]
+#recipe = hexagonit.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
+#location = ${buildout:parts-directory}/${:_buildout_section_name_}
+#configure-command =
+#    ${cmake:location}/bin/cmake \
+#    -DCMAKE_INSTALL_PREFIX=${:location} \
+#    -DMYSQL_CONFIG=${mariadb:location}/bin/mysql_config \
+#    -DCMAKE_INCLUDE_PATH=${zlib:location}/include \
+#    -DCMAKE_LIBRARY_PATH=${zlib:location}/lib \
+#    .
+#environment=
+#    PATH=$PATH:${buildout:bin-directory}
+#    PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/
+

component/mydumper/mydumper-remove-warnings-errors.patch

+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,7 +12,7 @@
+ 
+ add_subdirectory(docs)
+ 
+-set(CMAKE_C_FLAGS "-Wall -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow -Werror -O3 -g ${MYSQL_CFLAGS}")
++set(CMAKE_C_FLAGS "-Wall -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow -O3 -g ${MYSQL_CFLAGS}")
+ 
+ include_directories(${MYDUMPER_SOURCE_DIR} ${MYSQL_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${PCRE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS})
+ 

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)
+

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

component/pwgen/buildout.cfg

+[buildout]
+parts =
+  pwgen
+
+[pwgen]
+recipe = hexagonit.recipe.cmmi
+url = http://downloads.sourceforge.net/project/pwgen/pwgen/2.06/pwgen-2.06.tar.gz
+md5sum = 935aebcbe610fbc9de8125e7b7d71297

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

component/shellinabox/0001-Switch-to-IPv6.patch

+From 50ec7439e80bd6a77346dc6482895e481d8cd43a Mon Sep 17 00:00:00 2001
+From: Antoine Catton <acatton@tiolive.com>
+Date: Tue, 10 Jan 2012 18:30:20 +0100
+Subject: [PATCH] Switch to IPv6
+
+---
+ libhttp/http.h             |    4 ++--
+ libhttp/httpconnection.c   |   11 ++++++++++-
+ libhttp/server.c           |   33 +++++++++++++++++++--------------
+ libhttp/server.h           |    6 +++---
+ shellinabox/shellinaboxd.c |   14 +++++++-------
+ 5 files changed, 41 insertions(+), 27 deletions(-)
+
+diff --git a/libhttp/http.h b/libhttp/http.h
+index e7840fa..5cd61e3 100644
+--- a/libhttp/http.h
++++ b/libhttp/http.h
+@@ -66,8 +66,8 @@ typedef struct ServerConnection ServerConnection;
+ typedef struct Server Server;
+ typedef struct URL URL;
+ 
+-Server *newCGIServer(int localhostOnly, int portMin, int portMax, int timeout);
+-Server *newServer(int localhostOnly, int port);
++Server *newCGIServer(char *ipv6, int portMin, int portMax, int timeout);
++Server *newServer(char *ipv6, int port);
+ void deleteServer(Server *server);
+ int  serverGetListeningPort(Server *server);
+ int  serverGetFd(Server *server);
+diff --git a/libhttp/httpconnection.c b/libhttp/httpconnection.c
+index c8e69f6..cae467f 100644
+--- a/libhttp/httpconnection.c
++++ b/libhttp/httpconnection.c
+@@ -823,8 +823,17 @@ static int httpHandleCommand(struct HttpConnection *http,
+   const char *host                         = getFromHashMap(&http->header,
+                                                             "host");
+   if (host) {
++    int brackets = 0; // For IPv6 hosts
+     for (char ch; (ch = *host) != '\000'; host++) {
+-      if (ch == ':') {
++      if (ch == '[') {
++          brackets = 1;
++          break;
++      }
++      if (ch == ']') {
++          brackets = 0;
++          break;
++      }
++      if (!brackets && ch == ':') {
+         *(char *)host                      = '\000';
+         break;
+       }
+diff --git a/libhttp/server.c b/libhttp/server.c
+index f52a269..2c30bd8 100644
+--- a/libhttp/server.c
++++ b/libhttp/server.c
+@@ -170,19 +170,19 @@ static int serverQuitHandler(struct HttpConnection *http, void *arg) {
+   return HTTP_DONE;
+ }
+ 
+-struct Server *newCGIServer(int localhostOnly, int portMin, int portMax,
++struct Server *newCGIServer(char *ipv6, int portMin, int portMax,
+                             int timeout) {
+   struct Server *server;
+   check(server = malloc(sizeof(struct Server)));
+-  initServer(server, localhostOnly, portMin, portMax, timeout);
++  initServer(server, ipv6, portMin, portMax, timeout);
+   return server;
+ }
+ 
+-struct Server *newServer(int localhostOnly, int port) {
+-  return newCGIServer(localhostOnly, port, port, -1);
++struct Server *newServer(char *ipv6, int port) {
++  return newCGIServer(ipv6, port, port, -1);
+ }
+ 
+-void initServer(struct Server *server, int localhostOnly, int portMin,
++void initServer(struct Server *server, char *ipv6, int portMin,
+                 int portMax, int timeout) {
+   server->looping               = 0;
+   server->exitAll               = 0;
+@@ -192,14 +192,19 @@ void initServer(struct Server *server, int localhostOnly, int portMin,
+   server->numConnections        = 0;
+ 
+   int true                      = 1;
+-  server->serverFd              = socket(PF_INET, SOCK_STREAM, 0);
++  server->serverFd              = socket(PF_INET6, SOCK_STREAM, 0);
+   check(server->serverFd >= 0);
+   check(!setsockopt(server->serverFd, SOL_SOCKET, SO_REUSEADDR,
+                     &true, sizeof(true)));
+-  struct sockaddr_in serverAddr = { 0 };
+-  serverAddr.sin_family         = AF_INET;
+-  serverAddr.sin_addr.s_addr    = htonl(localhostOnly
+-                                        ? INADDR_LOOPBACK : INADDR_ANY);
++  struct sockaddr_in6 serverAddr = { 0 };
++  serverAddr.sin6_family         = AF_INET6;
++  if (ipv6 != NULL) {
++    if (!inet_pton(AF_INET6, ipv6, serverAddr.sin6_addr.s6_addr)) {
++        fatal("Bad ipv6 address");
++    }
++  } else {
++    serverAddr.sin6_addr = in6addr_any;
++  }
+ 
+   // Linux unlike BSD does not have support for picking a local port range.
+   // So, we have to randomly pick a port from our allowed port range, and then
+@@ -214,14 +219,14 @@ void initServer(struct Server *server, int localhostOnly, int portMin,
+     int portStart               = rand() % (portMax - portMin + 1) + portMin;
+     for (int p = 0; p <= portMax-portMin; p++) {
+       int port                  = (p+portStart)%(portMax-portMin+1)+ portMin;
+-      serverAddr.sin_port       = htons(port);
++      serverAddr.sin6_port       = htons(port);
+       if (!bind(server->serverFd, (struct sockaddr *)&serverAddr,
+                 sizeof(serverAddr))) {
+         break;
+       }
+-      serverAddr.sin_port       = 0;
++      serverAddr.sin6_port       = 0;
+     }
+-    if (!serverAddr.sin_port) {
++    if (!serverAddr.sin6_port) {
+       fatal("Failed to find any available port");
+     }
+   }
+@@ -231,7 +236,7 @@ void initServer(struct Server *server, int localhostOnly, int portMin,
+   check(!getsockname(server->serverFd, (struct sockaddr *)&serverAddr,
+                      &socklen));
+   check(socklen == sizeof(serverAddr));
+-  server->port                  = ntohs(serverAddr.sin_port);
++  server->port                  = ntohs(serverAddr.sin6_port);
+   info("Listening on port %d", server->port);
+ 
+   check(server->pollFds         = malloc(sizeof(struct pollfd)));
+diff --git a/libhttp/server.h b/libhttp/server.h
+index bb879fb..5ffb698 100644
+--- a/libhttp/server.h
++++ b/libhttp/server.h
+@@ -78,10 +78,10 @@ struct Server {
+   struct SSLSupport       ssl;
+ };
+ 
+-struct Server *newCGIServer(int localhostOnly, int portMin, int portMax,
++struct Server *newCGIServer(char *ipv6, int portMin, int portMax,
+                             int timeout);
+-struct Server *newServer(int localhostOnly, int port);
+-void initServer(struct Server *server, int localhostOnly, int portMin,
++struct Server *newServer(char *ipv6, int port);
++void initServer(struct Server *server, char *ipv6, int portMin,
+                 int portMax, int timeout);
+ void destroyServer(struct Server *server);
+ void deleteServer(struct Server *server);
+diff --git a/shellinabox/shellinaboxd.c b/shellinabox/shellinaboxd.c
+index dcf05ff..2d1d758 100644
+--- a/shellinabox/shellinaboxd.c
++++ b/shellinabox/shellinaboxd.c
+@@ -80,7 +80,7 @@
+ static int            port;
+ static int            portMin;
+ static int            portMax;
+-static int            localhostOnly = 0;
++static char           *ipv6 = NULL;
+ static int            noBeep        = 0;
+ static int            numericHosts  = 0;
+ static int            enableSSL     = 1;
+@@ -747,7 +747,7 @@ static void usage(void) {
+           "  -g, --group=GID             switch to this group (default: %s)\n"
+           "  -h, --help                  print this message\n"
+           "      --linkify=[none|normal|agressive] default is \"normal\"\n"
+-          "      --localhost-only        only listen on 127.0.0.1\n"
++          "      --ipv6                  listen on a specific ipv6\n"
+           "      --no-beep               suppress all audio output\n"
+           "  -n, --numeric               do not resolve hostnames\n"
+           "  -p, --port=PORT             select a port (default: %d)\n"
+@@ -839,7 +839,7 @@ static void parseArgs(int argc, char * const argv[]) {
+       { "static-file",      1, 0, 'f' },
+       { "group",            1, 0, 'g' },
+       { "linkify",          1, 0,  0  },
+-      { "localhost-only",   0, 0,  0  },
++      { "ipv6",             1, 0,  0  },
+       { "no-beep",          0, 0,  0  },
+       { "numeric",          0, 0, 'n' },
+       { "port",             1, 0, 'p' },
+@@ -1001,8 +1001,8 @@ static void parseArgs(int argc, char * const argv[]) {
+               "\"none\", \"normal\", or \"aggressive\".");
+       }
+     } else if (!idx--) {
+-      // Localhost Only
+-      localhostOnly        = 1;
++      // IPv6
++      ipv6 = optarg;
+     } else if (!idx--) {
+       // No Beep
+       noBeep               = 1;
+@@ -1197,7 +1197,7 @@ int main(int argc, char * const argv[]) {
+   // Create a new web server
+   Server *server;
+   if (port) {
+-    check(server  = newServer(localhostOnly, port));
++    check(server  = newServer(ipv6, port));
+     dropPrivileges();
+     setUpSSL(server);
+   } else {
+@@ -1217,7 +1217,7 @@ int main(int argc, char * const argv[]) {
+       _exit(0);
+     }
+     check(!NOINTR(close(fds[0])));
+-    check(server  = newCGIServer(localhostOnly, portMin, portMax,
++    check(server  = newCGIServer(ipv6, portMin, portMax,
+                                  AJAX_TIMEOUT));
+     cgiServer     = server;
+     setUpSSL(server);
+-- 
+1.7.6.5
+

component/shellinabox/0002-Allow-to-run-entire-command-path.patch

+From eee6f7180dc5dd4523264e7ce0721945ab2b78a1 Mon Sep 17 00:00:00 2001
+From: Antoine Catton <acatton@tiolive.com>
+Date: Wed, 11 Jan 2012 17:32:15 +0100
+Subject: [PATCH 2/2] Allow to run entire command path.
+
+---
+ shellinabox/launcher.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/shellinabox/launcher.c b/shellinabox/launcher.c
+index fb8a133..e116a75 100644
+--- a/shellinabox/launcher.c
++++ b/shellinabox/launcher.c
+@@ -1226,8 +1226,7 @@ static void execService(int width, int height, struct Service *service,
+ 
+   extern char **environ;
+   environ                     = environment;
+-  char *cmd                   = strrchr(argv[0], '/');
+-  execvp(cmd ? cmd + 1: argv[0], argv);
++  execvp(argv[0], argv);
+ }
+ 
+ void setWindowSize(int pty, int width, int height) {
+-- 
+1.7.6.5
+

component/shellinabox/buildout.cfg

+[buildout]
+extends =
+  ../zlib/buildout.cfg
+  ../openssl/buildout.cfg
+  ../patch/buildout.cfg
+
+parts = shellinabox
+
+[shellinabox-full-path-patch]
+recipe = hexagonit.recipe.download
+filename = 0002-Allow-to-run-entire-command-path.patch
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+
+
+[shellinabox-ipv6-patch]
+recipe = hexagonit.recipe.download
+filename = 0001-Switch-to-IPv6.patch
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+
+[shellinabox]
+recipe = hexagonit.recipe.cmmi
+url = http://shellinabox.googlecode.com/files/shellinabox-2.10.tar.gz
+md5sum = 0e144910d85d92edc54702ab9c46f032
+environment =
+    CFLAGS = -I${zlib:location}/include -I${openssl:location}/include
+    LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
+    PKG_CONFIG_PATH = ${openssl:location}/lib/pkgconfig/
+patch-binary = ${patch:location}/bin/patch
+patch-options = -p1
+patches =
+    ${shellinabox-ipv6-patch:location}/${shellinabox-ipv6-patch:filename}
+    ${shellinabox-full-path-patch:location}/${shellinabox-full-path-patch:filename}

component/slapos/buildout.cfg

@@ -112,25 +112,25 @@ scripts =
   slapproxy = slapos.proxy:main
 
 [versions]
-zc.buildout = 1.6.0-dev-SlapOS-003
+zc.buildout = 1.6.0-dev-SlapOS-004
 
 # Generated by buildout-versions
 Jinja2 = 2.6
-Werkzeug = 0.8.2
+Werkzeug = 0.8.3
 buildout-versions = 1.7
 collective.recipe.template = 1.9
 hexagonit.recipe.cmmi = 1.5.0
 lxml = 2.3.3
 meld3 = 0.6.8
 netaddr = 0.7.6
-slapos.core = 0.21
-slapos.libnetworkcache = 0.11
+slapos.core = 0.23
+slapos.libnetworkcache = 0.12
 xml-marshaller = 0.9.7
-z3c.recipe.scripts = 1.0.1
+z3c.recipe.scripts = 1.0.1 
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.21
+# slapos.core==0.23
 Flask = 0.8
 
 # Required by:
@@ -138,21 +138,21 @@ Flask = 0.8
 hexagonit.recipe.download = 1.5.0
 
 # Required by:
-# slapos.core==0.21
-netifaces = 0.6
+# slapos.core==0.23
+netifaces = 0.8
 
 # Required by:
-# slapos.core==0.21
-# slapos.libnetworkcache==0.11
+# slapos.core==0.23
+# slapos.libnetworkcache==0.12
 # supervisor==3.0a12
-# zc.buildout==1.6.0-dev-SlapOS-003
+# zc.buildout==1.6.0-dev-SlapOS-004
 # zope.interface==3.8.0
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.21
+# slapos.core==0.23
 supervisor = 3.0a12
 
 # Required by:
-# slapos.core==0.21
-zope.interface = 3.8.0
\ No newline at end of file
+# slapos.core==0.23
+zope.interface = 3.8.0

component/xorg/buildout.cfg

-# Minimalistict xorg
 [buildout]
 extends =
+  ../freetype/buildout.cfg
+  ../intltool/buildout.cfg
   ../libuuid/buildout.cfg
   ../libxml2/buildout.cfg
   ../libxslt/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
+  ../openssl/buildout.cfg
 
 parts =
   libXdmcp
@@ -32,7 +34,7 @@ configure-options =
   --without-fop
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${libxml2:location}/bin:${pkgconfig:location}/bin:%(PATH)s
 
 [xextproto]
 recipe = hexagonit.recipe.cmmi
@@ -103,6 +105,9 @@ url = http://www.x.org/releases/X11R7.6/src/lib/libXext-1.2.0.tar.bz2
 md5sum = 9bb236ff0193e9fc1c1fb504dd840331
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xcbproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig
+  CPPFLAGS=-I${xcbproto:location}/include -I${libXau:location}/include -I${xproto:location}/include -I${xorg-libpthread-stubs:location}/include -I${xextproto:location}/include -I${libX11:location}/include -I${libxcb:location}/include
+  LD_LIBRARY_PATH=${xcbproto:location}/lib:${libXau:location}/lib:${xorg-libpthread-stubs:location}/lib:${xextproto:location}/lib:${libX11:location}/lib:${libxcb:location}/lib
+  LD_RUN_PATH=${xcbproto:location}/lib:${libXau:location}/lib:${xorg-libpthread-stubs:location}/lib:${xextproto:location}/lib:${libX11:location}/lib:${libxcb:location}/lib
   PATH=${pkgconfig:location}/bin:%(PATH)s
 # Warning: do *not* enable -fPIC CFLAGS for this library. Even if it fails and ld asks you to enable it. This will not solve your problem, and create an unexpected (by build chain) setup (all .o will be position-independant code).
 # CFLAGS=-fPIC
@@ -124,6 +129,16 @@ download-only = true
 filename = 700c7896b832d6e4fb0185f0d5382b01f94e7141.patch
 md5sum = 52635ef694ee6f1acb642a77ee8eb010
 
+[inputproto]
+recipe = hexagonit.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
+url = http://www.x.org/releases/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2
+md5sum = e7edb59a3f54af15f749e8f3e314ee62
+
 [libX11]
 recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libX11-1.4.0.tar.bz2
@@ -134,14 +149,19 @@ configure-options =
   --disable-composecache
   --disable-xcms
   --disable-xf86bigfont
-  --disable-xkb
   --disable-specs
   --without-xmlto
   --without-fop
 environment =
-  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig
+  LD_LIBRARY_PATH=${xproto:location}/lib:${xextproto:location}/lib:${libxcb:location}/lib
+  LD_RUN_PATH=${xproto:location}/lib:${xextproto:location}/lib:${libxcb:location}/lib
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
+
+# Below is stuff for xserver
+
+
 [libXdmcp]
 recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libXdmcp-1.1.0.tar.bz2
@@ -154,6 +174,157 @@ configure-options =
   --without-xmlto
   --without-fop
 
+[fixesproto]
+recipe = hexagonit.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
+url = http://www.x.org/releases/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2
+md5sum = 6f6c24436c2b3ab235eb14a85b9aaacf
+
+[xcmiscproto]
+recipe = hexagonit.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
+url = http://www.x.org/releases/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2
+md5sum = 998e5904764b82642cc63d97b4ba9e95
+
+[randrproto]
+recipe = hexagonit.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
+url = http://www.x.org/releases/X11R7.6/src/everything/renderproto-0.11.1.tar.bz2
+md5sum = a914ccc1de66ddeb4b611c6b0686e274
+
+[videoproto]
+recipe = hexagonit.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
+url = http://www.x.org/releases/X11R7.6/src/everything/fontsproto-2.1.1.tar.bz2
+md5sum = 37102ffcaa73f77d700acd6f7a25d8f0
+
+[recordproto]
+recipe = hexagonit.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
+url = http://www.x.org/releases/X11R7.6/src/everything/resourceproto-1.1.1.tar.bz2
+md5sum = 8ff0525ae7502b48597b78d00bc22284
+
+[xineramaproto]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/everything/xineramaproto-1.2.tar.bz2
+md5sum = a8aadcb281b9c11a91303e24cdea45f5
+
+[pixman]
+recipe = hexagonit.recipe.cmmi
+url = http://xorg.freedesktop.org/archive/individual/lib/pixman-0.23.2.tar.bz2 
+md5sum = 2e2805f5ca02edeb15a7862779670069
+
+[libfontenc]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2
+md5sum = 11d3c292f05a90f6f67840a9e9c3d9b8
+environment =
+  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig
+  LD_LIBRARY_PATH=${xproto:location}/lib/
+  LD_RUN_PATH=${xproto:location}/lib/
+  CPPFLAGS=-I${xproto:location}/include/ -I${zlib:location}/include
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+
+[libXfont]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2
+md5sum = 6fb689cfe13d8d9460f4abb5bd88588d
+environment =
+  PKG_CONFIG_PATH=${fontsproto:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${freetype:location}/lib/pkgconfig
+  LD_LIBRARY_PATH=${fontsproto:location}/lib:${libfontenc:location}/lib:${xtrans:location}/include/:${xproto:location}/lib/:${freetype:location}/lib
+  LD_RUN_PATH=${fontsproto:location}/lib:${libfontenc:location}/lib:${xproto:location}/lib/:${xtrans:location}/include/:${freetype:location}/lib
+  LDFLAGS=-L${zlib:location}/lib
+  CPPFLAGS=-I${zlib:location}/include
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+
+[libxkbfile]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2
+md5sum = 59b4fe0bdf8d9b05e45b59e8fe9e7516
+environment =
+  PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  LD_LIBRARY_PATH=${kbproto:location}/lib:${libX11:location}/lib:${xproto:location}/lib/
+  LD_RUN_PATH=${kbproto:location}/lib:${libX11:location}/lib:${xproto:location}/lib/
+  CPPFLAGS=-I${xproto:location}/include/ -I${libX11:location}/include/ -I${kbproto:location}/include
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+
+[xkeyboard-config]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.1.tar.bz2
+md5sum = 57ecc78bacd8ecc398d8ed6588f4d04b
+depends =
+  ${perl:version}
+  ${perl-XML-Parser:location}
+configure-options =
+  --disable-static
+  --enable-shared
+  --enable-compat-rules
+  --with-xkb-rules-symlink=xfree86
+environment =
+  PATH=${gettext:location}/bin:${intltool:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xkbcomp:location}/bin:%(PATH)s
+  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
+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
+xkeyboard-config-location = ${libxkbfile:location}/../xkeyboard-config/share/X11/xkb
+configure-options =
+  --with-xkb-config-root=${:xkeyboard-config-location}
+environment =
+  PKG_CONFIG_PATH=${libxkbfile:location}/lib/pkgconfig:${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
+  LD_LIBRARY_PATH=${libxkbfile:location}/lib/:${libX11:location}/lib
+  LD_RUN_PATH=${libxkbfile:location}/lib/:${libX11:location}/lib
+  CPPFLAGS=-I${libxkbfile:location}/include/ -I${libX11:location}/include -I${xproto:location}/include -I${kbproto:location}/include
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+
+[render]
+recipe = hexagonit.recipe.cmmi
+url = http://xlibs.freedesktop.org/release/renderext-0.9.tar.bz2
+md5sum = d43c2afc69937655d13c02588c9ff974
+
+[libXrender]
+recipe = hexagonit.recipe.cmmi
+url = http://xlibs.freedesktop.org/release/libXrender-0.9.0.tar.bz2
+md5sum = ce7cda009aa0b10a73637941d44ae789
+environment =
+  PKG_CONFIG_PATH=${render:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig
+  CPPFLAGS=-I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include
+  LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib
+  LD_RUN_PATH=${render:location}/lib
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+
+[libXinerama]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/lib/libXinerama-1.1.1.tar.bz2
+md5sum = ecd4839ad01f6f637c6fb5327207f89b
+environment =
+  PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+configure-options =
+  --disable-static
+
 [libICE]
 recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libICE-1.0.7.tar.bz2
@@ -194,3 +365,104 @@ environment =
   PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${libX11:location}/include -I${renderproto:location}/include -I${xproto:location}/include
+
+[libXt]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/lib/libXt-1.0.9.tar.bz2
+md5sum = 8a414f8f2327aaa616ca2dcac1f5d8c3
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+    PKG_CONFIG_PATH=${render:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libSM:location}/lib/pkgconfig:${libICE:location}/lib/pkgconfig
+    CPPFLAGS=-I${xproto:location}/include -I${libX11:location}/include -I${libSM:location}/include -I${libICE:location}/include -I${kbproto:location}/include
+
+
+[dri2proto]
+recipe = hexagonit.recipe.cmmi
+url = http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.6.tar.gz
+md5sum = 873142af5db695537cfe05e01d13541f
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${xorg-libpthread-stubs:location}/lib/pkgconfig
+
+
+[pciaccess]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/lib/libpciaccess-0.12.0.tar.bz2
+md5sum = 285e07976274572e1f1e68edee09b70a
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+
+[makedepend]
+recipe = hexagonit.recipe.cmmi
+url = http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.3.tar.bz2
+md5sum = 4e6cb97bbecfbb34f3f644a75e513093
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig
+
+[glproto]
+recipe = hexagonit.recipe.cmmi
+url = http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.14.tar.bz2
+md5sum = f48257daf0017f7a7667e5bf48ca3578
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig
+
+[xfixes]
+recipe = hexagonit.recipe.cmmi
+url = http://xorg.freedesktop.org/releases/individual/lib/libXfixes-4.0.5.tar.bz2
+md5sum = 1b4b8386bd5d1751b2c7177223ad4629
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig
+  CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${fixesproto:location}/include -I${xextproto:location}/include
+
+[xdamage]
+recipe = hexagonit.recipe.cmmi
+url = http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.3.tar.bz2
+md5sum = 44774e1a065158b52f1a0da5100cebec
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig
+  CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${fixesproto:location}/include -I${xextproto:location}/include -I${damageproto:location}/include -I${xfixes:location}/include 
+
+[xserver]
+# Adds Xvfb functionnality
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/xserver/xorg-server-1.9.3.tar.bz2
+md5sum = 5bef6839a76d029204ab31aa2fcb5201
+configure-options =
+  --enable-xvfb
+  --disable-aiglx
+  --disable-composite
+  --disable-screensaver
+  --disable-glx
+  --disable-dri
+  --disable-dri2
+  --disable-xorg
+  --disable-xprint
+  --disable-config-hal
+  --with-xkb-bin-directory=${xkbcomp:location}/bin
+  --with-xkb-path=${xkeyboard-config:location}/share/X11/xkb
+#XXX-Cedric : The following can be safely removed as soon as Xvfb is known as working
+#  --with-default-font-path="${xfree86-fonts:location}/share/fonts/X11/Type1,${fontutil:location}/share/fonts/X11/75dpi,${cursor-fonts:location}/share/fonts/X11/misc"
+#depends = ${adobe-75dpi-fonts:location}
+environment =
+  PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig
+  CPPFLAGS=-I${xproto:location}/include -I${pixman:location}/include/pixman-1 -I${xextproto:location}/include -I${inputproto:location}/include -I${fontsproto:location}/include -I${kbproto:location}/include -I${xineramaproto:location}/include -I${renderproto:location}/include -I${bigreqsproto:location}/include -I${videoproto:location}/include -I${resourceproto:location}/include -I${xcmiscproto:location}/include -I${xtrans:location}/include -I${libXau:location}/include -I${randrproto:location}/include -I${libxkbfile:location}/include -I${recordproto:location}/include -I${fixesproto:location}/include -I${damageproto:location}/include
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath,${openssl:location}/lib

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"
@@ -30,6 +30,7 @@ setup(name=name,
         'lxml', # for full blown python interpreter
         'netaddr', # to manipulate on IP addresses
         'setuptools', # namespaces
+        'inotifyx', # to watch filesystem changes (used in lockfile)
         'slapos.core', # uses internally
 #        'slapos.toolbox', # needed for libcloud, cloudmgr, disabled for now
         'xml_marshaller', # need to communication with slapgrid
@@ -39,14 +40,21 @@ 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',
           'certificate_authority = slapos.recipe.certificate_authority:Recipe',
           'certificate_authority.request = slapos.recipe.certificate_authority:Request',
           'cron = slapos.recipe.dcron:Recipe',
           'cron.d = slapos.recipe.dcron:Part',
           'davstorage = slapos.recipe.davstorage:Recipe',
+          'dropbear = slapos.recipe.dropbear:Recipe',
+          'dropbear.add_authorized_key = slapos.recipe.dropbear:AddAuthorizedKey',
+          'dropbear.client = slapos.recipe.dropbear:Client',
           'duplicity = slapos.recipe.duplicity:Recipe',
           'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe',
+          'equeue = slapos.recipe.equeue:Recipe',
           'erp5testnode = slapos.recipe.erp5testnode:Recipe',
           'helloworld = slapos.recipe.helloworld:Recipe',
           'generic.cloudooo = slapos.recipe.generic_cloudooo:Recipe',
@@ -58,33 +66,47 @@ setup(name=name,
           'kvm = slapos.recipe.kvm:Recipe',
           'libcloud = slapos.recipe.libcloud:Recipe',
           'libcloudrequest = slapos.recipe.libcloudrequest:Recipe',
+          'lockfile = slapos.recipe.lockfile:Recipe',
           'memcached = slapos.recipe.memcached:Recipe',
           'generic.memcached = slapos.recipe.generic_memcached:Recipe',
           'mysql = slapos.recipe.mysql:Recipe',
+          'mydumper = slapos.recipe.mydumper:Recipe',
           'generic.mysql = slapos.recipe.generic_mysql:Recipe',
           'mkdirectory = slapos.recipe.mkdirectory:Recipe',
           'nbdserver = slapos.recipe.nbdserver:Recipe',
           'nosqltestbed = slapos.recipe.nosqltestbed:NoSQLTestBed',
+          'notifier = slapos.recipe.notifier:Recipe',
+          'notifier.callback = slapos.recipe.notifier:Callback',
+          'notifier.notify = slapos.recipe.notifier:Notify',
           'lamp = slapos.recipe.lamp:Request',
           'lamp.request = slapos.recipe.lamp:Request',
           'lamp.static = slapos.recipe.lamp:Static',
           'lamp.simple = slapos.recipe.lamp:Simple',
           'logrotate = slapos.recipe.logrotate:Recipe',
           'logrotate.d = slapos.recipe.logrotate:Part',
+          'pbs = slapos.recipe.pbs:Recipe',
           'publish = slapos.recipe.publish:Recipe',
           'publishurl = slapos.recipe.publishurl:Recipe',
+          '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',
           'symbolic.link = slapos.recipe.symbolic_link:Recipe',
           'softwaretype = slapos.recipe.softwaretype:Recipe',
           'siptester = slapos.recipe.siptester:SipTesterRecipe',
           'simplelogger = slapos.recipe.simplelogger:Recipe',
           'slaprunner = slapos.recipe.slaprunner:Recipe',
+          'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
+          'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
           'sphinx= slapos.recipe.sphinx:Recipe',
           'stunnel = slapos.recipe.stunnel:Recipe',
           'testnode = slapos.recipe.testnode:Recipe',
+          'urlparse = slapos.recipe._urlparse:Recipe',
           'vifib = slapos.recipe.vifib:Recipe',
+          'waitfor = slapos.recipe.waitfor:Recipe',
           'xwiki = slapos.recipe.xwiki:Recipe',
           'zabbixagent = slapos.recipe.zabbixagent:Recipe',
           'generic.zope = slapos.recipe.generic_zope:Recipe',

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

slapos/recipe/README.helloworld.txt

-helloworld
-==========
-
-It only installs a dummy wrapper saying "Hello World!" and sends to the master an "HelloWorld" parameter.

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>

slapos/recipe/_urlparse.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 urlparse import urlparse
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+  def _options(self, options):
+    url = urlparse(options['url'])
+
+    def to_str(data):
+      if data is None:
+        return ''
+      return str(data)
+
+    options.update(scheme=url.scheme,
+                   username=to_str(url.username),
+                   password=to_str(url.password),
+                   host=to_str(url.hostname),
+                   port=to_str(url.port),
+                   path=url.path.strip('/'),
+                   params=url.params,
+                   query=url.query,
+                   fragment=url.fragment)
+
+  def install(self):
+    return []

slapos/recipe/apache_frontend/__init__.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import BaseSlapRecipe
+import os
+import pkg_resources
+import hashlib
+import sys
+import zc.buildout
+import zc.recipe.egg
+import ConfigParser
+import re
+
+
+class Recipe(BaseSlapRecipe):
+
+  def getTemplateFilename(self, template_name):
+    return pkg_resources.resource_filename(__name__,
+        'template/%s' % template_name)
+
+  def _install(self):
+    self.path_list = []
+    self.requirements, self.ws = self.egg.working_set()
+
+    # 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')], self.ws, sys.executable, self.bin_directory)[0]
+
+    self.path_list.append(self.killpidfromfile)
+
+    frontend_port_number = self.parameter_dict.get("port", 4443)
+    frontend_domain_name = self.parameter_dict.get("domain",
+        "host.vifib.net")
+
+    base_varnish_port = 26009
+    slave_instance_list = self.parameter_dict.get("slave_instance_list", [])
+    rewrite_rule_list = []
+    slave_dict = {}
+    service_dict = {}
+    if frontend_port_number is 443:
+      base_url = "%s/" % frontend_domain_name
+    else:
+      base_url = "%s:%s/" % (frontend_domain_name, frontend_port_number)
+    for slave_instance in slave_instance_list:
+      url = slave_instance.get("url")
+      if url is None:
+        continue
+      reference = slave_instance.get("slave_reference")
+      subdomain = reference.replace("-", "").lower()
+      slave_dict[reference] = "https://%s.%s" % (subdomain, base_url)
+
+      enable_cache = slave_instance.get("enable_cache", "")
+      if enable_cache.upper() in ('1', 'TRUE'):
+        # Varnish should use stunnel to connect to the backend
+        base_varnish_control_port = base_varnish_port
+        base_varnish_port += 1
+        # Use regex
+        host_regex = "((\[\w*|[0-9]+\.)(\:|)).*(\]|\.[0-9]+)"
+        slave_host = re.search(host_regex, url).group(0)
+        port_regex = "\w+(\/|)$"
+        matcher = re.search(port_regex, url)
+        if matcher is not None:
+          slave_port = matcher.group(0)
+          slave_port = slave_port.replace("/", "")
+        elif url.startswith("https://"):
+          slave_port = 443
+        else:
+          slave_port = 80
+        service_name = "varnish_%s" % reference
+        varnish_ip = self.getLocalIPv4Address()
+        stunnel_port = base_varnish_port + 1
+        self.installVarnishCache(service_name,
+          ip=varnish_ip,
+          port=base_varnish_port,
+          control_port=base_varnish_control_port,
+          backend_host=varnish_ip,
+          backend_port=stunnel_port,
+          size="1G")
+        service_dict[service_name] = dict(public_ip=varnish_ip,
+            public_port=stunnel_port,
+            private_ip=slave_host.replace("[", "").replace("]", ""),
+            private_port=slave_port)
+        rewrite_rule_list.append("%s.%s http://%s:%s" % \
+            (reference.replace("-", ""), frontend_domain_name,
+            varnish_ip, base_varnish_port))
+        base_varnish_port += 2
+      else:
+        rewrite_rule_list.append("%s.%s %s" % (subdomain, frontend_domain_name,
+            url))
+
+    valid_certificate_str = self.parameter_dict.get("domain_ssl_ca_cert")
+    valid_key_str = self.parameter_dict.get("domain_ssl_ca_key")
+
+    if valid_certificate_str is None and valid_key_str is None:
+      ca_conf = self.installCertificateAuthority()
+      key, certificate = self.requestCertificate(frontend_domain_name)
+    else:
+      ca_conf = self.installValidCertificateAuthority(
+          frontend_domain_name, valid_certificate_str, valid_key_str)
+      key = ca_conf.pop("key")
+      certificate = ca_conf.pop("certificate")
+
+    if service_dict != {}:
+      if valid_certificate_str is not None and valid_key_str is not None:
+        self.installCertificateAuthority()
+        stunnel_key, stunnel_certificate = \
+            self.requestCertificate(frontend_domain_name)
+      else:
+        stunnel_key, stunnet_certificate = key, certificate
+      self.installStunnel(service_dict,
+        stunnel_certificate, stunnel_key,
+        ca_conf["ca_crl"],
+        ca_conf["certificate_authority_path"])
+
+    apache_parameter_dict = self.installFrontendApache(
+        ip_list=["[%s]" % self.getGlobalIPv6Address(),
+                 self.getLocalIPv4Address()],
+        port=frontend_port_number,
+        name=frontend_domain_name,
+        rewrite_rule_list=rewrite_rule_list,
+        key=key, certificate=certificate)
+
+    for reference, url in slave_dict.iteritems():
+      self.setConnectionDict(dict(site_url=url), reference)
+
+    self.setConnectionDict(
+      dict(site_url=apache_parameter_dict["site_url"],
+           domain_ipv6_address=self.getGlobalIPv6Address(),
+           domain_ipv4_address=self.getLocalIPv4Address()))
+    return self.path_list
+
+  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)
+    certificate = os.path.join(self.ca_certs, hash + self.ca_crt_ext)
+    parser = ConfigParser.RawConfigParser()
+    parser.add_section('certificate')
+    parser.set('certificate', 'name', name)
+    parser.set('certificate', 'key_file', key)
+    parser.set('certificate', 'certificate_file', certificate)
+    parser.write(open(os.path.join(self.ca_request_dir, hash), 'w'))
+    return key, certificate
+
+  def installCrond(self):
+   timestamps = self.createDataDirectory('cronstamps')
+   cron_output = os.path.join(self.log_directory, 'cron-output')
+   self._createDirectory(cron_output)
+   catcher = zc.buildout.easy_install.scripts([('catchcron',
+     __name__ + '.catdatefile', 'catdatefile')], self.ws, sys.executable,
+     self.bin_directory, arguments=[cron_output])[0]
+   self.path_list.append(catcher)
+   cron_d = os.path.join(self.etc_directory, 'cron.d')
+   crontabs = os.path.join(self.etc_directory, 'crontabs')
+   self._createDirectory(cron_d)
+   self._createDirectory(crontabs)
+   wrapper = zc.buildout.easy_install.scripts([('crond',
+     'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
+     self.wrapper_directory, arguments=[
+       self.options['dcrond_binary'].strip(), '-s', cron_d, '-c', crontabs,
+       '-t', timestamps, '-f', '-l', '5', '-M', catcher]
+     )[0]
+   self.path_list.append(wrapper)
+   return cron_d
+
+  def installValidCertificateAuthority(self, domain_name, certificate, key):
+    ca_dir = os.path.join(self.data_root_directory, 'ca')
+    ca_private = os.path.join(ca_dir, 'private')
+    ca_certs = os.path.join(ca_dir, 'certs')
+    ca_crl = os.path.join(ca_dir, 'crl')
+    self._createDirectory(ca_dir)
+    for path in (ca_private, ca_certs, ca_crl):
+      self._createDirectory(path)
+    key_path = os.path.join(ca_private, domain_name + ".key")
+    certificate_path = os.path.join(ca_certs, domain_name + ".crt")
+    self._writeFile(key_path, key)
+    self._writeFile(certificate_path, certificate)
+    return dict(certificate_authority_path=ca_dir,
+        ca_crl=ca_crl,
+        certificate=certificate_path,
+        key=key_path)
+
+  def installCertificateAuthority(self, ca_country_code='XX',
+      ca_email='xx@example.com', ca_state='State', ca_city='City',
+      ca_company='Company'):
+    backup_path = self.createBackupDirectory('ca')
+    self.ca_dir = os.path.join(self.data_root_directory, 'ca')
+    self._createDirectory(self.ca_dir)
+    self.ca_request_dir = os.path.join(self.ca_dir, 'requests')
+    self._createDirectory(self.ca_request_dir)
+    config = dict(ca_dir=self.ca_dir, request_dir=self.ca_request_dir)
+    self.ca_private = os.path.join(self.ca_dir, 'private')
+    self.ca_certs = os.path.join(self.ca_dir, 'certs')
+    self.ca_crl = os.path.join(self.ca_dir, 'crl')
+    self.ca_newcerts = os.path.join(self.ca_dir, 'newcerts')
+    self.ca_key_ext = '.key'
+    self.ca_crt_ext = '.crt'
+    for d in [self.ca_private, self.ca_crl, self.ca_newcerts, self.ca_certs]:
+      self._createDirectory(d)
+    for f in ['crlnumber', 'serial']:
+      if not os.path.exists(os.path.join(self.ca_dir, f)):
+        open(os.path.join(self.ca_dir, f), 'w').write('01')
+    if not os.path.exists(os.path.join(self.ca_dir, 'index.txt')):
+      open(os.path.join(self.ca_dir, 'index.txt'), 'w').write('')
+    openssl_configuration = os.path.join(self.ca_dir, 'openssl.cnf')
+    config.update(
+        working_directory=self.ca_dir,
+        country_code=ca_country_code,
+        state=ca_state,
+        city=ca_city,
+        company=ca_company,
+        email_address=ca_email,
+    )
+    self._writeFile(openssl_configuration, pkg_resources.resource_string(
+      __name__, 'template/openssl.cnf.ca.in') % config)
+    self.path_list.extend(zc.buildout.easy_install.scripts([
+      ('certificate_authority', __name__ + '.certificate_authority',
+         'runCertificateAuthority')],
+        self.ws, sys.executable, self.wrapper_directory, arguments=[dict(
+          openssl_configuration=openssl_configuration,
+          openssl_binary=self.options['openssl_binary'],
+          certificate=os.path.join(self.ca_dir, 'cacert.pem'),
+          key=os.path.join(self.ca_private, 'cakey.pem'),
+          crl=os.path.join(self.ca_crl),
+          request_dir=self.ca_request_dir
+          )]))
+
+    # configure backup
+    backup_cron = os.path.join(self.cron_d, 'ca_rdiff_backup')
+    open(backup_cron, 'w').write(
+        '''0 0 * * * %(rdiff_backup)s %(source)s %(destination)s'''%dict(
+          rdiff_backup=self.options['rdiff_backup_binary'],
+          source=self.ca_dir,
+          destination=backup_path))
+    self.path_list.append(backup_cron)
+
+    return dict(
+      ca_certificate=os.path.join(config['ca_dir'], 'cacert.pem'),
+      ca_crl=os.path.join(config['ca_dir'], 'crl'),
+      certificate_authority_path=config['ca_dir']
+    )
+
+  def _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['lock_file'] = os.path.join(self.run_directory,
+        name + '.lock')
+    apache_conf['document_root'] = os.path.join(self.data_root_directory,
+        'htdocs')
+    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,
+        name + '-error.log')
+    apache_conf['access_log'] = os.path.join(self.log_directory,
+        name + '-access.log')
+    self.registerLogRotation(name, [apache_conf['error_log'],
+      apache_conf['access_log']], self.killpidfromfile + ' ' +
+      apache_conf['pid_file'] + ' SIGUSR1')
+    return apache_conf
+
+  def installVarnishCache(self, name, ip, port, control_port, backend_host,
+                                backend_port, size="1G"):
+    """
+      Install a varnish daemon for a certain address
+    """
+    directory = self.createDataDirectory(name)
+    varnish_config = dict(
+      directory=directory,
+      pid = "%s/varnish.pid" % directory,
+      port="%s:%s" % (ip, port),
+      varnishd_binary=self.options["varnishd_binary"],
+      control_port="%s:%s" % (ip, control_port),
+      storage="file,%s/storage.bin,%s" % (directory, size))
+
+    config_file = self.createConfigurationFile("%s.conf" % name,
+      self.substituteTemplate(self.getTemplateFilename('varnish.vcl.in'),
+        dict(backend_host=backend_host, backend_port=backend_port)))
+
+    varnish_argument_list = [varnish_config['varnishd_binary'].strip(),
+        "-F", "-n", directory, "-P", varnish_config["pid"], "-p",
+        "cc_command=exec %s " % self.options["gcc_binary"] +\
+            "-fpic -shared -o %o %s",
+        "-f", config_file,
+        "-a", varnish_config["port"], "-T", varnish_config["control_port"],
+        "-s", varnish_config["storage"]]
+    environment = dict(PATH=self.options["binutils_directory"])
+    wrapper = zc.buildout.easy_install.scripts([(name,
+      'slapos.recipe.librecipe.execute', 'executee')], self.ws,
+      sys.executable, self.wrapper_directory, arguments=[varnish_argument_list,
+      environment])[0]
+    self.path_list.append(wrapper)
+
+    return varnish_config
+
+  def installStunnel(self, service_dict, certificate,
+      key, ca_crl, ca_path):
+    """Installs stunnel
+      service_dict =
+        { name: (public_ip, private_ip, public_port, private_port),}
+    """
+    template_filename = self.getTemplateFilename('stunnel.conf.in')
+    template_entry_filename = self.getTemplateFilename('stunnel.conf.entry.in')
+
+    log = os.path.join(self.log_directory, 'stunnel.log')
+    pid_file = os.path.join(self.run_directory, 'stunnel.pid')
+    stunnel_conf = dict(
+        pid_file=pid_file,
+        log=log,
+        cert = certificate,
+        key = key,
+        ca_crl = ca_crl,
+        ca_path = ca_path,
+        entry_str=''
+    )
+    entry_list = []
+    for name, parameter_dict in service_dict.iteritems():
+      parameter_dict["name"] = name
+      entry_str = self.substituteTemplate(template_entry_filename,
+          parameter_dict)
+      entry_list.append(entry_str)
+
+    stunnel_conf["entry_str"] = "\n".join(entry_list)
+    stunnel_conf_path = self.createConfigurationFile("stunnel.conf",
+        self.substituteTemplate(template_filename,
+          stunnel_conf))
+    wrapper = zc.buildout.easy_install.scripts([('stunnel',
+      'slapos.recipe.librecipe.execute', 'execute_wait')], self.ws,
+      sys.executable, self.wrapper_directory, arguments=[
+        [self.options['stunnel_binary'].strip(), stunnel_conf_path],
+        [certificate, key]]
+      )[0]
+    self.path_list.append(wrapper)
+    return stunnel_conf
+
+  def installFrontendApache(self, ip_list, port, key, certificate, name,
+                            rewrite_rule_list=[], rewrite_rule_zope_list=[],
+                            access_control_string=None):
+    # Create htdocs, populate it with default 404 document
+    htdocs_location = os.path.join(self.data_root_directory, 'htdocs')
+    self._createDirectory(htdocs_location)
+    notfound_file_location = os.path.join(htdocs_location, 'notfound.html')
+    notfound_template_file_location = self.getTemplateFilename(
+        'notfound.html')
+    notfound_file_content = open(notfound_template_file_location, 'r').read()
+    self._writeFile(notfound_file_location, notfound_file_content)
+
+    # Create configuration file and rewritemaps
+    apachemap_name = "apachemap.txt"
+    # XXX-Cedric : implement zope specific rewrites list. Current apachemap is
+    #              generic and does not use VirtualHost Monster.
+    apachemapzope_name = "apachemapzope.txt"
+    self.createConfigurationFile(apachemap_name, "\n".join(rewrite_rule_list))
+    self.createConfigurationFile(apachemapzope_name,
+        "\n".join(rewrite_rule_zope_list))
+    apache_conf = self._getApacheConfigurationDict(name, ip_list, port)
+    apache_conf['ssl_snippet'] = self.substituteTemplate(
+        self.getTemplateFilename('apache.ssl-snippet.conf.in'),
+        dict(login_certificate=certificate, login_key=key))
+
+    apache_conf["listen"] = "\n".join(["Listen %s:%s" % (ip, port) for ip in ip_list])
+
+    path = self.substituteTemplate(
+        self.getTemplateFilename('apache.conf.path-protected.in'),
+        dict(path='/', access_control_string='none'))
+
+    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),
+      apache_domain=name,
+      port=port,
+    ))
+
+    apache_conf_string = self.substituteTemplate(
+          self.getTemplateFilename('apache.conf.in'), apache_conf)
+
+    apache_config_file = self.createConfigurationFile('apache_frontend.conf',
+        apache_conf_string)
+
+
+    self.path_list.append(apache_config_file)
+    self.path_list.extend(zc.buildout.easy_install.scripts([(
+      name, 'slapos.recipe.erp5.apache', 'runApache')], self.ws,
+          sys.executable, self.wrapper_directory, arguments=[
+            dict(
+              required_path_list=[key, certificate],
+              binary=self.options['httpd_binary'],
+              config=apache_config_file)
+          ]))
+
+    return dict(site_url="https://%s:%s/" % (name, port))

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)

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

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>

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>

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

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
+}

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>

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

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

slapos/recipe/apache_frontend/template/stunnel.conf.entry.in

+[%(name)s]
+accept = %(public_ip)s:%(public_port)s
+connect = %(private_ip)s:%(private_port)s

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

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);
+# }

slapos/recipe/apachephp/__init__.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import shutil
+import os
+import signal
+from binascii import b2a_uu as uuencode
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+  def install(self):
+    path_list = []
+
+    # Copy application
+    shutil.rmtree(self.options['htdocs'])
+    shutil.copytree(self.options['source'],
+                    self.options['htdocs'])
+
+    # Install 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.createPythonScript(self.options['wrapper'],
+        'slapos.recipe.librecipe.execute.execute',
+        [self.options['httpd-binary'], '-f', self.options['httpd-conf'],
+         '-DFOREGROUND']
+    )
+    path_list.append(wrapper)
+
+    secret_key_filename = os.path.join(self.buildout['buildout']['directory'],
+                                       '.php_secret_key')
+    if not os.path.exists(secret_key_filename):
+      secret_key = uuencode(os.urandom(45)).strip()
+      # Remove unsafe characters
+      secret_key = secret_key.translate(None, '"\'')
+      with open(secret_key_filename, 'w') as secret_key_file:
+        secret_key_file.write(secret_key)
+    else:
+      with open(secret_key_filename, 'r') as secret_key_file:
+        secret_key = secret_key_file.read()
+
+    application_conf = dict(mysql_database=self.options['mysql-database'],
+                            mysql_user=self.options['mysql-username'],
+                            mysql_password=self.options['mysql-password'],
+                            mysql_host='%s:%s' % (self.options['mysql-host'],
+                                                  self.options['mysql-port']),
+                            secret_key=secret_key,
+                           )
+
+    directory, file_ = os.path.split(self.options['configuration'])
+
+    path = self.options['htdocs']
+    if directory:
+      path = os.path.join(path, directory)
+      if not os.path.exists(path):
+        os.makedirs(path)
+      if not os.path.isdir(path):
+        raise OSError("Cannot create %r." % path)
+
+    destination = os.path.join(path, file_)
+    config = self.createFile(destination,
+      self.substituteTemplate(self.options['template'], application_conf))
+    path_list.append(config)
+
+    if os.path.exists(self.options['pid-file']):
+      # Reload apache configuration
+      with open(self.options['pid-file']) as pid_file:
+        pid = int(pid_file.read().strip(), 10)
+      os.kill(pid, signal.SIGUSR1) # Graceful restart
+
+    return path_list

slapos/recipe/apachephp/template/apache.in

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

slapos/recipe/apachephp/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=0ff

slapos/recipe/apacheproxy/__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 os
+import signal
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+  def install(self):
+    path_list = []
+
+    # 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'],
+      backend_url=self.options['url'],
+    )
+    httpd_conf = self.createFile(self.options['httpd-conf'],
+      self.substituteTemplate(self.getTemplateFilename('apache.in'),
+                              apache_config)
+    )
+    path_list.append(httpd_conf)
+
+    wrapper = self.createPythonScript(self.options['wrapper'],
+        'slapos.recipe.librecipe.execute.execute',
+        [self.options['httpd-binary'], '-f', self.options['httpd-conf'],
+         '-DFOREGROUND']
+    )
+    path_list.append(wrapper)
+
+    if os.path.exists(self.options['pid-file']):
+      # Reload apache configuration
+      with open(self.options['pid-file']) as pid_file:
+        pid = int(pid_file.read().strip(), 10)
+      os.kill(pid, signal.SIGUSR1) # Graceful restart
+
+    return path_list

slapos/recipe/apacheproxy/template/apache.in

+# Apache static configuration
+# Automatically generated
+
+# Basic server configuration
+PidFile "%(pid_file)s"
+LockFile "%(lock_file)s"
+Listen %(ip)s:%(port)s
+ServerAdmin someone@email
+DefaultType text/plain
+TypesConfig conf/mime.types
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+
+# Log configuration
+ErrorLog "%(error_log)s"
+LogLevel warn
+LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
+LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common
+CustomLog "%(access_log)s" common
+
+# Directory protection
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+</Directory>
+
+ProxyPass / %(backend_url)s
+
+# List of modules
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule 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 alias_module modules/mod_alias.so

slapos/recipe/certificate_authority/__init__.py

@@ -118,7 +118,7 @@ class Request(Recipe):
       if os.path.islink(link):
         os.unlink(link)
       elif os.path.exists(link):
-        raise OSError("%r file should be a symbolic link.")
+        raise OSError("%r file should be a symbolic link." % link)
 
     os.symlink(key, key_file)
     os.symlink(certificate, cert_file)

slapos/recipe/certificate_authority/certificate_authority.py

@@ -2,6 +2,7 @@ import os
 import subprocess
 import time
 import ConfigParser
+import uuid
 
 
 def popenCommunicate(command_list, input=None):
@@ -44,7 +45,7 @@ class CertificateAuthority:
       popenCommunicate([self.openssl_binary, 'req', '-nodes', '-config',
           self.openssl_configuration, '-new', '-x509', '-extensions',
           'v3_ca', '-keyout', self.key, '-out', self.certificate,
-          '-days', '10950'], 'Automatic Certificate Authority\n')
+          '-days', '10950'], 'Certificate Authority %s\n' % uuid.uuid1())
     except:
       try:
         for f in file_list:

slapos/recipe/davstorage/__init__.py

@@ -24,106 +24,88 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.recipe.librecipe import BaseSlapRecipe
-import os
 import subprocess
-import pkg_resources
-import zc.buildout
-import zc.recipe.egg
-import sys
-
-class Recipe(BaseSlapRecipe):
-  def getTemplateFilename(self, template_name):
-    return pkg_resources.resource_filename(__name__,
-        'template/%s' % template_name)
-
-  def _install(self):
-    self.path_list = []
-    self.requirements, self.ws = self.egg.working_set()
-    document_root = self.createDataDirectory('www')
-    apache_config = self.installApache(document_root)
-    self.setConnectionUrl(scheme='webdavs',
-                          host=apache_config['ip'],
-                          port=apache_config['port'],
-                          auth=(apache_config['user'],
-                                apache_config['password']))
-    return self.path_list
-
-  def installApache(self, document_root, ip=None, port=None):
-    if ip is None:
-      ip=self.getGlobalIPv6Address()
-    if port is None:
-      port = '9080'
-
-    htpasswd_config = self.createHtpasswd()
-    ssl_config = self.createCertificate(size=2048)
+import httplib
+import base64
 
-    apache_config = dict(
-      pid_file=os.path.join(self.run_directory, 'httpd.pid'),
-      lock_file=os.path.join(self.run_directory, 'httpd.lock'),
-      davlock_db=os.path.join(self.run_directory, 'davdb.lock'),
-      ip=ip,
-      port=port,
-      error_log=os.path.join(self.log_directory, 'httpd-error.log'),
-      access_log=os.path.join(self.log_directory, 'httpd-access.log'),
-      document_root=document_root,
-      modules_dir=self.options['apache_modules_dir'],
-      mime_types=self.options['apache_mime_file'],
-      server_root=self.work_directory,
-      email_address='admin@vifib.net',
-      htpasswd_file=htpasswd_config['htpasswd_file'],
-      ssl_certificate=ssl_config['certificate'],
-      ssl_key=ssl_config['key'],
-    )
-    httpd_config_file = self.createConfigurationFile('httpd.conf',
-      self.substituteTemplate(self.getTemplateFilename('httpd.conf.in'),
-                              apache_config))
-    self.path_list.append(httpd_config_file)
-    apache_runner = zc.buildout.easy_install.scripts(
-      [('httpd', 'slapos.recipe.librecipe.execute', 'execute')],
-      self.ws, sys.executable, self.wrapper_directory,
-      arguments=[self.options['apache_binary'],
-                 '-f', httpd_config_file,
-                 '-DFOREGROUND',
-                ]
-    )[0]
-    self.path_list.append(apache_runner)
-    return dict(ip=apache_config['ip'],
-                port=apache_config['port'],
-                user=htpasswd_config['user'],
-                password=htpasswd_config['password']
-               )
-
-  def createHtpasswd(self):
-    htpasswd = self.createConfigurationFile('htpasswd', '')
-    self.path_list.append(htpasswd)
-    password = self.generatePassword()
-    user = 'user'
-    subprocess.check_call([self.options['apache_htpasswd'],
-                           '-bc', htpasswd,
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+  def _options(self, options):
+    options['password'] = self.generatePassword()
+
+  def install(self):
+    path_list = []
+
+    htpasswd_file = self.options['htpasswd-file']
+    # Create or empty the file
+    open(htpasswd_file, 'w').close()
+    path_list.append(htpasswd_file)
+
+    user = self.options['user']
+    password = self.options['password']
+    subprocess.check_call([self.options['apache-htpasswd'],
+                           '-bc', htpasswd_file,
                            user, password
                           ])
-    return dict(htpasswd_file=htpasswd,
-                user=user,
-                password=password)
-
-  def createCertificate(self, size=1024, subject='/C=FR/L=Marcq-en-Baroeul/O=Nexedi'):
-    key_file = os.path.join(self.etc_directory, 'httpd.key')
-    certificate_file = os.path.join(self.etc_directory, 'httpd.crt')
-
-    files = [key_file, certificate_file, ]
-    if not all([os.path.exists(f) for f in files]):
-      for f in files:
-        if os.path.exists(f):
-          os.unlink(f)
-
-      subprocess.check_call([self.options['openssl_binary'],
-                             'req', '-x509', '-nodes',
-                             '-newkey', 'rsa:%s' % size,
-                             '-subj', str(subject),
-                             '-out', certificate_file,
-                             '-keyout', key_file
-                            ])
-
-    return dict(key=key_file,
-                certificate=certificate_file)
+
+
+    apache_config = dict(
+      pid_file=self.options['pid-file'],
+      lock_file=self.options['lock-file'],
+      davlock_db=self.options['davdb-lock'],
+      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'],
+      modules_dir=self.options['apache-modules-dir'],
+      mime_types=self.options['apache-mime-file'],
+      server_root=self.options['root'],
+      email_address=self.options['email-address'],
+      htpasswd_file=htpasswd_file,
+      ssl_certificate=self.options['cert-file'],
+      ssl_key=self.options['key-file'],
+    )
+
+    # Create logfiles
+    for log in [self.options['error-log'], self.options['access-log']]:
+      open(log, 'a').close()
+
+    config_file = self.createFile(self.options['conf-file'],
+       self.substituteTemplate(self.getTemplateFilename('httpd.conf.in'),
+                               apache_config)
+    )
+    path_list.append(config_file)
+
+    wrapper = self.createPythonScript(self.options['wrapper'],
+      'slapos.recipe.librecipe.execute.execute',
+      [self.options['apache-binary'], '-f', config_file, '-DFOREGROUND'])
+    path_list.append(wrapper)
+
+    promise = self.createPythonScript(self.options['promise'],
+      __name__ + '.promise',
+      dict(host=self.options['ip'], port=int(self.options['port']),
+           user=self.options['user'], password=self.options['password'])
+                                     )
+    path_list.append(promise)
+
+    return path_list
+
+def promise(args):
+  host = args['host']
+  port = args['port']
+  user = args['user']
+  password = args['password']
+
+  connection = httplib.HTTPSConnection(host, port)
+  auth = base64.b64encode('%s:%s' % (user, password))
+  connection.request('OPTIONS', '/',
+                     headers=dict(
+                       Authorization='Basic %s' % auth,
+                     )
+                    )
+  connection.getresponse()
+
+  return 0

slapos/recipe/dropbear.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+import itertools
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class KnownHostsFile(dict):
+
+  def __init__(self, filename):
+    self._filename = filename
+
+  def _load(self):
+    if os.path.exists(self._filename):
+      with open(self._filename, 'r') as keyfile:
+        for line in keyfile:
+          host, key = [column.strip() for column in line.split(' ', 1)]
+          self[host] = key
+
+  def _dump(self):
+    with open(self._filename, 'w') as keyfile:
+      for key, value in self.items():
+        if key is not None and value is not None:
+          keyfile.write('%(host)s %(key)s\n' % {'host': key,
+                                                'key': value})
+
+  def __enter__(self):
+    self._load()
+
+  def __exit__(self, exc_type, exc_value, traceback):
+    self._dump()
+
+
+
+class AuthorizedKeysFile(object):
+
+  def __init__(self, filename):
+    self.filename = filename
+
+  def append(self, key):
+    """Append the key to the file if the key's not in the file
+    """
+    # Create the file it it does not exist
+    try:
+      file_ = os.open(self.filename, os.O_CREAT | os.O_EXCL)
+      os.close(file_)
+    except:
+      pass
+
+    with open(self.filename, 'r') as keyfile:
+      # itertools.imap avoid loading all the authorized_keys file in
+      # memory which would be counterproductive.
+      present = (key.strip() in itertools.imap(lambda k: k.strip(),
+                                               keyfile))
+      try:
+        keyfile.seek(-1, os.SEEK_END)
+        ended_by_newline = (keyfile.read() == '\n')
+      except IOError:
+        ended_by_newline = True
+
+    if not present:
+      with open(self.filename, 'a') as keyfile:
+        if not ended_by_newline:
+          keyfile.write('\n')
+        keyfile.write(key.strip())
+
+class Recipe(GenericBaseRecipe):
+
+  def install(self):
+    path_list = []
+
+    dropbear_cmd = [self.options['dropbear-binary']]
+    # Don't fork into background
+    dropbear_cmd.append('-F')
+    # Log on stderr
+    dropbear_cmd.append('-E')
+    # Don't display motd
+    dropbear_cmd.append('-m')
+    # Disable password login
+    dropbear_cmd.extend(['-s', '-g'])
+    # Disable port forwarding
+    dropbear_cmd.extend(['-j', '-k'])
+
+    host = self.options['host']
+    if ':' in host:
+      host = '[%s]' % host
+    port = self.options['port']
+    binding_address = '%s:%s' % (host, port)
+    dropbear_cmd.extend(['-p', binding_address])
+    # Single user mode
+    dropbear_cmd.append('-n')
+
+    if 'dss-keyfile' in self.options:
+      dropbear_cmd.extend(['-d', self.options['dss-keyfile']])
+    else:
+      dropbear_cmd.extend(['-r', self.options['rsa-keyfile']])
+
+    env = {}
+    if 'home' in self.options:
+      env['DROPBEAR_OVERRIDE_HOME'] = self.options['home']
+
+    if 'shell' in self.options:
+      env['DROPBEAR_OVERRIDE_SHELL'] = self.options['shell']
+
+    wrapper = self.createPythonScript(
+      self.options['wrapper'],
+      'slapos.recipe.librecipe.execute.executee',
+      (dropbear_cmd, env, )
+    )
+    path_list.append(wrapper)
+
+    return path_list
+
+class Client(GenericBaseRecipe):
+
+  def install(self):
+    env = dict()
+
+    if 'home' in self.options:
+      env['HOME'] = self.options['home']
+      self.createDirectory(self.options['home'], '.ssh')
+
+    dropbear_cmd = [self.options['dbclient-binary'], '-T']
+    if self.optionIsTrue('force-host-key', default=False):
+      dropbear_cmd.extend(['-y'])
+
+    if 'identity-file' in self.options:
+      dropbear_cmd.extend(['-i', self.options['identity-file']])
+
+    wrapper = self.createPythonScript(
+      self.options['wrapper'],
+      'slapos.recipe.librecipe.execute.executee',
+      (dropbear_cmd, env, )
+    )
+
+    return [wrapper]
+
+class AddAuthorizedKey(GenericBaseRecipe):
+
+  def install(self):
+    path_list = []
+
+    ssh = self.createDirectory(self.options['home'], '.ssh')
+    path_list.append(ssh)
+
+    authorized_keys = AuthorizedKeysFile(os.path.join(ssh, 'authorized_keys'))
+    authorized_keys.append(self.options['key'])
+
+    return path_list

slapos/recipe/duplicity.py

@@ -30,15 +30,23 @@ class Recipe(GenericBaseRecipe):
 
   def install(self):
 
-    remote_url = self.options['remote_backup']
-    backup_directory = self.options['directory']
+    remote_url = self.options['remote-backup']
+    backup_directory = self.options['local-directory']
 
-    wrapper = self.createPythonScript(
-      self.options['wrapper'],
-      'slapos.recipe.librecipe.execute.execute',
-      [self.options['duplicity_binary'], '--no-encryption',
-       backup_directory, remote_url]
-    )
-    return [wrapper]
+    cmd = [self.options['duplicity-binary'],]
+    options = ['--no-encryption', '--archive-dir', self.options['cache']]
+
+    if self.optionIsTrue('recover', False):
+      options.append('--force')
+      # duplicity [options] remote backup
+      cmd.extend(options)
+      cmd.extend([remote_url, backup_directory])
+    else:
+      # duplicity [options] local remote
+      cmd.extend(options)
+      cmd.extend([backup_directory, remote_url])
 
+    wrapper = self.createPythonScript(self.options['wrapper'],
+      'slapos.recipe.librecipe.execute.execute', cmd)
 
+    return [wrapper]

slapos/recipe/equeue.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):
+
+    commandline = [self.options['equeue-binary']]
+    commandline.extend(['--database', self.options['database']])
+    commandline.extend(['-l', self.options['log']])
+
+    if 'loglevel' in self.options:
+      commandline.extend(['--loglevel', self.options['loglevel']])
+
+    commandline.append(self.options['socket'])
+
+    return [self.createPythonScript(
+      self.options['wrapper'],
+      'slapos.recipe.librecipe.execute.execute',
+      commandline,
+    )]

slapos/recipe/erp5testnode/__init__.py

@@ -24,86 +24,80 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.recipe.librecipe import BaseSlapRecipe
+import ConfigParser
+import json
 import os
-import pkg_resources
-import zc.buildout
-import zc.recipe.egg
-import sys
+import StringIO
 
-class Recipe(BaseSlapRecipe):
-  def __init__(self, buildout, name, options):
-    self.egg = zc.recipe.egg.Egg(buildout, options['recipe'], options)
-    BaseSlapRecipe.__init__(self, buildout, name, options)
+from slapos.recipe.librecipe import GenericBaseRecipe
 
-  def _install(self):
-    self.requirements, self.ws = self.egg.working_set()
+class Recipe(GenericBaseRecipe):
+  def install(self):
     path_list = []
-    CONFIG = dict()
-    CONFIG['slapos_directory'] = self.createDataDirectory('slapos')
-    CONFIG['working_directory'] = self.createDataDirectory('testnode')
-    CONFIG['test_suite_directory'] = self.createDataDirectory('test_suite')
-    CONFIG['proxy_host'] = self.getLocalIPv4Address()
-    CONFIG['proxy_port'] = '5000'
-    CONFIG['log_directory'] = self.createDataDirectory('testnodelog')
-    CONFIG['run_directory'] = self.createDataDirectory('testnoderun')
-    CONFIG['test_suite_title'] = self.parameter_dict.get('test_suite_title')
-    CONFIG['test_node_title'] = self.parameter_dict.get('test_node_title')
-    CONFIG['test_suite'] = self.parameter_dict.get('test_suite')
-    CONFIG['node_quantity'] = self.parameter_dict.get('node_quantity', '1')
-    CONFIG['project_title'] = self.parameter_dict.get('project_title')
-    CONFIG['ipv4_address'] = self.getLocalIPv4Address()
-    CONFIG['ipv6_address'] = self.getGlobalIPv6Address()
-    CONFIG['test_suite_master_url'] = self.parameter_dict.get(
-                                'test_suite_master_url', None)
-    CONFIG['git_binary'] = self.options['git_binary']
-    CONFIG['slapgrid_partition_binary'] = self.options[
-      'slapgrid_partition_binary']
-    CONFIG['slapgrid_software_binary'] = self.options[
-      'slapgrid_software_binary']
-    CONFIG['slapproxy_binary'] = self.options['slapproxy_binary']
-    CONFIG['zip_binary'] = self.options['zip_binary']
+    options = self.options.copy()
+    del options['recipe']
+    CONFIG = {k.replace('-', '_'): v for k, v in options.iteritems()}
     CONFIG['PATH'] = os.environ['PATH']
-    additional_bt5_repository_id = \
-        self.parameter_dict.get('additional_bt5_repository_id')
 
-    CONFIG['bt5_path'] = None
-    if additional_bt5_repository_id is not None:
-      CONFIG['bt5_path'] = ""
-      additional_bt5_repository_id_list = additional_bt5_repository_id.split(",")
-      for id in additional_bt5_repository_id_list:
-        id_path = os.path.join(CONFIG['slapos_directory'], id)
+    if CONFIG['bt5_path']:
+      additional_bt5_repository_id_list = CONFIG['bt5_path'].split(",")
+      CONFIG['bt5_path'] = ''
+      for bt5_repository_id in additional_bt5_repository_id_list:
+        id_path = os.path.join(CONFIG['slapos_directory'], bt5_repository_id)
         bt_path = os.path.join(id_path, "bt5")
         CONFIG['bt5_path'] += "%s,%s," % (id_path, bt_path)
-    CONFIG['instance_dict'] = ''
-    if 'instance_dict' in self.parameter_dict:
-      CONFIG['instance_dict'] = '[instance_dict]\n'
-      for k,v in eval(self.parameter_dict['instance_dict']).iteritems():
-        CONFIG['instance_dict'] += '%s = %s\n' % (k,v)
 
-    CONFIG['repository_list'] = ''
+    if self.options['instance-dict']:
+      config_instance_dict = ConfigParser.ConfigParser()
+      config_instance_dict.add_section('instance_dict')
+      instance_dict = json.loads(self.options['instance-dict'])
+
+      for k ,v in instance_dict.iteritems():
+        config_instance_dict.set('instance_dict', k, v)
+      value = StringIO.StringIO()
+      config_instance_dict.write(value)
+      CONFIG['instance_dict'] = value.getvalue()
+
+    vcs_repository_list = json.loads(self.options['repository-list'])
+    config_repository_list = ConfigParser.ConfigParser()
     i = 0
-    for repository in eval(self.parameter_dict['vcs_repository_list']):
-      CONFIG['repository_list'] += '[vcs_repository_%s]\n' % i
-      CONFIG['repository_list'] += 'url = %s\n' % repository['url']
+    for repository in vcs_repository_list:
+      section_name = 'vcs_repository_%d' % i
+      config_repository_list.add_section(section_name)
+      config_repository_list.set(section_name, 'url', repository['url'])
       if 'branch' in repository:
-        CONFIG['repository_list'] += 'branch = %s\n' % repository['branch']
+        config_repository_list.set(section_name, 'branch', repository['branch'])
       if 'profile_path' in repository:
-        CONFIG['repository_list'] += 'profile_path = %s\n' % repository[
-          'profile_path']
+        config_repository_list.set(section_name, 'profile_path',
+                                   repository['profile_path'])
       if 'buildout_section_id' in repository:
-        CONFIG['repository_list'] += 'buildout_section_id = %s\n' % repository[
-          'buildout_section_id']
-      CONFIG['repository_list'] += '\n'
+        config_repository_list.set(section_name, 'buildout_section_id',
+                                   repository['buildout_section_id'])
       i += 1
-    testnode_config = self.createConfigurationFile('erp5testnode.cfg',
-        self.substituteTemplate(pkg_resources.resource_filename(__name__,
-          'template/erp5testnode.cfg.in'), CONFIG))
-    testnode_log = os.path.join(self.log_directory, 'erp5testnode.log')
-    wrapper = zc.buildout.easy_install.scripts([('erp5testnode',
-     'slapos.recipe.librecipe.execute', 'executee')], self.ws, sys.executable,
-      self.wrapper_directory, arguments=[[self.options['testnode'], '-l',
-      testnode_log, testnode_config], {'GIT_SSL_NO_VERIFY': '1'}])[0]
-    path_list.append(testnode_config)
-    path_list.append(wrapper)
+    value = StringIO.StringIO()
+    config_repository_list.write(value)
+    CONFIG['repository_list'] = value.getvalue()
+
+    configuration_file = self.createFile(
+      self.options['configuration-file'],
+      self.substituteTemplate(
+        self.getTemplateFilename('erp5testnode.cfg.in'),
+        CONFIG
+      ),
+    )
+    path_list.append(configuration_file)
+    path_list.append(
+      self.createPythonScript(
+        self.options['wrapper'],
+        'slapos.recipe.librecipe.execute.executee',
+        [ # Executable
+          [ self.options['testnode'], '-l', self.options['log-file'],
+            configuration_file],
+          # Environment
+          {
+            'GIT_SSL_NO_VERIFY': '1',
+          }
+        ],
+      )
+    )
     return path_list

slapos/recipe/librecipe/__init__.py

@@ -39,6 +39,7 @@ import urlparse
 # Use to do from slapos.recipe.librecipe import GenericBaseRecipe
 from generic import GenericBaseRecipe
 from genericslap import GenericSlapRecipe
+from filehash import filehash
 
 class BaseSlapRecipe:
   """Base class for all slap.recipe.*"""

slapos/recipe/librecipe/execute.py

@@ -4,6 +4,46 @@ import signal
 import subprocess
 import time
 
+import inotifyx
+
+def _wait_files_creation(file_list):
+  # Etablish a list of directory and subfiles
+  directories = dict()
+  for dirname, filename in [os.path.split(f) for f in file_list]:
+    directories.setdefault(dirname, dict())
+    directories[dirname][filename] = False
+
+  def all_files_exists():
+    return all([all(files.values()) for files in directories.values()])
+
+  fd = inotifyx.init()
+  try:
+    # Watch every directories where the file are
+    watchdescriptors = dict()
+    for dirname in directories.keys():
+      wd = inotifyx.add_watch(fd,
+                              dirname,
+                              inotifyx.IN_CREATE | inotifyx.IN_DELETE)
+      watchdescriptors[wd] = dirname
+
+    # Set to True the file wich exists
+    for dirname, filename in [os.path.split(f) for f in file_list]:
+      directories[dirname][filename] = os.path.exists(os.path.join(dirname,
+                                                                   filename))
+    # Let's wait for every file creation
+    while not all_files_exists():
+      events_list = inotifyx.get_events(fd)
+      for event in events_list:
+        dirname = watchdescriptors[event.wd]
+        if event.name in directories[dirname]:
+          # One of watched file was created or deleted
+          if event.mask & inotifyx.IN_DELETE:
+            directories[dirname][event.name] = False
+          else:
+            directories[dirname][event.name] = True
+
+  finally:
+    os.close(fd)
 
 def execute(args):
   """Portable execution with process replacement"""
@@ -14,18 +54,7 @@ def execute_wait(args):
   """Execution but after all files in args[1] exists"""
   exec_list = list(args[0])
   file_list = list(args[1])
-  sleep = 60
-  while True:
-    ready = True
-    for f in file_list:
-      if not os.path.exists(f):
-        print 'File %r does not exists, sleeping for %s' % (f, sleep)
-        ready = False
-    if ready:
-      break
-    # XXX: It's the same as ../ca/certificate_authoritiy.py
-    #      We should use pyinotify as well. Or select() on socket.
-    time.sleep(sleep)
+  _wait_files_creation(file_list)
   os.execv(exec_list[0], exec_list + sys.argv[1:])
 
 
@@ -49,16 +78,7 @@ def executee_wait(args):
   env = os.environ.copy()
   for k,v in environment.iteritems():
     env[k] = v
-  sleep = 60
-  while True:
-    ready = True
-    for f in file_list:
-      if not os.path.exists(f):
-        print 'File %r does not exists, sleeping for %s' % (f, sleep)
-        ready = False
-    if ready:
-      break
-    time.sleep(sleep)
+  _wait_files_creation(file_list)
   os.execve(exec_list[0], exec_list + sys.argv[1:], env)
 
 def sig_handler(signal, frame):

slapos/recipe/librecipe/filehash.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 hashlib
+import shutil
+import os
+
+DEFAULT_HASH = 'sha512'
+
+class Hash(object):
+
+  def __init__(self, name):
+    self._hash = hashlib.new(name)
+
+  def write(self, data):
+    self._hash.update(data)
+
+  def read(self):
+    return self._hash.hexdigest()
+
+def filehash(filename, type_=DEFAULT_HASH):
+  if not os.path.isfile(filename):
+    raise ValueError("%r isn't a file" % filename)
+
+  digest = Hash(type_)
+  with open(filename, 'r') as file_:
+    shutil.copyfileobj(file_, digest)
+  return digest.read()
+
+# Home made hashdeep <http://md5deep.sourceforge.net/>
+def dirhash(dirname, type_=DEFAULT_HASH):
+  """Walk into a directory an return a unique hash for
+  the directory structure and its files content."""
+
+  if not os.path.isdir(dirname):
+    raise ValueError("%r isn't a directory" % dirname)
+
+  digest = Hash(type_)
+
+  # List the directory structure
+  path_list = []
+  for dirname, dirlist, filelist in os.walk(dirname, followlinks=False):
+    for filename in filelist:
+      path_list.append(os.path.join(dirname, filename))
+  path_list.sort()
+
+  for path in path_list:
+    # Change the hash even if the file or the directory is empty
+    digest.write(path)
+
+    # Update the hash with file content
+    if os.path.isfile(path):
+      with open(path, 'r') as file_:
+        shutil.copyfileobj(file_, digest)
+
+  return digest.read()
+
+def pathhash(path, type_=DEFAULT_HASH):
+  if os.path.isdir(path):
+    return dirhash(path, type_)
+  elif os.path.isfile(path):
+    return filehash(path, type_)
+  raise ValueError("%r isn't a directory nor a file" % path)
+
+# you can use python -m slapos.recipe.librecipe.filehash [hash] path
+if __name__ == '__main__':
+  import sys
+  if len(sys.argv) == 1:
+    raise ValueError("Not enough command line arguments")
+  if len(sys.argv) == 2:
+    print sys.argv[1], '-', pathhash(sys.argv[1])
+  else:
+    print sys.argv[2], '-', pathhash(sys.argv[2], sys.argv[1])

slapos/recipe/librecipe/generic.py

@@ -28,6 +28,9 @@ import logging
 import os
 import sys
 import inspect
+import re
+import urllib
+import urlparse
 
 import pkg_resources
 import zc.buildout
@@ -39,11 +42,12 @@ class GenericBaseRecipe(object):
   def __init__(self, buildout, name, options):
     """Recipe initialisation"""
     self.name = name
-    self.options = options
     self.buildout = buildout
     self.logger = logging.getLogger(name)
 
+    self.options = options.copy() # If _options use self.optionIsTrue
     self._options(options) # Options Hook
+    self.options = options.copy() # Updated options dict
 
     self._ws = self.getWorkingSet()
 
@@ -98,9 +102,17 @@ class GenericBaseRecipe(object):
       path, arguments=arguments)[0]
     return script
 
+  def createDirectory(self, parent, name, mode=0700):
+    path = os.path.join(parent, name)
+    if not os.path.exists(path):
+      os.mkdir(path, mode)
+    elif not os.path.isdir(path):
+      raise OSError("%r exists but is not a directory." % name)
+    return path
+
   def substituteTemplate(self, template_location, mapping_dict):
     """Read from file template_location an substitute content with
-       mapping_dict douing a dummy python format."""
+       mapping_dict doing a dummy python format."""
     with open(template_location, 'r') as template:
       return template.read() % mapping_dict
 
@@ -123,3 +135,35 @@ class GenericBaseRecipe(object):
     if default is not None and optionname not in self.options:
       return default
     return self.isTrueValue(self.options[optionname])
+
+  def unparseUrl(self, scheme, host, path='', params='', query='',
+                 fragment='', port=None, auth=None):
+    """Join a url with auth, host, and port.
+
+    * auth can be either a login string or a tuple (login, password).
+    * if the host is an ipv6 address, brackets will be added to surround it.
+
+    """
+    # XXX-Antoine: I didn't find any standard module to join an url with
+    # login, password, ipv6 host and port.
+    # So instead of copy and past in every recipe I factorized it right here.
+    netloc = ''
+    if auth is not None:
+      auth = tuple(auth)
+      netloc = urllib.quote(str(auth[0])) # Login
+      if len(auth) > 1:
+        netloc += ':%s' % urllib.quote(auth[1]) # Password
+      netloc += '@'
+
+    # host is an ipv6 address whithout brackets
+    if ':' in host and not re.match(r'^\[.*\]$', host):
+      netloc += '[%s]' % host
+    else:
+      netloc += str(host)
+
+    if port is not None:
+      netloc += ':%s' % port
+
+    url = urlparse.urlunparse((scheme, netloc, path, params, query, fragment))
+
+    return url

slapos/recipe/librecipe/genericslap.py

@@ -26,8 +26,6 @@
 ##############################################################################
 from slapos import slap
 import time
-import re
-import urlparse
 
 from generic import GenericBaseRecipe
 
@@ -36,7 +34,6 @@ class GenericSlapRecipe(GenericBaseRecipe):
 
   def __init__(self, buildout, name, options):
     """Default initialisation"""
-    options['eggs'] = 'slapos.cookbook'
     GenericBaseRecipe.__init__(self, buildout, name, options)
     self.slap = slap.slap()
 
@@ -49,15 +46,6 @@ class GenericSlapRecipe(GenericBaseRecipe):
     self.key_file = slap_connection.get('key-file')
     self.cert_file = slap_connection.get('cert-file')
 
-    # setup auto uninstall/install
-    self._setupAutoInstallUninstall()
-
-  def _setupAutoInstallUninstall(self):
-    """By default SlapOS recipes are reinstalled each time"""
-    # Note: It is possible to create in future subclass which will do no-op in
-    # this method
-    self.options['slapos-timestamp'] = str(time.time())
-
   def install(self):
     self.slap.initializeConnection(self.server_url, self.key_file,
         self.cert_file)
@@ -80,37 +68,5 @@ class GenericSlapRecipe(GenericBaseRecipe):
     raise NotImplementedError('Shall be implemented by subclass')
 
   def setConnectionUrl(self, *args, **kwargs):
-    url = self._unparseUrl(*args, **kwargs)
+    url = self.unparseUrl(*args, **kwargs)
     self.setConnectionDict(dict(url=url))
-
-  def _unparseUrl(self, scheme, host, path='', params='', query='',
-                  fragment='', port=None, auth=None):
-    """Join a url with auth, host, and port.
-
-    * auth can be either a login string or a tuple (login, password).
-    * if the host is an ipv6 address, brackets will be added to surround it.
-
-    """
-    # XXX-Antoine: I didn't find any standard module to join an url with
-    # login, password, ipv6 host and port.
-    # So instead of copy and past in every recipe I factorized it right here.
-    netloc = ''
-    if auth is not None:
-      auth = tuple(auth)
-      netloc = str(auth[0]) # Login
-      if len(auth) > 1:
-        netloc += ':%s' % auth[1] # Password
-      netloc += '@'
-
-    # host is an ipv6 address whithout brackets
-    if ':' in host and not re.match(r'^\[.*\]$', host):
-      netloc += '[%s]' % host
-    else:
-      netloc += str(host)
-
-    if port is not None:
-      netloc += ':%s' % port
-
-    url = urlparse.urlunparse((scheme, netloc, path, params, query, fragment))
-
-    return url

slapos/recipe/librecipe/inotify.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+
+import inotifyx
+
+def subfiles(directory):
+  """Return the list of subfiles of a directory, and wait for the newly created
+  ones.
+
+  CAUTION : *DONT TRY TO CONVERT THE RESULT OF THIS FUNCTION INTO A LIST !
+  ALWAYS ITERATE OVER IT !!!*"""
+  watchfd = inotifyx.init()
+  inotifyx.add_watch(watchfd, directory, inotifyx.IN_CREATE)
+  try:
+
+    subfiles = set(os.listdir(directory))
+    subfiles |= set([file_.name for file_ in inotifyx.get_events(watchfd, 0)])
+
+    while True:
+      for file_ in subfiles:
+        yield os.path.join(directory, file_)
+
+      subfiles = [file_.name for file_ in inotifyx.get_events(watchfd)]
+
+  finally:
+    os.close(watchfd)

slapos/recipe/lockfile.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+import sys
+import subprocess
+
+import inotifyx
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class LockFile(object):
+
+  class LockException(Exception):
+    pass
+
+  def __init__(self, filename, wait=True, exit=False):
+    self.filename = filename
+    if wait:
+      self.callback = lambda: self.waitDeletion()
+    elif not exit:
+      self.callback = lambda: self.raiseException()
+    else:
+      self.callback = lambda: sys.exit(1)
+
+  def raiseException(self):
+    raise LockFile.LockException("Not able to lock the file")
+
+  def waitDeletion(self):
+    inotify_fd = inotifyx.init()
+    try:
+      inotifyx.add_watch(inotify_fd, self.filename, inotifyx.IN_DELETE)
+      inotifyx.get_events(inotify_fd)
+    except IOError: # add_watch failed
+      pass
+    finally:
+      os.close(inotify_fd)
+
+    self.__enter__()
+
+  def __enter__(self):
+    try:
+      # Atomic file acquisition
+      self._fd = os.open(self.filename, os.O_CREAT | os.O_EXCL)
+    except OSError:
+      self.callback()
+
+  def __exit__(self, exc_type, exc_value, traceback):
+    os.close(self._fd)
+    os.unlink(self.filename)
+
+def locked_run(args):
+  with LockFile(args['filename'], wait=args['wait'], exit=True):
+    subprocess.check_call([args['binary']])
+
+class Recipe(GenericBaseRecipe):
+
+  def install(self):
+    wrapper = self.createPythonScript(self.options['wrapper'],
+                                      __name__ + '.locked_run',
+                                      dict(
+                                        filename=self.options['lock-file'],
+                                        wait=self.optionIsTrue('wait', False),
+                                        binary=self.options['binary'],
+                                      )
+                                     )
+    return [wrapper]

slapos/recipe/mydumper.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 subprocess
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+def dump(args):
+  mydumper_cmd = [args['mydumper']]
+  mydumper_cmd.extend(['-B', args['database']])
+
+  if args['socket'] is not None:
+    mydumper_cmd.extend(['-S', args['socket']])
+  else:
+    mydumper_cmd.extend(['-h', args['host']])
+    mydumper_cmd.etxned(['-P', args['port']])
+
+  mydumper_cmd.extend(['-u', args['user']])
+  if args['password'] is not None:
+    mydumper_cmd.extend(['-p', args['password']])
+
+  if args['compression']:
+    mydumper_cmd.append('--compress')
+
+  if args['rows'] is not None:
+    mydumper_cmd.extend(['-r', args['rows']])
+
+  mydumper_cmd.extend(['-o', args['directory']])
+
+  subprocess.check_call(mydumper_cmd)
+
+
+
+def do_import(args):
+  mydumper_cmd = [args['mydumper']]
+  mydumper_cmd.extend(['-B', args['database']])
+
+  if args['socket'] is not None:
+    mydumper_cmd.extend(['-S', args['socket']])
+  else:
+    mydumper_cmd.extend(['-h', args['host']])
+    mydumper_cmd.etxned(['-P', args['port']])
+
+  mydumper_cmd.extend(['-u', args['user']])
+  if args['password'] is not None:
+    mydumper_cmd.extend(['-p', args['password']])
+
+  mydumper_cmd.append('--overwrite-tables')
+
+  mydumper_cmd.extend(['-d', args['directory']])
+
+  subprocess.check_call(mydumper_cmd)
+
+
+
+class Recipe(GenericBaseRecipe):
+
+  def install(self):
+    # Host or socket should be defined
+    try:
+      self.options['host']
+    except:
+      self.options['socket']
+
+    config = dict(database=self.options['database'],
+                  socket=self.options.get('socket'),
+                  host=self.options.get('host'),
+                  port=self.options.get('port', 3306),
+                  directory=self.options['backup-directory'],
+                  user=self.options['user'],
+                  password=self.options.get('password'),
+                 )
+
+    name = __name__
+    if self.optionIsTrue('import', False):
+      config.update(mydumper=self.options['myloader-binary'])
+      name += '.do_import'
+    else:
+      config.update(mydumper=self.options['mydumper-binary'],
+                    compression=self.optionIsTrue('compression', default=False),
+                    rows=self.options.get('rows'),
+                   )
+      name += '.dump'
+
+    wrapper = self.createPythonScript(self.options['wrapper'],
+                                      name,
+                                      config)
+
+    return [wrapper]

slapos/recipe/mysql/__init__.py

@@ -24,8 +24,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.recipe.librecipe import GenericBaseRecipe
 import os
+import sys
+import subprocess
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+from slapos.recipe.librecipe import filehash
 
 class Recipe(GenericBaseRecipe):
 
@@ -44,7 +48,6 @@ class Recipe(GenericBaseRecipe):
         pid_file=self.options['pid-file'],
         socket=self.options['socket'],
         error_log=self.options['error-log'],
-        slow_query_log=self.options['slow-query-log'],
         mysql_database=self.options['database'],
         mysql_user=self.options['user'],
         mysql_password=self.options['password'],
@@ -109,36 +112,24 @@ class Recipe(GenericBaseRecipe):
     path_list.append(mysqld)
 
     # backup configuration
-    mysqldump_binary = self.options['mysqldump-binary']
-    backup_directory = self.options['backup-directory']
-    pending_backup_dir = self.options['backup-pending-directory']
-    dump_filename = self.options['dumpname']
-
-    mysqldump_cmd = [mysqldump_binary,
-                     mysql_conf['mysql_database'],
-                     '-u', 'root',
-                     '-S', mysql_conf['socket'].strip(),
-                     '--single-transaction', '--opt',
-                    ]
-    dump_file = os.path.join(backup_directory, dump_filename)
-    tmpdump_file = os.path.join(pending_backup_dir, dump_filename)
-    backup_script = self.createPythonScript(
-      self.options['backup-script'],
-      '%s.backup.do_backup' % __name__,
-      {
-        'mysqldump': mysqldump_cmd,
-        'gzip': self.options['gzip-binary'],
-        'tmpdump': tmpdump_file,
-        'dumpfile': dump_file,
-      },
-    )
-    path_list.append(backup_script)
+    if self.optionIsTrue('backup', default=False):
+      backup_script = self.createPythonScript(
+        self.options['backup-script'],
+        '%s.do_backup' % __name__,
+        dict(
+          mydumper_binary=self.options['mydumper-binary'],
+          database=mysql_conf['mysql_database'],
+          socket=mysql_conf['socket'],
+          backup_directory=self.options['backup-directory']
+        ),
+      )
+      path_list.append(backup_script)
 
     # Recovering backup
     if self.optionIsTrue('recovering', default=False):
       recovering_script = self.createPythonScript(
         self.options['recovering-wrapper'],
-        '%s.recover.import_remote_dump' % __name__,
+        '%s.import_dump' % __name__,
         {
           'lock_file': os.path.join(self.work_directory,
                                     'import_done'),
@@ -156,3 +147,47 @@ class Recipe(GenericBaseRecipe):
 
 
     return path_list
+
+# Replace zcat dump.sql.gz | mysql
+def import_dump(args):
+  # Get data from kwargs
+  cache_file = args['cache_file']
+  database = args['database']
+  mysql_binary = args['mysql_binary']
+  mysql_socket = args['mysql_socket']
+  dump_file = args['dump_file']
+  zcat_binary = args['zcat_binary']
+
+  sha512sum = filehash(dump_file)
+  with open(cache_file, 'r') as cache_fileobj:
+    last_sha512sum = cache_fileobj.read().strip()
+
+  if sha512sum != last_sha512sum:
+    zcat = subprocess.Popen([zcat_binary, dump_file], stdout=subprocess.PIPE)
+    mysql = subprocess.Popen([mysql_binary, '--socket=%s' % mysql_socket, '-D',
+                              database, '-u', 'root'], stdin=zcat.stdout)
+    zcat.stdout.close()
+
+    returncode = mysql.wait()
+
+    if returncode == 0:
+      with open(cache_file, 'w') as cache_fileobj:
+        cache_fileobj.write(sha512sum)
+
+    sys.exit(returncode)
+
+def promise(args):
+  # This is not a dependency of slapos.cookbook, because it shall be runned
+  # in a python environment having mysql-python
+  import MySQLdb
+
+  user = args['user']
+  password = args['password']
+  db = args['db']
+  host = args['host']
+  port = args['port']
+
+  db = MySQLdb.connect(host=host, port=port, user=user, passwd=password,
+                       db=db)
+  cursor = db.cursor()
+  cursor.close()

slapos/recipe/mysql/backup.py

 import subprocess
 import os
 
-# Replace mysqldump | gzip > tmpdump && mv -f tmpdump dumpfile
-def do_backup(kwargs):
-  mysqldump_cmd = kwargs['mysqldump']
-  gzip_bin = kwargs['gzip']
-  tmpdump = kwargs['tmpdump']
-  dumpfile = kwargs['dumpfile']
-
-  # mysqldump | gzip > tmpdump
-  with open(tmpdump, 'w') as output:
-    mysqldump = subprocess.Popen(mysqldump_cmd,
-                                 stdout=subprocess.PIPE,
-                                 stderr=subprocess.STDOUT)
-    gzip = subprocess.Popen([gzip_bin],
-                            stdin=mysqldump.stdout,
-                            stdout=output,
-                            stderr=subprocess.STDOUT)
-    mysqldump.stdout.close()
-
-    if gzip.wait() != 0:
-      raise ValueError("Gzip return a non zero value.")
-
-  os.rename(tmpdump, dumpfile)

slapos/recipe/mysql/catdatefile.py

-import os
-import sys
-import time
-def catdatefile(args):
-  directory = args[0]
-  try:
-    suffix = args[1]
-  except IndexError:
-    suffix = '.log'
-  f = open(os.path.join(directory,
-    time.strftime('%Y-%m-%d.%H:%M.%s') + suffix), 'aw')
-  for line in sys.stdin.read():
-    f.write(line)
-  f.close()

slapos/recipe/mysql/recover.py

-import sys
-import os
-import time
-import subprocess
-
-def import_remote_dump(kwargs):
-  # Get data from kwargs
-  lock_file = kwargs['lock_file']
-  database = kwargs['database']
-  mysql_binary = kwargs['mysql_binary']
-  mysql_socket = kwargs['mysql_socket']
-  duplicity_binary = kwargs['duplicity_binary']
-  remote_backup = kwargs['remote_backup']
-  local_directory = kwargs['local_directory']
-  dump_name = kwargs['dump_name']
-  zcat_binary = kwargs['zcat_binary']
-
-  # The script start really here
-  if os.path.exists(lock_file):
-    sys.exit(127)
-
-  while subprocess.call([mysql_binary, '--socket=%s' % mysql_socket,
-                         '-u', 'root', '-e', 'use %s;' % database]) != 0:
-    time.sleep(10)
-
-  subprocess.check_call([duplicity_binary, 'restore', '--no-encryption',
-                         remote_backup, local_directory])
-
-  zcat = subprocess.Popen([zcat_binary, os.path.join(local_directory,
-                                                     dump_name)],
-                          stdout=subprocess.PIPE)
-  mysql = subprocess.Popen([mysql_binary, '--socket=%s' % mysql_socket,
-                            '-D', database, '-u', 'root'],
-                           stdin=zcat.stdout)
-  zcat.stdout.close()
-
-  returncode = mysql.poll()
-
-  if returncode == 0:
-    open(lock_file, 'w').close() # Just a touch
-
-  sys.exit(returncode)

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

@@ -15,8 +15,6 @@ socket = %(socket)s
 datadir = %(data_directory)s
 pid-file = %(pid_file)s
 log-error = %(error_log)s
-slow_query_log
-slow_query_log_file = %(slow_query_log)s
 long_query_time = 5
 max_allowed_packet = 128M
 query_cache_size = 32M

slapos/recipe/notifier.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+from hashlib import sha512
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+  def install(self):
+    commandline = [self.options['server-binary']]
+    commandline.extend(['--callbacks', self.options['callbacks']])
+    commandline.extend(['--feeds', self.options['feeds']])
+    commandline.extend(['--equeue-socket', self.options['equeue-socket']])
+    commandline.append(self.options['host'])
+    commandline.append(self.options['port'])
+
+    return [self.createPythonScript(self.options['wrapper'],
+                                    'slapos.recipe.librecipe.execute.execute',
+                                    commandline)]
+
+class Callback(GenericBaseRecipe):
+
+  def createCallback(self, notification_id, callback):
+    callback_id = sha512(notification_id).hexdigest()
+    callback = self.createFile(os.path.join(self.options['callbacks'],
+                                            callback_id),
+                               callback)
+    return callback
+
+  def install(self):
+    return [self.createCallback(self.options['on-notification-id'],
+                                self.options['callback'])]
+
+class Notify(GenericBaseRecipe):
+
+  def createNotifier(self, notifier_binary, executable, wrapper, **kwargs):
+    if not os.path.exists(kwargs['log']):
+      # Just a touch
+      open(kwargs['log'], 'w').close()
+
+    commandline = [notifier_binary,
+                   '-l', kwargs['log'],
+                   '--title', kwargs['title'],
+                   '--feed', kwargs['feed_url'],
+                   '--notification-url', kwargs['notification_url'],
+                   executable]
+    return self.createPythonScript(wrapper,
+                                   'slapos.recipe.librecipe.execute.execute',
+                                   [str(i) for i in commandline])
+
+  def install(self):
+    feedurl = self.unparseUrl(scheme='http', host=self.options['host'],
+                              port=self.options['port'],
+                              path='/get/%s' % self.options['name'])
+
+    script = self.createNotifier(
+      self.options['notifier-binary'],
+      wrapper=self.options['wrapper'],
+      executable=self.options['executable'],
+      log=os.path.join(self.options['feeds'], self.options['name']),
+      title=self.options['title'],
+      notification_url=self.options['notify'],
+      feed_url=feedurl,
+    )
+    return [script]

slapos/recipe/pbs.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 json import loads as unjson
+from hashlib import sha512
+from urlparse import urlparse
+import os
+import subprocess
+import sys
+import signal
+import inspect
+
+from slapos.recipe.librecipe import GenericSlapRecipe
+from slapos.recipe.dropbear import KnownHostsFile
+from slapos.recipe.notifier import Notify
+from slapos.recipe.notifier import Callback
+from slapos import slap as slapmodule
+
+
+def promise(args):
+
+  def failed_ssh(partition, ssh):
+    # Bad python 2 syntax, looking forward python 3 to have print(file=)
+    print >> sys.stderr, "SSH Connection failed"
+    try:
+      ssh.terminate()
+    except:
+      pass
+    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)
+
+  signal.signal(signal.SIGTERM, sigterm_handler)
+
+  slap = slapmodule.slap()
+  slap.initializeConnection(args['server_url'],
+    key_file=args.get('key_file'), cert_file=args.get('cert_file'))
+  partition = slap.registerComputerPartition(args['computer_id'],
+                                             args['partition_id'])
+
+  # Rdiff Backup protocol quit command
+  quitcommand = 'q' + chr(255) + chr(0) * 7
+  ssh_cmdline = [args['ssh_client'], '%(user)s@%(host)s/%(port)s' % args]
+
+  ssh = subprocess.Popen(ssh_cmdline, stdin=subprocess.PIPE,
+                         stdout=open(os.devnull), stderr=open(os.devnull))
+  ssh.stdin.write(quitcommand)
+  ssh.stdin.flush()
+  ssh.stdin.close()
+  ssh.wait()
+
+  if ssh.poll() is None:
+    return 1
+  if ssh.returncode != 0:
+    failed_ssh(partition, ssh)
+  return ssh.returncode
+
+
+
+class Recipe(GenericSlapRecipe, Notify, Callback):
+
+  def add_slave(self, entry, known_hosts_file):
+    path_list = []
+
+    url = entry.get('url')
+    if url is None:
+      url = ''
+
+    # We assume that thanks to sha512 there's no collisions
+    url_hash = sha512(url).hexdigest()
+    name_hash = sha512(entry['name']).hexdigest()
+
+    promise_path = os.path.join(self.options['promises-directory'],
+                                url_hash)
+    parsed_url = urlparse(url)
+    promise_dict = self.promise_base_dict.copy()
+    promise_dict.update(user=parsed_url.username,
+                        host=parsed_url.hostname,
+                        port=parsed_url.port)
+    promise = self.createPythonScript(promise_path,
+                                      __name__ + '.promise',
+                                      promise_dict)
+    path_list.append(promise)
+
+
+    host = parsed_url.hostname
+    known_hosts_file[host] = entry['server-key']
+
+    remote_schema = '%(ssh)s -p %%s %(user)s@%(host)s' % \
+      {
+        'ssh': self.options['sshclient-binary'],
+        'user': parsed_url.username,
+        'host': parsed_url.hostname,
+      }
+
+    command = [self.options['rdiffbackup-binary']]
+    command.extend(['--remote-schema', remote_schema])
+
+    remote_directory = '%(port)s::%(path)s' % {'port': parsed_url.port,
+                                               'path': parsed_url.path}
+
+    local_directory = self.createDirectory(self.options['directory'],
+                                           name_hash)
+
+    if entry['type'] == 'push':
+      command.extend(['--restore-as-of', 'now'])
+      command.append('--force')
+      command.extend([local_directory, remote_directory])
+    else:
+      command.extend([remote_directory, local_directory])
+
+    wrapper_basepath = os.path.join(self.options['wrappers-directory'],
+                                    url_hash)
+
+    wrapper_path = wrapper_basepath
+    if 'notify' in entry:
+      wrapper_path = '%s_raw' % wrapper_basepath
+
+    wrapper = self.createPythonScript(
+       wrapper_path,
+      'slapos.recipe.librecipe.execute.execute',
+      [str(i) for i in command]
+    )
+    path_list.append(wrapper)
+
+    if 'notify' in entry:
+      feed_url = '%s/get/%s' % (self.options['notifier-url'],
+                                entry['notification-id'])
+      wrapper = self.createNotifier(
+        self.options['notifier-binary'],
+        wrapper=wrapper_basepath,
+        executable=wrapper_path,
+        log=os.path.join(self.options['feeds'], entry['notification-id']),
+        title=entry.get('title', 'Untitled'),
+        notification_url=entry['notify'],
+        feed_url=feed_url,
+      )
+      path_list.append(wrapper)
+      #self.setConnectionDict(dict(feed_url=feed_url), entry['slave_reference'])
+
+    if 'on-notification' in entry:
+      path_list.append(self.createCallback(str(entry['on-notification']),
+                                           wrapper))
+    else:
+      cron_entry = os.path.join(self.options['cron-entries'], url_hash)
+      with open(cron_entry, 'w') as cron_entry_file:
+        cron_entry_file.write('%s %s' % (entry['frequency'], wrapper))
+      path_list.append(cron_entry)
+
+    return path_list
+
+  def _install(self):
+    path_list = []
+
+
+    if self.optionIsTrue('client', True):
+      self.logger.info("Client mode")
+
+      slap_connection = self.buildout['slap-connection']
+      self.promise_base_dict = dict(
+        server_url=slap_connection['server-url'],
+        computer_id=slap_connection['computer-id'],
+        cert_file=slap_connection.get('cert-file'),
+        key_file=slap_connection.get('key-file'),
+        partition_id=slap_connection['partition-id'],
+        ssh_client=self.options['sshclient-binary'],
+      )
+
+      slaves = unjson(self.options['slave-instance-list'])
+      known_hosts = KnownHostsFile(self.options['known-hosts'])
+      with known_hosts:
+        for slave in slaves:
+          path_list.extend(self.add_slave(slave, known_hosts))
+
+    else:
+      command = [self.options['rdiffbackup-binary']]
+      self.logger.info("Server mode")
+      command.extend(['--restrict', self.options['path']])
+      command.append('--server')
+
+      wrapper = self.createPythonScript(
+        self.options['wrapper'],
+        'slapos.recipe.librecipe.execute.execute',
+        command)
+      path_list.append(wrapper)
+
+    return path_list

slapos/recipe/publish.py

@@ -31,8 +31,10 @@ from slapos.recipe.librecipe import GenericSlapRecipe
 class Recipe(GenericSlapRecipe):
   def _install(self):
     publish_dict = dict()
-    for k, v in self.options.iteritems():
-      if k.startswith('url'):
-        publish_dict[k] = v
+    options = self.options.copy()
+    del options['recipe']
+
+    for k, v in options.iteritems():
+      publish_dict[k] = v
     self.setConnectionDict(publish_dict)
     return []

slapos/recipe/publishurl.py

@@ -56,10 +56,10 @@ class Recipe(GenericSlapRecipe):
         if option in self.options:
           self.urlparts[option] = self.options[option]
 
-      if 'user' in self.options:
-        self.urlparts.update(auth=(self.options['user'],))
+      if 'username' in self.options:
+        self.urlparts.update(auth=(self.options['username'],))
         if 'password' in self.options:
-          self.urlparts.update(auth=(self.options['user'],
+          self.urlparts.update(auth=(self.options['username'],
                                      self.options['password']))
 
       self.setConnectionUrl(**self.urlparts)

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):

slapos/recipe/pwgen.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 subprocess
+import os
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+  def _options(self, options):
+    if not os.path.exists(self.options['file']):
+      password = subprocess.check_output([self.options['pwgen-binary'], '-1']).strip()
+      with open(self.options['file'], 'w') as password_file:
+        password_file.write(password)
+    else:
+      with open(self.options['file'], 'r') as password_file:
+        password = password_file.read()
+    options['password'] = password
+
+  def install(self):
+    return []

slapos/recipe/request.py

@@ -45,8 +45,9 @@ class Recipe(object):
       options['computer-id'], options['partition-id'])
     self.request = computer_partition.request
 
-    if 'name' not in options:
-      options['name'] = name
+    self.isSlave = False
+    if 'slave' in options:
+      self.isSlave = options['slave'].lower() in ['y', 'yes', 'true', '1']
 
     self.return_parameters = []
     if 'return' in options:
@@ -72,8 +73,8 @@ class Recipe(object):
             options['config-%s' % config_parameter]
 
     instance = self.request(options['software-url'], software_type,
-      options['name'], partition_parameter_kw=partition_parameter_kw,
-        filter_kw=filter_kw)
+      options.get('name', name), partition_parameter_kw=partition_parameter_kw,
+      filter_kw=filter_kw, shared=self.isSlave)
 
     self.failed = None
     for param in self.return_parameters:

slapos/recipe/seleniumrunner/ERP5TypeFunctionalTestCase.py

+##############################################################################
+#
+# Copyright (c) 2011 Nexedi SARL and Contributors. All Rights Reserved.
+#                     Kazuhiko <kazuhiko@nexedi.com>
+#                     Rafael Monnerat <rafael@nexedi.com>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability 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
+# garantees 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 2
+# 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.
+#
+##############################################################################
+
+# XXX-Cedric : This is an import of 
+# http://git.erp5.org/gitweb/erp5.git/blob/HEAD:/product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
+# Modification of the present file should be ported back to this original file.
+import os
+import time
+import signal
+import re
+from subprocess import Popen, PIPE
+import shutil
+
+#from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase, \
+#                                               _getConversionServerDict
+
+# 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)
+
+TEST_ERROR_RESULT_RE = re.compile('.*(?:error.gif|title status_failed).*', re.S)
+
+ZELENIUM_BASE_URL = "%s/portal_tests/%s/core/TestRunner.html?test=../test_suite_html&auto=on&resultsUrl=%s/portal_tests/postResults&__ac_name=%s&__ac_password=%s"
+
+tests_framework_home = os.path.dirname(os.path.abspath(__file__))
+# handle 'system global' instance
+if tests_framework_home.startswith('/usr/lib'):
+  real_instance_home = '/var/lib/erp5'
+else:
+  real_instance_home = os.path.sep.join(
+    tests_framework_home.split(os.path.sep)[:-3])
+
+instance_home = os.path.join(real_instance_home, 'unit_test')
+bt5_dir_list = ','.join([
+                    os.path.join(instance_home, 'Products/ERP5/bootstrap'),
+                    os.path.join(instance_home, 'bt5')])
+
+class TimeoutError(Exception):
+  pass
+
+class Xvfb:
+  def __init__(self, fbdir, xvfb_location="Xvfb"):
+    self.display_list = [":%s" % i for i in range(123, 144)]
+    self.display = None
+    self.fbdir = fbdir
+    self.pid = None
+    self.xvfb_location = xvfb_location
+
+  def _runCommand(self, display):
+    command = [self.xvfb_location, '-fbdir' , self.fbdir, display]
+    self.process = Popen(" ".join(command),
+                         stdout=PIPE,
+                         stderr=PIPE,
+                         shell=True,
+                         close_fds=True)
+
+  def run(self):
+    for display_try in self.display_list:
+      lock_filepath = '/tmp/.X%s-lock' % display_try.replace(":", "")
+      if not os.path.exists(lock_filepath):
+        self._runCommand(display_try)
+        self.display = display_try
+        break
+
+    #display = os.environ.get('DISPLAY')
+    #if display:
+    #  auth = Popen(['xauth', 'list', display], stdout=PIPE).communicate()[0]
+    #  if auth:
+    #    (displayname, protocolname, hexkey) = auth.split()
+    #    Popen(['xauth', 'add', 'localhost/unix:%s' % display, protocolname, hexkey])
+
+    print 'Xvfb : %d' % self.process.pid
+    print 'Take screenshots using xwud -in %s/Xvfb_screen0' % self.fbdir
+
+  def quit(self):
+    if hasattr(self, 'process'):
+      process_pid = self.process.pid
+      try:
+        self.process.terminate()
+      finally:
+        if process_pid:
+          print "Stopping Xvfb on pid: %s" % self.pid
+          os.kill(process_pid, signal.SIGTERM)
+
+class Browser:
+
+  use_xvfb = 1
+  def __init__(self, profile_dir, host, bin_location=None):
+    self.bin_location = bin_location
+    self.profile_dir = profile_dir
+    self.host = host
+    self.pid = None
+
+  def quit(self):
+    if self.pid:
+      os.kill(self.pid, signal.SIGTERM)
+
+  def _run(self, url, display):
+    """ This method should be implemented on a subclass """
+    raise NotImplementedError
+
+  def _setEnviron(self):
+    pass
+
+  def run(self, url, display):
+    self.clean()
+    self._setEnviron()
+    self._setDisplay(display)
+    self._run(url)
+    print "Browser %s running on pid: %s" % (self.__class__.__name__, self.pid)
+
+  def clean(self):
+    """ Clean up removing profile dir and recreating it"""
+    os.system("rm -rf %s" % self.profile_dir)
+    os.mkdir(self.profile_dir)
+
+  def _createFile(self, filename, content):
+    file_path = os.path.join(self.profile_dir, filename)
+    with open(file_path, 'w') as f:
+      f.write(content)
+    return file_path
+
+  def _setDisplay(self, display):
+    if display is None:
+      try:
+        shutil.copy2(os.path.expanduser('~/.Xauthority'), '%s/.Xauthority' % self.profile_dir)
+      except IOError:
+        pass
+    else:
+      os.environ["DISPLAY"] = display
+
+  def _runCommand(self, command_tuple):
+    print " ".join(list(command_tuple))
+    self.pid = os.spawnlp(os.P_NOWAIT, *command_tuple)
+
+class Firefox(Browser):
+  """ Use firefox to open run all the tests"""
+
+  def _setEnviron(self):
+    os.environ['MOZ_NO_REMOTE'] = '1'
+    os.environ['HOME'] = self.profile_dir
+    os.environ['LC_ALL'] = 'C'
+    os.environ["MOZ_CRASHREPORTER_DISABLE"] = "1"
+    os.environ["NO_EM_RESTART"] = "1"
+
+  def _run(self, url):
+    # Prepare to run
+    if not self.bin_location:
+      self.bin_location = "firefox"
+    self._createFile('prefs.js', self.getPrefJs())
+    self._runCommand((self.bin_location, "firefox", "-no-remote",
+                     "-profile", self.profile_dir, url))
+
+    os.environ['MOZ_NO_REMOTE'] = '0'
+
+  def getPrefJs(self):
+    return """
+// Don't ask if we want to switch default browsers
+user_pref("browser.shell.checkDefaultBrowser", false);
+
+// Disable pop-up blocking
+user_pref("browser.allowpopups", true);
+user_pref("dom.disable_open_during_load", false);
+
+// Configure us as the local proxy
+//user_pref("network.proxy.type", 2);
+
+// Disable security warnings
+user_pref("security.warn_submit_insecure", false);
+user_pref("security.warn_submit_insecure.show_once", false);
+user_pref("security.warn_entering_secure", false);
+user_pref("security.warn_entering_secure.show_once", false);
+user_pref("security.warn_entering_weak", false);
+user_pref("security.warn_entering_weak.show_once", false);
+user_pref("security.warn_leaving_secure", false);
+user_pref("security.warn_leaving_secure.show_once", false);
+user_pref("security.warn_viewing_mixed", false);
+user_pref("security.warn_viewing_mixed.show_once", false);
+
+// Disable "do you want to remember this password?"
+user_pref("signon.rememberSignons", false);
+
+// increase the timeout before warning of unresponsive script
+user_pref("dom.max_script_run_time", 120);
+
+// this is required to upload files
+user_pref("capability.principal.codebase.p1.granted", "UniversalFileRead");
+user_pref("signed.applets.codebase_principal_support", true);
+user_pref("capability.principal.codebase.p1.id", "http://%s");
+user_pref("capability.principal.codebase.p1.subjectName", "");""" % \
+    (self.host)
+
+class PhantomJS(Browser):
+  def _createRunJS(self):
+    run_js = """
+var page = new WebPage(),
+    address;
+
+address = phantom.args[0];
+page.open(address, function (status) {
+  if (status !== 'success') {
+    console.log('FAIL to load the address');
+  } else {
+    console.log('SUCCESS load the address');
+  }
+  phantom.exit();
+});
+"""
+    return self._createFile('run.js', run_js)
+
+  def _run(self, url):
+    self._runCommand(("phantomjs", "phantomjs", self._createRunJS(), url))
+
+class FunctionalTestRunner:
+
+  # There is no test that can take more them 24 hours
+  timeout = 2.0 * 60 * 60
+
+  def __init__(self, host, port, portal, run_only='', use_phanthom=False):
+    self.instance_home = os.environ['INSTANCE_HOME']
+
+    # Such informations should be automatically loaded
+    self.user = 'ERP5TypeTestCase'
+    self.password = ''
+    self.run_only = run_only
+    profile_dir = os.path.join(self.instance_home, 'profile')
+    self.portal = portal
+    if use_phanthom:
+      self.browser = PhantomJS(profile_dir, host, int(port))
+    else:
+      self.browser = Firefox(profile_dir, host, int(port))
+
+  def getStatus(self):
+    transaction.commit()
+    return self.portal.portal_tests.TestTool_getResults()
+
+  def _getTestURL(self):
+    return ZELENIUM_BASE_URL % (self.portal.portal_url(), self.run_only,
+                      self.portal.portal_url(), self.user, self.password)
+
+  def test(self, debug=0):
+    xvfb = Xvfb(self.instance_home)
+    try:
+      start = time.time()
+      if not debug and self.browser.use_xvfb:
+        xvfb.run()
+      self.browser.run(self._getTestURL() , xvfb.display)
+      while self.getStatus() is None:
+        time.sleep(10)
+        if (time.time() - start) > float(self.timeout):
+          raise TimeoutError("Test took more them %s seconds" % self.timeout)
+
+    finally:
+      self.browser.quit()
+      xvfb.quit()
+
+  def processResult(self):
+    file_content = self.getStatus().encode("utf-8", "replace")
+    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)]
+
+    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
+
+    # When return fix output for handle unicode issues.
+    return detail, int(sucess_amount), int(failure_amount), error_title_list
+
+class ERP5TypeFunctionalTestCase:
+  run_only = ""
+  foreground = 0
+  use_phanthom = False
+
+  def getTitle(self):
+    return "Zelenium"
+
+  def afterSetUp(self):
+    # create browser_id_manager
+    if not "browser_id_manager" in self.portal.objectIds():
+      self.portal.manage_addProduct['Sessions'].constructBrowserIdManager()
+    transaction.commit()
+    self.setSystemPreference()
+    self.portal.portal_tests.TestTool_cleanUpTestResults()
+    self.stepTic()
+
+  def setSystemPreference(self):
+    conversion_dict = _getConversionServerDict()
+    self.portal.Zuite_setPreference(
+       working_copy_list=bt5_dir_list,
+       conversion_server_hostname=conversion_dict['hostname'],
+       conversion_server_port=conversion_dict['port']
+      )
+    # XXX Memcached is missing
+    # XXX Persistent cache setup is missing
+
+  def testFunctionalTestRunner(self):
+    # first of all, abort to get rid of the mysql participation inn this
+    # transaction
+    self.portal._p_jar.sync()
+    self.runner = FunctionalTestRunner(self.serverhost, self.serverport,
+                                self.portal, self.run_only, self.use_phanthom)
+
+    self.runner.test(debug=self.foreground)
+    detail, success, failure, error_title_list = self.runner.processResult()
+
+    self.logMessage("-" * 79)
+    total = success + failure
+    self.logMessage("%s Functional Tests %s Tests, %s Failures" % \
+                    (self.getTitle(), total, failure))
+    self.logMessage("-" * 79)
+    self.logMessage(detail)
+    self.logMessage("-" * 79)
+    self.assertEquals([], error_title_list)

slapos/recipe/seleniumrunner/__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 os
+import sys
+import zc.buildout
+from slapos.recipe.librecipe import BaseSlapRecipe
+
+class Recipe(BaseSlapRecipe):
+  def _install(self):
+    """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)

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)

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

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

slapos/recipe/shell.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+import json
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+  def install(self):
+    env = os.environ.copy()
+
+    path_list = self.options['path'].split('\n')
+    env.update(PATH=':'.join(path_list))
+    env.update(SHELL=self.options['shell'])
+    env.update(HOME=self.options['home'])
+
+    ps1 = self.options.get('ps1')
+    if ps1 is not None:
+      env.update(PS1=str(json.loads(ps1)))
+    else:
+      env.update(PS1=env.get('PS1', '> '))
+
+    wrapper = self.createPythonScript(
+      self.options['wrapper'],
+      'slapos.recipe.librecipe.execute.executee',
+      [ # Executable
+        [self.options['shell']],
+        # Environment
+        env
+      ]
+    )
+
+    return [wrapper]

slapos/recipe/shellinabox.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 getpass import getpass
+import pwd
+import grp
+import os
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+def login_shell(args):
+  password = args['password']
+  entered_password = getpass()
+
+  if entered_password != password:
+    return 1
+  else:
+    os.execl(args['shell'], args['shell'])
+
+def shellinabox(args):
+  certificate_dir = args['certificate_dir']
+  certificate_path = os.path.join(certificate_dir, 'certificate.pem')
+  with open(certificate_path, 'w') as certificate_file:
+    with open(args['ssl_key'], 'r') as key_file:
+      # XXX: Dirty hack in order to make shellinabox work
+      print >> certificate_file, key_file.read().replace(' PRIVATE ',
+                                                         ' RSA PRIVATE ')
+    with open(args['ssl_certificate']) as public_key_file:
+      print >> certificate_file, public_key_file.read()
+
+  user = pwd.getpwuid(os.getuid()).pw_name
+  group = grp.getgrgid(os.getgid()).gr_name
+  service = '/:%(user)s:%(group)s:%(directory)s:%(command)s' % {
+    'user': group,
+    'group': user,
+    'directory': args['directory'],
+    'command': args['login_shell'],
+  }
+
+  command_line = [
+    args['shellinabox'],
+    '-d',
+    '-c', certificate_dir,
+    '-s', service,
+    '--ipv6', args['ipv6'],
+    '-p', args['port'],
+  ]
+
+  os.execv(command_line[0], command_line)
+
+
+class Recipe(GenericBaseRecipe):
+
+  def install(self):
+    path_list = []
+
+    login_shell = self.createPythonScript(
+      self.options['login-shell'],
+      '%s.login_shell' % __name__,
+      {
+        'password': self.options['password'],
+        'shell': self.options['shell']
+      }
+    )
+    path_list.append(login_shell)
+
+    wrapper = self.createPythonScript(
+      self.options['wrapper'],
+      '%s.shellinabox' % __name__,
+      dict(
+        certificate_dir=self.options['certificate-directory'],
+        ssl_key=self.options['key-file'],
+        ssl_certificate=self.options['cert-file'],
+        shellinabox=self.options['shellinabox-binary'],
+        directory=self.options['directory'],
+        ipv6=self.options['ipv6'],
+        port=self.options['port'],
+        login_shell=login_shell,
+      )
+    )
+    path_list.append(wrapper)
+
+    return [wrapper]

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

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

slapos/recipe/softwaretype.py

@@ -29,6 +29,7 @@ import os
 import sys
 import copy
 from ConfigParser import ConfigParser
+import json
 import subprocess
 import slapos.slap
 import netaddr
@@ -82,7 +83,7 @@ class Recipe:
       if 'default' in self.options:
         software_type = 'default'
       else:
-        raise zc.buildout.UserError("This software type isn't mapped. And"
+        raise zc.buildout.UserError("This software type isn't mapped. And "
                                     "there's no default software type.")
 
     instance_file_path = self.options[software_type]
@@ -95,18 +96,20 @@ class Recipe:
     with open(instance_file_path) as instance_path:
       buildout.readfp(instance_path)
 
-    buildout.set('buildout', 'installed',
-                 '.installed-%s.cfg' % software_type)
+    buildout.set('buildout', 'installed', '.installed-%s.cfg' % self.name)
 
     if not buildout.has_section('slap-parameter'):
       buildout.add_section('slap-parameter')
     for parameter, value in self.parameter_dict.items():
-      buildout.set('slap-parameter', parameter, value)
+      if isinstance(value, str):
+        buildout.set('slap-parameter', parameter, value)
+      else:
+        buildout.set('slap-parameter', parameter, json.dumps(value))
 
     buildout.add_section('slap-network-information')
-    buildout.set('slap-network-information', 'local-ipv4', 
+    buildout.set('slap-network-information', 'local-ipv4',
                  self.getLocalIPv4Address())
-    buildout.set('slap-network-information', 'global-ipv6', 
+    buildout.set('slap-network-information', 'global-ipv6',
                  self.getGlobalIPv6Address())
 
     # Copy/paste slap_connection
@@ -118,7 +121,7 @@ class Recipe:
     work_directory = os.path.abspath(self.buildout['buildout'][
       'directory'])
     buildout_filename = os.path.join(work_directory,
-                                     'buildout-%s.cfg' % software_type)
+                                     'buildout-%s.cfg' % self.name)
     with open(buildout_filename, 'w') as buildout_file:
       buildout.write(buildout_file)
 

slapos/recipe/sshkeys_authority.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 json
+import hashlib
+import os
+import subprocess
+import re
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+from slapos.recipe.librecipe.inotify import subfiles
+
+# This authority only works with dropbear sshkey generator
+def sshkeys_authority(args):
+  requests_directory = args['requests']
+  keygen_binary = args['sshkeygen']
+
+  for request_filename in subfiles(requests_directory):
+
+    with open(request_filename) as request_file:
+      request = json.load(request_file)
+
+    key_type = request.get('type', 'rsa')
+    size = str(request.get('size', 2048))
+    try:
+      private_key = request['private_key']
+      public_key = request['public_key']
+    except KeyError:
+      break
+
+    if not os.path.exists(private_key):
+      if os.path.exists(public_key):
+        os.unlink(public_key)
+      keygen_cmd = [keygen_binary, '-t', key_type, '-f', private_key,
+                    '-s', size]
+      # If the keygeneration return an non-zero status, it means there's a
+      # big problem. Let's exit in this case
+      subprocess.check_call(keygen_cmd, env=os.environ.copy())
+
+    if not os.path.exists(public_key):
+      keygen_cmd = [keygen_binary, '-f', private_key, '-y']
+
+      keygen = subprocess.Popen(keygen_cmd, stdout=subprocess.PIPE,
+                                stdin=subprocess.PIPE,
+                                stderr=subprocess.STDOUT,
+                                env=os.environ.copy())
+      keygen.stdin.flush()
+      keygen.stdin.close()
+
+      # If the keygeneration return an non-zero status, it means there's a
+      # big problem. Let's exit in this case
+      if keygen.wait() != 0:
+        raise subprocess.CalledProcessError("%r returned a non-zero status" % \
+                                            ' '.join(keygen_cmd))
+      public_key_value = ''
+      for line in keygen.stdout:
+        # Perl programming !
+        # Don't worry, just regex to detect the ssh public key line
+        matchresult = re.match(r'ssh-.*?=+', line)
+        if matchresult:
+          public_key_value = matchresult.group(0)
+          break
+
+      with open(public_key, 'w') as public_key_file:
+        public_key_file.write(public_key_value)
+
+
+
+class Recipe(GenericBaseRecipe):
+
+  def install(self):
+    args = dict(
+      requests=self.options['request-directory'],
+      sshkeygen=self.options['keygen-binary'],
+    )
+
+    wrapper = self.createPythonScript(self.options['wrapper'],
+      __name__ + '.sshkeys_authority', args)
+    return [wrapper]
+
+class Request(GenericBaseRecipe):
+
+  def _options(self, options):
+    if 'name' not in options:
+      options['name'] = self.name
+
+    keys_directory = options['keys-directory']
+
+    self.private_key = os.path.join(keys_directory,
+      hashlib.sha256(options['name']).hexdigest())
+    self.public_key = self.private_key + '.pub'
+
+    if os.path.exists(self.public_key):
+      with open(self.public_key) as key:
+        options['public-key-value'] = key.read()
+    else:
+      options['public-key-value'] = ''
+
+  def install(self):
+    requests_directory = self.options['request-directory']
+    request_file = os.path.join(requests_directory, self.options['name'])
+
+    request = dict(
+      private_key=self.private_key,
+      public_key=self.public_key,
+    )
+    if 'size' in self.options:
+      request.update(size=int(self.options['size'], 10))
+    if 'type' in self.options:
+      request.update(type=self.options['type'])
+
+    with open(request_file, 'w') as file_:
+      json.dump(request, file_)
+
+    public_key_link, private_key_link = (self.options['public-key'],
+                                         self.options['private-key'],
+                                        )
+    # XXX: Copy and past from certificate_authority/__init__.py:Request
+    # We should factorize that
+    for link in [public_key_link, private_key_link]:
+      if os.path.islink(link):
+        os.unlink(link)
+      elif os.path.exists(link):
+        raise OSError("%r should be a symbolic link." % link)
+
+    os.symlink(self.public_key, public_key_link)
+    os.symlink(self.private_key, private_key_link)
+    # end-XXX
+
+    wrapper = self.createPythonScript(
+      self.options['wrapper'],
+      'slapos.recipe.librecipe.execute.execute_wait',
+      [ [self.options['executable']],
+        [self.private_key, self.public_key] ])
+
+
+    return [request_file, wrapper, public_key_link, private_key_link]

slapos/recipe/stunnel/__init__.py

@@ -24,22 +24,24 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-import itertools
-
-import zc.buildout
+import os
+import signal
+import errno
 
 from slapos.recipe.librecipe import GenericBaseRecipe
 
+def post_rotate(args):
+  pid_file = args['pid_file']
+
+  if os.path.exist(pid_file):
+    with open(pid_file, 'r') as file_:
+      pid = file_.read().strip()
+    os.kill(pid, signal.SIGUSR1)
+
 class Recipe(GenericBaseRecipe):
 
-  def _options(self, options):
-    self.types = ['local', 'remote']
-    self.datas = ['address', 'port']
-    for type_ in self.types:
-      for data in self.datas:
-        opt = '%s-%s' % (type_, data)
-        if opt not in options:
-          raise zc.buildout.UserError("No %s for %s connections." % (data, type_))
+  def install(self):
+    path_list = []
 
     self.isClient = self.optionIsTrue('client', default=False)
     if self.isClient:
@@ -47,25 +49,15 @@ class Recipe(GenericBaseRecipe):
     else:
       self.logger.info("Server mode")
 
-    if 'name' not in options:
-      options['name'] = self.name
-
-
-  def install(self):
-    path_list = []
     conf = {}
 
-    gathered_options = ['%s-%s' % option
-                       for option in itertools.product(self.types,
-                                                        self.datas)]
-    for option in gathered_options:
-      # XXX: Because the options are using dash and the template uses
-      # underscore
-      conf[option.replace('-', '_')] = self.options[option]
+    for type_ in ['remote', 'local']:
+      for data in ['host', 'port']:
+        confkey, opt = ['%s%s%s' % (type_, i, data) for i in ['_', '-']]
+        conf[confkey] = self.options[opt]
 
     pid_file = self.options['pid-file']
     conf.update(pid_file=pid_file)
-    path_list.append(pid_file)
 
     log_file = self.options['log-file']
     conf.update(log=log_file)
@@ -91,4 +83,21 @@ class Recipe(GenericBaseRecipe):
     )
     path_list.append(wrapper)
 
+    if os.path.exists(pid_file):
+      with open(pid_file, 'r') as file_:
+        pid = file_.read().strip()
+      # Reload configuration
+      try:
+        os.kill(int(pid, 10), signal.SIGHUP)
+      except OSError, e:
+        if e.errno == errno.ESRCH: # No such process
+          os.unlink(pid_file)
+        else:
+          raise e
+
+    if 'post-rotate-script' in self.options:
+      self.createPythonScript(self.options['post-rotate-script'],
+                              __name__ + 'post_rotate',
+                              dict(pid_file=pid_file))
+
     return path_list

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

@@ -6,5 +6,5 @@ key = %(key)s
 cert = %(cert)s
 
 [service]
-accept = %(remote_address)s:%(remote_port)s
-connect = %(local_address)s:%(local_port)s
+accept = %(remote_host)s:%(remote_port)s
+connect = %(local_host)s:%(local_port)s

slapos/recipe/helloworld.py → slapos/recipe/waitfor.py

@@ -24,21 +24,19 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.recipe.librecipe import BaseSlapRecipe
+import shlex
 
-class Recipe(BaseSlapRecipe):
+from slapos.recipe.librecipe import GenericBaseRecipe
 
-  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""")
+class Recipe(GenericBaseRecipe):
 
-    self.computer_partition.setConnectionDict(dict(
-      hello_world="Hello World!",
-      ))
-    return [dummy_wrapper]
-    
\ No newline at end of file
+  def install(self):
+    files = [f for f in self.options['files'].split('\n') if f]
+    command_line = shlex.split(self.options['command-line'])
+    wrapper = self.createPythonScript(
+      self.options['wrapper'],
+      'slapos.recipe.librecipe.execute.execute_wait',
+      [ command_line,
+        files ],
+    )
+    return [wrapper]

software/wordpress/instance-wordpress.cfg → software/apache-frontend/instance.cfg

 [buildout]
-
 parts =
-  apache-php
-  request-mariadb
-  mkdir
+  instance
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[apache-php]
-recipe = slapos.cookbook:lamp.request
-source = ${application:location}
-template = ${application-template:location}/${application-template:filename}
-configuration = ${application-configuration:location}
 
+[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
-
-mysql-url = $${request-mariadb:connection-url}
-
-[request-mariadb]
-recipe = slapos.cookbook:request
-name = MariaDB DataBase
-software-url = $${slap_connection:software_release_url}
-software-type = mariadb
-return = url
+rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
+gcc_binary = ${gcc-java-minimal:location}/bin/gcc
+binutils_directory = ${binutils:location}/bin/

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

software/cloudooo/development.cfg

+[buildout]
+extends = software.cfg
+auto-checkout = cloudooo

software/davstorage/instance-davstorage.cfg

 [buildout]
 parts =
   davstorage
+  url
+  certificate-authority
+  ca-davstorage
+  cron
+  cron-entry-logrotate
+  logrotate
+  logrotate-entry-davstorage
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
+[url]
+recipe = slapos.cookbook:publishurl
+scheme = webdavs
+user = $${davstorage:user}
+port = $${davstorage:port}
+host = $${davstorage:ip}
+password = $${davstorage:password}
+
 [davstorage]
 recipe = slapos.cookbook:davstorage
+user = user
+port = 8080
+ip = $${slap-network-information:global-ipv6}
+
+# Path
+wrapper = $${rootdirectory:bin}/davstorage
+error-log = $${directory:davstorage-log}/error.log
+access-log = $${directory:davstorage-log}/access.log
+pid-file = $${basedirectory:run}/davstorage.pid
+lock-file = $${basedirectory:run}/davstorage.lock
+davdb-lock = $${basedirectory:run}/davdb.lock
+key-file = $${ca-davstorage:key-file}
+cert-file = $${ca-davstorage:cert-file}
+conf-file = $${directory:davstorage-conf}/davstorage.conf
+htdocs = $${directory:htdocs}
+root = $${buildout:directory}
+email-address = admin+davstorage@vifib.net
+htpasswd-file = $${directory:davstorage-conf}/davstorage.htpasswd
+promise = $${basedirectory:promises}/davstorage
+
+# Binaries
+apache-binary = ${apache:location}/bin/httpd
+apache-modules-dir = ${apache:location}/modules/
+apache-mime-file = ${apache:location}/conf/mime.types
+apache-htpasswd = ${apache:location}/bin/htpasswd
+
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = ${openssl:location}/bin/openssl
+ca-dir = $${directory:ca-dir}
+requests-directory = $${cadirectory:requests}
+wrapper = $${basedirectory:services}/certificate_authority
+ca-private = $${cadirectory:private}
+ca-certs = $${cadirectory:certs}
+ca-newcerts = $${cadirectory:newcerts}
+ca-crl = $${cadirectory:crl}
+
+[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:binary}
+binary = $${basedirectory:services}/crond
+
+[logrotate]
+recipe = slapos.cookbook:logrotate
 # Binaries
-dcrond_binary = ${dcron:location}/sbin/crond
-logrotate_binary = ${logrotate:location}/usr/sbin/logrotate
-apache_binary = ${apache:location}/bin/httpd
-apache_modules_dir = ${apache:location}/modules/
-apache_mime_file = ${apache:location}/conf/mime.types
-apache_htpasswd = ${apache:location}/bin/htpasswd
-# Real configuration
-key_file = $${certificate_authority:certificate_authority_dir}/davstorage.key
-cert_file = $${certificate_authority:certificate_authority_dir}/davstorage.crt
-
-# [ca]
-# recipe = slapos.cookbook:ca
-# openssl_binary = ${openssl:location}/bin/openssl
-# certificate_authority_dir = $${directory:srv}/ssl/
-# 
-# [ca-davstorage]
-# recipe = slapos.cookbook:part
-# part = $${certificate_authority:part}
-# parameters =
-#   key_file=$${davstorage:key_file}
-#   cert_file=$${davstorage:cert_file}
+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
+
+[cron-entry-logrotate]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+command = $${logrotate:wrapper}
+
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+binary = $${rootdirectory:bin}/cron_simplelogger
+output = $${directory:cronoutput}
+
+
+[logrotate-entry-davstorage]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = davstorage
+log = $${davstorage:error-log} $${davstorage:access-log}
+frequency = daily
+rotate-num = 30
+sharedscripts = true
+notifempty = true
+create = true
+
+[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-davstorage]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+key-file = $${directory:davstorage-conf}/davstorage.key
+cert-file = $${directory:davstorage-conf}/davstorage.crt
+executable = $${davstorage:wrapper}
+wrapper = $${basedirectory:services}/davstorage
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+var = $${buildout:directory}/var/
+srv = $${buildout:directory}/srv/
+bin = $${buildout:directory}/bin/
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = $${rootdirectory:var}/log/
+services = $${rootdirectory:etc}/run/
+run = $${rootdirectory:var}/run/
+backup = $${rootdirectory:srv}/backup/
+promises = $${rootdirectory:etc}/promise/
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+htdocs = $${rootdirectory:srv}/www/
+davstorage-log = $${basedirectory:log}/davstorage/
+logrotate-backup = $${basedirectory:backup}/logrotate/
+logrotate-entries = $${rootdirectory:etc}/logrotate.d/
+davstorage-conf = $${rootdirectory:etc}/davstorage/
+ca-dir = $${rootdirectory:srv}/ssl/
+cron-entries = $${rootdirectory:etc}/cron.d/
+crontabs = $${rootdirectory:etc}/crontabs/
+cronstamps = $${rootdirectory:etc}/cronstamps/
+cronoutput = $${basedirectory:log}/cron/

software/davstorage/instance.cfg

@@ -9,4 +9,4 @@ offline = true
 
 [switch_softwaretype]
 recipe = slapos.cookbook:softwaretype
-default = ${instance_davstorage:output}
+default = ${instance-davstorage:output}

software/davstorage/software.cfg

@@ -8,10 +8,11 @@ versions = versions
 extends =
   ../../component/apache/buildout.cfg
   ../../component/dcron/buildout.cfg
-   ../../component/logrotate/buildout.cfg
+  ../../component/logrotate/buildout.cfg
   ../../stack/shacache-client.cfg
   ../../component/lxml-python/buildout.cfg
   ../../component/python-2.7/buildout.cfg
+  ../../component/gzip/buildout.cfg
 
 # Use only quite well working sites.
 allow-hosts =
@@ -24,6 +25,7 @@ allow-hosts =
   peak.telecommunity.com
   psutil.googlecode.com
   www.dabeaz.com
+  alastairs-place.net
 
 
 parts =
@@ -33,9 +35,9 @@ parts =
   logrotate
   dcron
   eggs
+  gzip
   instance-recipe-egg
 
-
 unzip= true
 
 [eggs]
@@ -55,14 +57,14 @@ eggs = ${instance-recipe:egg}
 # Default template for the instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 4c79e2e42704a2ffe5eebfa0b2e70e28
+md5sum = bed788dee6daf05349c4577e7a7f1299
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-[instance_davstorage]
+[instance-davstorage]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-davstorage.cfg
-md5sum = 009103c87c8d31fb758e7a0782e77723
+md5sum = 49c8e049a78e233d3a553e64c8914592
 output = ${buildout:directory}/template-davstorage.cfg
 mode = 0644
 
@@ -103,7 +105,7 @@ netaddr = 0.7.6
 
 # Required by:
 # slapos.core==0.14
-netifaces = 0.4
+#netifaces = 0.4
 
 # Required by:
 # slapos.cookbook==0.24

software/erp5testnode/instance-default.cfg

+[buildout]
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+parts =
+  connection-dict
+  testnode
+  pwgen
+  shell
+  shellinabox
+  certificate-authority
+  ca-shellinabox
+
+[connection-dict]
+recipe = slapos.cookbook:publish
+url = http://[$${shellinabox:ipv6}]:$${shellinabox:port}/
+password = $${pwgen:password}
+
+[pwgen]
+recipe = slapos.cookbook:pwgen
+file = $${buildout:directory}/.password
+pwgen-binary = ${pwgen:location}/bin/pwgen
+
+[testnode]
+recipe = slapos.cookbook:erp5testnode
+
+slapos-directory = $${directory:slapos}
+working-directory = $${directory:testnode}
+test-suite-directory = $${directory:test-suite}
+proxy-host = $${slap-network-information:global-ipv6}
+proxy-port = 5000
+log-directory = $${directory:log}
+run-directory = $${directory:run}
+test-suite-title = $${slap-parameter:test-suite-title}
+test-node-title = $${slap-parameter:test-node-title}
+test-suite = $${slap-parameter:test-suite}
+node-quantity = $${slap-parameter:node-quantity}
+project-title = $${slap-parameter:project-title}
+ipv4-address = $${slap-network-information:local-ipv4}
+ipv6-address = $${slap-network-information:global-ipv6}
+test-suite-master-url = $${slap-parameter:test-suite-master-url}
+bt5-path = $${slap-parameter:additional-bt5-repository-id}
+instance-dict = $${slap-parameter:instance-dict}
+repository-list = $${slap-parameter:vcs-repository-list}
+
+git-binary = ${git:location}/bin/git
+slapgrid-partition-binary = ${buildout:bin-directory}/slapgrid-cp
+slapgrid-software-binary = ${buildout:bin-directory}/slapgrid-sr
+slapproxy-binary = ${buildout:bin-directory}/slapproxy
+svn-binary = ${subversion:location}/bin/svn
+svnversion-binary = ${subversion:location}/bin/svnversion
+testnode = ${buildout:bin-directory}/testnode
+zip-binary = ${zip:location}/bin/zip
+
+configuration-file = $${rootdirectory:etc}/erp5testnode.cfg
+log-file = $${basedirectory:log}/erp5testnode.log
+wrapper = $${basedirectory:services}/erp5testnode
+
+[shell]
+recipe = slapos.cookbook:shell
+wrapper = $${rootdirectory:bin}/sh
+shell = ${busybox:location}/bin/sh
+home = $${buildout:directory}
+ps1 = "\\w> "
+path =
+    ${busybox:location}/bin/
+    ${busybox:location}/usr/bin/
+    ${git:location}/bin/
+    ${subversion:location}/bin/
+    ${perl:location}/bin/
+    ${python2.7:location}/bin/
+    ${buildout:bin-directory}/
+    ${busybox:location}/sbin/
+    ${busybox:location}/usr/sbin/
+
+[shellinabox]
+recipe = slapos.cookbook:shellinabox
+ipv6 = $${slap-network-information:global-ipv6}
+port = 8080
+shell = $${shell:wrapper}
+wrapper = $${rootdirectory:bin}/shellinaboxd
+shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd
+password = $${pwgen:password}
+directory = $${buildout:directory}/
+login-shell = $${rootdirectory:bin}/login
+certificate-directory = $${directory:shellinabox}
+cert-file = $${directory:shellinabox}/public.crt
+key-file = $${directory:shellinabox}/private.key
+
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = ${openssl:location}/bin/openssl
+ca-dir = $${directory:ca-dir}
+requests-directory = $${cadirectory:requests}
+wrapper = $${basedirectory:services}/ca
+ca-private = $${cadirectory:private}
+ca-certs = $${cadirectory:certs}
+ca-newcerts = $${cadirectory:newcerts}
+ca-crl = $${cadirectory:crl}
+
+[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-shellinabox]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+executable = $${shellinabox:wrapper}
+wrapper = $${basedirectory:services}/shellinaboxd
+key-file = $${shellinabox:key-file}
+cert-file = $${shellinabox:cert-file}
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+var = $${buildout:directory}/var/
+srv = $${buildout:directory}/srv/
+bin = $${buildout:directory}/bin/
+tmp = $${buildout:directory}/tmp/
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = $${rootdirectory:var}/log/
+services = $${rootdirectory:etc}/run/
+run = $${rootdirectory:var}/run/
+promises = $${rootdirectory:etc}/promise/
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+slapos = $${rootdirectory:srv}/slapos/
+testnode = $${rootdirectory:srv}/testnode/
+test-suite = $${rootdirectory:srv}/test_suite/
+log = $${basedirectory:log}/testnode/
+run = $${basedirectory:run}/testnode/
+shellinabox = $${rootdirectory:srv}/shellinabox/
+ca-dir = $${rootdirectory:srv}/ca/
+
+[slap-parameter]
+node-quantity = 1
+test-suite-master-url =
+additional-bt5-repository-id =
+instance-dict =
+vcs-repository-list = []
+test-suite-title = $${:test-suite}

software/erp5testnode/instance.cfg

 [buildout]
 parts =
-  testnode
+  switch_softwaretype
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
 
-[testnode]
-recipe = slapos.cookbook:erp5testnode
-
-git_binary = ${git:location}/bin/git
-slapgrid_partition_binary = ${buildout:bin-directory}/slapgrid-cp
-slapgrid_software_binary = ${buildout:bin-directory}/slapgrid-sr
-slapproxy_binary = ${buildout:bin-directory}/slapproxy
-svn_binary = ${subversion:location}/bin/svn
-svnversion_binary = ${subversion:location}/bin/svnversion
-testnode = ${buildout:bin-directory}/testnode
-zip_binary = ${zip:location}/bin/zip
+[switch_softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${template-default:output}

software/erp5testnode/software.cfg

@@ -18,8 +18,17 @@ extends =
   ../../component/git/buildout.cfg
   ../../component/lxml-python/buildout.cfg
   ../../component/zip/buildout.cfg
+  ../../component/busybox/buildout.cfg
+  ../../component/shellinabox/buildout.cfg
+  ../../component/pwgen/buildout.cfg
 
+# Local development
+develop =
+  ${:parts-directory}/slapos.cookbook-repository
 parts =
+# Local development
+  slapos.cookbook-repository
+  check-recipe
   template
   lxml-python
   eggs
@@ -43,12 +52,28 @@ allow-hosts =
   peak.telecommunity.com
   psutil.googlecode.com
   www.dabeaz.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
 
+# Local development
+[slapos.cookbook-repository]
+recipe = plone.recipe.command
+stop-on-error = true
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+command = ${git:location}/bin/git clone --quiet http://git.erp5.org/repos/slapos.git ${:location}
+update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
+
+[check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+
 [eggs]
 recipe = zc.recipe.egg
 eggs =
@@ -56,6 +81,7 @@ eggs =
   zc.buildout
   slapos.libnetworkcache
   slapos.core
+  inotifyx
   slapos.cookbook
   erp5.util[testnode]
 
@@ -75,10 +101,17 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
-md5sum = 08e3f92bce41efc5bfe044bb9d354786
+md5sum = 307663d73ef3ef94b02567ecd322252e
+
+[template-default]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-default.cfg
+output = ${buildout:directory}/template-default.cfg
+mode = 0644
+md5sum = 2349e62d4fa46fc88e05d855f49b7c38
 
 [networkcache]
-# Romain Courteaud + Sebastien Robin signature certificate
+# Romain Courteaud + Sebastien Robin + Antoine Catton signature certificate
 signature-certificate-list =
   -----BEGIN CERTIFICATE-----
   MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
@@ -106,6 +139,19 @@ signature-certificate-list =
   R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
   hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
   -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB8DCCAVmgAwIBAgIJAJ5iKK7w6AQVMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
+  BAMMBkNPTVAtMTAeFw0xMTExMjkxNjU1NDZaFw0xMjExMjgxNjU1NDZaMBExDzAN
+  BgNVBAMMBkNPTVAtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6IBOEnQP
+  qT1KPBT8xQnYe6ECxXkfV9zhuVwolB/2wHM1Qk0TRoOPRRHfOvzkLQUVkD9on6Dj
+  mJsYhrukqaidv0Y9n7c5JKM8DfFh41UP3wG6rJpPJ9VZ0ZzFjk+yzCSYrI6rf3Yd
+  vRhNbKHfBO+23DJJqeEiobxsOQc6eE9Gt78CAwEAAaNQME4wHQYDVR0OBBYEFDLf
+  TAc8fEZjGWNA62Tld7iSrgKgMB8GA1UdIwQYMBaAFDLfTAc8fEZjGWNA62Tld7iS
+  rgKgMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEA28CQAN/jC3X+5lOh
+  wYO0+HvXSa6TNy6k+xAXQHEezOSgA7QMjXGVPHNzZRxhI4k6mdGImmPlKfV/GgcA
+  T3XATu8g033m2pCtNXW6Awp4V2Mft+w5Hx4Y3iT0Uccxc/699PU/MGroBKVCphwB
+  /SvdKJ6l9YsKUKhJlMRQxc9QHdU=
+  -----END CERTIFICATE-----
 
 [versions]
 # Use SlapOS patched zc.buildout

software/helloworld/instance.cfg

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

software/helloworld/software.cfg

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

software/java/software.cfg

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

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

software/lamp-template/instance.cfg

@@ -7,8 +7,8 @@ parts = instance
 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
-#template = ${application-template:location}/${application-template:filename}
-#configuration = ${application-configuration:location}
+template = ${application-template:location}/${application-template:filename}
+configuration = ${application-configuration:location}
 
 httpd_binary = ${apache:location}/bin/httpd
 mysql_binary = ${mariadb:location}/bin/mysql

software/lamp-template/software.cfg

@@ -22,7 +22,7 @@ strip-top-level-dir = true
 
 [application-template]
 recipe = slapos.recipe.download
-url = Student shall put here url to template file for application
+url = ${:_profile_base_location_}/template/REPLACE_ME_BY_APPLICATION_TEMPLATE_NAME
 #md5sum = Student may put here md5sum of this file, this is good idea
 filename = template.in
 mode = 0644
@@ -61,7 +61,7 @@ buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.8
 plone.recipe.command = 1.1
-slapos.cookbook = 0.38
+slapos.cookbook = 0.20
 slapos.recipe.build = 0.7
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2

software/lamp-template/template/phpmyadmin.inc.php.in

 <?php
 $cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
-$i = 0;
-$i++;
+$i = 1;
+
 /* Server parameters */
 $cfg['Servers'][$i]['host'] = 'Put here mysql host template key';
 $cfg['Servers'][$i]['port'] = 'Put here mysql port template key';

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

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

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

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/

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

software/wordpress/software.cfg

 [buildout]
 versions = versions
 
-parts =
-  apache-php
-  template
-  eggs
-  instance-recipe-egg
-  instance_wordpress
-  instance_mariadb
   
 extends =
-  ../../component/gzip/buildout.cfg
-  ../../stack/apache-php.cfg
-  ../../stack/shacache-client.cfg
+  ../../stack/lamp/buildout.cfg
 
-# XXX: This is dirty, recipe trick shall be used.
-develop =
-  /opt/slapdev
 
 [application]
 url = http://wordpress.org/latest.tar.gz
@@ -33,51 +21,8 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [application-configuration]
 location = wp-config.php
-md5sum = 608dd9003a8edeb59c3aabc6cf43bbf9
+md5sum = 3859841a4ad6ed23744d6bc5a01321e0
   
-[instance-recipe]
-egg = slapos.cookbook
-module = lamp.request
-
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-eggs = ${instance-recipe:egg}
-
-[template]
-# Default template for the instance.
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-md5sum = 817407b6bb7af1dce7588e259ead0d26
-output = ${buildout:directory}/template.cfg
-mode = 0644
-
-[instance_mariadb]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/../mariadb/instance-mariadb.cfg
-md5sum = 38aefa725d21988485c20ae9d58f9455
-output = ${buildout:directory}/template-mariadb.cfg
-mode = 0644
-
-[instance_wordpress]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-wordpress.cfg
-md5sum = 220e14b7a46742b1fd83d699c352b888
-output = ${buildout:directory}/template-wordpress.cfg
-mode = 0644
-
 [versions]
-#slapos.cookbook = 0.12
-
-# Required by slapos.cookbook==0.12
-slapos.core = 0.8
-collective.recipe.template = 1.8
-netaddr = 0.7.5
-xml-marshaller = 0.9.7
-setuptools = 0.6c12dev-r88795
-
-hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.0
-plone.recipe.command = 1.1
-
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-002
+zc.buildout = 1.6.0-dev-SlapOS-003

software/wordpress/wp-config.php.in

@@ -42,14 +42,14 @@ define('DB_COLLATE', '');
  *
  * @since 2.6.0
  */
-define('AUTH_KEY',         'put your unique phrase here');
-define('SECURE_AUTH_KEY',  'put your unique phrase here');
-define('LOGGED_IN_KEY',    'put your unique phrase here');
-define('NONCE_KEY',        'put your unique phrase here');
-define('AUTH_SALT',        'put your unique phrase here');
-define('SECURE_AUTH_SALT', 'put your unique phrase here');
-define('LOGGED_IN_SALT',   'put your unique phrase here');
-define('NONCE_SALT',       'put your unique phrase here');
+define('AUTH_KEY',         '%(secret_key)s');
+define('SECURE_AUTH_KEY',  '%(secret_key)s');
+define('LOGGED_IN_KEY',    '%(secret_key)s');
+define('NONCE_KEY',        '%(secret_key)s');
+define('AUTH_SALT',        '%(secret_key)s');
+define('SECURE_AUTH_SALT', '%(secret_key)s');
+define('LOGGED_IN_SALT',   '%(secret_key)s');
+define('NONCE_SALT',       '%(secret_key)s');
 
 /**#@-*/
 

stack/apache-php.cfg

-[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
-  dist.repoze.org
-  effbot.org
-  github.com
-  peak.telecommunity.com
-  psutil.googlecode.com
-  www.dabeaz.com
-
-parts =
-  template
-  apache-php
-  mariadb
-  eggs
-  instance-recipe-egg
-  stunnel
-
-extends =
-  ../component/apache/buildout.cfg
-  ../component/apache-php/buildout.cfg
-  ../component/dcron/buildout.cfg
-  ../component/git/buildout.cfg
-  ../component/glib/buildout.cfg
-  ../component/logrotate/buildout.cfg
-  ../component/python-2.7/buildout.cfg
-  ../component/lxml-python/buildout.cfg
-  ../component/zlib/buildout.cfg
-  ../component/stunnel/buildout.cfg
-
-[application]
-recipe = hexagonit.recipe.download
-#If provided tarball does not containt top directory this option shall be changed to false
-strip-top-level-dir = true
-
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-  ${lxml-python:egg}

stack/cloudooo.cfg

@@ -21,6 +21,7 @@ extends =
   ../component/pdftk/buildout.cfg
   ../component/ffmpeg/buildout.cfg
   ../component/file/buildout.cfg
+  ../component/cloudooo/buildout.cfg
 
 versions = versions
 
@@ -66,19 +67,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

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

stack/lamp/buildout.cfg

+[buildout]
+find-links +=
+    http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+parts =
+  apache-php
+  mariadb
+  mydumper
+  mysql-python
+  rdiff-backup
+  dropbear
+  eggs
+  instance-recipe-egg
+  template
+  template-apache-php
+  template-mariadb
+  template-mariadb-pbsready
+  template-mariadb-pbsready-import
+  template-mariadb-pbsready-export
+
+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
+  launchpad.net
+
+extends =
+  ../shacache-client.cfg
+  ../../component/mariadb/buildout.cfg
+  ../../component/apache/buildout.cfg
+  ../../component/apache-php/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/git/buildout.cfg
+  ../../component/glib/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/perl/buildout.cfg
+  ../../component/sqlite3/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../component/zlib/buildout.cfg
+  ../../component/rdiff-backup/buildout.cfg
+  ../../component/gzip/buildout.cfg
+  ../../component/stunnel/buildout.cfg
+  ../../component/mydumper/buildout.cfg
+  ../../component/mysql-python/buildout.cfg
+  ../../component/dropbear/buildout.cfg
+
+versions = versions
+
+[mariadb]
+# Compile dir is for plugins, there's no plugin in LAMP
+keep-compile-dir = false
+
+[instance-recipe]
+egg = slapos.cookbook
+module = lamp.request
+
+[instance-recipe-egg]
+recipe = zc.recipe.egg
+#python = python2.7
+eggs = ${instance-recipe:egg}
+
+[application]
+recipe = hexagonit.recipe.download
+#If provided tarball does not containt top directory this option shall be changed to false
+strip-top-level-dir = true
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+output = ${buildout:directory}/template.cfg
+md5sum = 8117f10e814a13c5376af4c01e6546d4
+mode = 0644
+
+[template-apache-php]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-apache-php.cfg
+output = ${buildout:directory}/template-apache-php.cfg
+md5sum = 45bc82dc468e7f418d95c846d1a33d74
+mode = 0644
+
+[template-apache-backup]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-apache-backup.cfg
+output = ${buildout:directory}/template-apache-backup.cfg
+md5sum = cfb77ac8785e0d125a785f69a5339014
+mode = 0644
+
+[template-backuped]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-backuped.cfg
+output = ${buildout:directory}/template-backuped.cfg
+md5sum = f43d1c6412ea8dc83b75573dc00daf9e
+mode = 0644
+
+[template-mariadb]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-mariadb.cfg
+output = ${buildout:directory}/template-mariadb.cfg
+md5sum = 70ab558c2e925c3627c39fbc20a7501c
+mode = 0644
+
+[template-mariadb-pbsready]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-mariadb-pbsready.cfg
+output = ${buildout:directory}/template-mariadb-pbsready.cfg
+md5sum = d2a580dcd7efdd528be45c5ffadfe760
+mode = 0644
+
+[template-mariadb-pbsready-import]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-mariadb-pbsready-import.cfg
+output = ${buildout:directory}/template-mariadb-pbsready-import.cfg
+md5sum = 4a96ff02da3898fef7077fa8baec81ac
+mode = 0644
+
+[template-mariadb-pbsready-export]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-mariadb-pbsready-export.cfg
+output = ${buildout:directory}/template-mariadb-pbsready-export.cfg
+md5sum = 11a9e45e8bc590bc11bfdd304b07a4a5
+mode = 0644
+
+[template-pull-backup]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-pull-backup.cfg
+output = ${buildout:directory}/template-pull-backup.cfg
+md5sum = 9aab30ba5aa23a37d4b507e7c414be00
+mode = 0644
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  slapos.toolbox

stack/lamp/instance-apache-backup.cfg

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

stack/lamp/instance-apache-php.cfg

+[buildout]
+
+parts =
+  url
+  request-mariadb
+  apache-php
+  stunnel
+  certificate-authority
+  ca-stunnel
+  logrotate
+  logrotate-entry-apache
+  logrotate-entry-stunnel
+  cron
+  cron-entry-logrotate
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[url]
+recipe = slapos.cookbook:publishurl
+url = http://[$${apache-php:ip}]:$${apache-php:port}/
+
+[mariadb-urlparse]
+recipe = slapos.cookbook:urlparse
+url = $${request-mariadb:connection-url}
+
+[apache-php]
+recipe = slapos.cookbook:apachephp
+source = ${application:location}
+template = ${application-template:location}/${application-template:filename}
+configuration = ${application-configuration:location}
+
+htdocs = $${directory:htdocs}
+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
+
+promise = $${basedirectory:promises}/apache
+
+httpd-binary = ${apache:location}/bin/httpd
+
+mysql-username = $${mariadb-urlparse:username}
+mysql-password = $${mariadb-urlparse:password}
+mysql-database = $${mariadb-urlparse:path}
+mysql-host = $${stunnel:local-host}
+mysql-port = $${stunnel:local-port}
+
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = ${openssl:location}/bin/openssl
+ca-dir = $${directory:ca-dir}
+requests-directory = $${cadirectory:requests}
+wrapper = $${basedirectory:services}/ca
+ca-private = $${cadirectory:private}
+ca-certs = $${cadirectory:certs}
+ca-newcerts = $${cadirectory:newcerts}
+ca-crl = $${cadirectory:crl}
+
+[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-stunnel]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+executable = $${stunnel:wrapper}
+wrapper = $${basedirectory:services}/stunnel
+key-file = $${stunnel:key-file}
+cert-file = $${stunnel:cert-file}
+
+[stunnel]
+recipe = slapos.cookbook:stunnel
+client = true
+stunnel-binary = ${stunnel:location}/bin/stunnel
+remote-host = $${mariadb-urlparse:host}
+remote-port = $${mariadb-urlparse:port}
+local-host = $${slap-network-information:local-ipv4}
+local-port = 3306
+log-file = $${basedirectory:log}/stunnel.log
+config-file = $${directory:stunnel-conf}/stunnel.conf
+key-file = $${directory:stunnel-conf}/stunnel.key
+cert-file = $${directory:stunnel-conf}/stunnel.crt
+pid-file = $${basedirectory:run}/stunnel.pid
+wrapper = $${rootdirectory:bin}/raw_stunnel
+post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate
+
+[request-mariadb]
+<= slap-connection
+recipe = slapos.cookbook:request
+name = MariaDB
+software-url = $${slap-connection:software-release-url}
+software-type = mariadb
+return = url
+
+[logrotate]
+recipe = slapos.cookbook:logrotate
+# Binaries
+logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
+gzip-binary = ${gzip:location}/bin/gzip
+gunzip-binary = ${gzip:location}/bin/gunzip
+# Directories
+wrapper = $${rootdirectory:bin}/logrotate
+conf = $${rootdirectory:etc}/logrotate.conf
+logrotate-entries = $${directory:logrotate-entries}
+backup = $${directory:logrotate-backup}
+state-file = $${rootdirectory:srv}/logrotate.status
+
+[logrotate-entry-apache]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = apache
+log = $${apache-php:error-log} $${apache-php:access-log}
+frequency = daily
+rotate-num = 30
+sharedscripts = true
+notifempty = true
+create = true
+
+[logrotate-entry-stunnel]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = stunnel
+log = $${stunnel:log-file}
+frequency = daily
+rotate-num = 30
+notifempty = true
+create = true
+post = $${stunnel:post-rotate-script}
+
+[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
+
+[cron-entry-logrotate]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+command = $${logrotate:wrapper}
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+var = $${buildout:directory}/var/
+srv = $${buildout:directory}/srv/
+bin = $${buildout:directory}/bin/
+tmp = $${buildout:directory}/tmp/
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = $${rootdirectory:var}/log/
+services = $${rootdirectory:etc}/run/
+run = $${rootdirectory:var}/run/
+backup = $${rootdirectory:srv}/backup/
+promises = $${rootdirectory:etc}/promise/
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+ca-dir = $${rootdirectory:srv}/ssl/
+htdocs = $${rootdirectory:srv}/www/
+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/
+stunnel-conf = $${rootdirectory:etc}/stunnel/
+cronstamps = $${rootdirectory:etc}/cronstamps/
+cron-entries = $${rootdirectory:etc}/cron.d/
+crontabs = $${rootdirectory:etc}/crontabs/

stack/lamp/instance-backuped.cfg

+[buildout]
+
+extends =
+  ${template-apache-php:output}
+
+parts =
+  request-mariadb
+  request-mariadb-pseudo-replicating
+  request-apache-backup
+  request-pull-backup-server
+  request-pull-backup-server-mariadb
+  request-pull-backup-server-mariadb-backup
+  request-pull-backup-server-apache
+  request-pull-backup-server-apache-backup
+  url
+  apache-php
+  stunnel
+  certificate-authority
+  ca-stunnel
+  logrotate
+  logrotate-entry-apache
+  logrotate-entry-stunnel
+  cron
+  cron-entry-logrotate
+  dropbear-server
+  sshkeys-authority
+  dropbear-server-pbs-authorized-key
+
+[sshkeys-directory]
+recipe = slapos.cookbook:mkdirectory
+requests = $${directory:sshkeys}/requests/
+keys = $${directory:sshkeys}/keys/
+
+[sshkeys-authority]
+recipe = slapos.cookbook:sshkeys_authority
+request-directory = $${sshkeys-directory:requests}
+keys-directory = $${sshkeys-directory:keys}
+wrapper = $${basedirectory:services}/sshkeys_authority
+keygen-binary = ${dropbear:location}/bin/dropbearkey
+
+[sshkeys-dropbear]
+<= sshkeys-authority
+recipe = slapos.cookbook:sshkeys_authority.request
+name = dropbear
+type = rsa
+executable = $${dropbear-server:wrapper}
+public-key = $${dropbear-server:rsa-keyfile}.pub
+private-key = $${dropbear-server:rsa-keyfile}
+wrapper = $${basedirectory:services}/sshd
+
+[dropbear-server]
+recipe = slapos.cookbook:dropbear
+host = $${slap-network-information:global-ipv6}
+port = 2222
+home = $${directory:ssh}
+wrapper = $${rootdirectory:bin}/raw_sshd
+shell = $${rdiff-backup-server:wrapper}
+rsa-keyfile = $${directory:ssh}/server_key.rsa
+dropbear-binary = ${dropbear:location}/sbin/dropbear
+
+[dropbear-server-pbs-authorized-key]
+<= dropbear-server
+recipe = slapos.cookbook:dropbear.add_authorized_key
+key = $${request-pull-backup-server:connection-ssh-key}
+
+[rdiff-backup-server]
+recipe = slapos.cookbook:pbs
+client = false
+path = $${directory:htdocs}
+wrapper = $${rootdirectory:bin}/rdiffbackup-server
+rdiffbackup-binary = ${buildout:bin-directory}/rdiff-backup
+
+[request-pull-backup-server]
+<= slap-connection
+recipe = slapos.cookbook:request
+name = PBS (Pull Backup Server)
+software-url = $${slap-connection:software-release-url}
+software-type = pull-backup
+return = ssh-key notification-url feeds-url
+slave = false
+
+[request-mariadb]
+software-type = mariadb-pbsready-export
+config = authorized-key notify
+config-authorized-key = $${request-pull-backup-server:connection-ssh-key}
+config-notify = $${request-pull-backup-server:connection-notification-url}
+return = url ssh-public-key ssh-url notification-id
+
+[request-mariadb-pseudo-replicating]
+<= slap-connection
+recipe = slapos.cookbook:request
+name = MariaDB Backup
+software-url = $${slap-connection:software-release-url}
+software-type = mariadb-pbsready-import
+return = url ssh-public-key ssh-url notification-url
+config = authorized-key on-notification
+config-authorized-key = $${request-pull-backup-server:connection-ssh-key}
+pbs-notification-id = $${slap-connection:computer-id}-$${slap-connection:partition-id}-mariadb-push
+config-on-notification = $${request-pull-backup-server:connection-feeds-url}$${:pbs-notification-id}
+
+[request-apache-backup]
+<= slap-connection
+recipe = slapos.cookbook:request
+name = Apache Backup
+software-url = $${slap-connection:software-release-url}
+software-type = apache-backup
+return = url ssh-url ssh-public-key
+config = authorized-key proxy-url
+config-authorized-key = $${request-pull-backup-server:connection-ssh-key}
+config-proxy-url = $${url:url}
+
+[request-pull-backup-server-apache]
+<= request-pull-backup-server
+   slap-connection
+recipe = slapos.cookbook:request
+name = PBS pulling from Apache
+software-url = $${slap-connection:software-release-url}
+config = url name type server-key notify notification-id frequency
+config-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path}
+config-name = $${slap-connection:computer-id}-$${slap-connection:partition-id}-apache
+config-type = pull
+config-server-key = $${sshkeys-dropbear:public-key-value}
+config-notify = $${request-pull-backup-server:connection-notification-url}
+config-notification-id = $${slap-connection:computer-id}-$${slap-connection:partition-id}-apache-pull
+config-frequency = 30 * * * *
+slave = true
+
+[request-pull-backup-server-apache-backup]
+<= request-pull-backup-server
+   slap-connection
+recipe = slapos.cookbook:request
+name = PBS pushing to $${request-apache-backup:name}
+software-url = $${slap-connection:software-release-url}
+config = url name type server-key on-notification
+config-url = $${request-apache-backup:connection-ssh-url}
+config-name = $${request-pull-backup-server-apache:config-name}
+config-type = push
+config-server-key = $${request-apache-backup:connection-ssh-public-key}
+config-on-notification = $${request-pull-backup-server:connection-feeds-url}$${request-pull-backup-server-apache:config-notification-id}
+slave = true
+
+[request-pull-backup-server-mariadb]
+<= request-pull-backup-server
+   slap-connection
+name = PBS pulling from $${request-mariadb:name}
+config = url name type server-key on-notification notify notification-id title
+config-url = $${request-mariadb:connection-ssh-url}
+config-name = $${slap-connection:computer-id}-$${slap-connection:partition-id}-mariadb
+config-type = pull
+config-server-key = $${request-mariadb:connection-ssh-public-key}
+config-on-notification = $${request-mariadb:connection-notification-id}
+config-notify = $${request-pull-backup-server:connection-notification-url}
+config-notification-id = $${slap-connection:computer-id}-$${slap-connection:partition-id}-mariadb-pull
+config-title = Pulling from MariaDB
+slave = true
+
+[request-pull-backup-server-mariadb-backup]
+<= request-pull-backup-server
+   slap-connection
+name = PBS pushing on $${request-mariadb-pseudo-replicating:name}
+config = url name type server-key on-notification notify notification-id title
+config-url = $${request-mariadb-pseudo-replicating:connection-ssh-url}
+config-name = $${request-pull-backup-server-mariadb:config-name}
+config-type = push
+config-server-key = $${request-mariadb-pseudo-replicating:connection-ssh-public-key}
+config-on-notification = $${request-pull-backup-server:connection-feeds-url}$${request-pull-backup-server-mariadb:config-notification-id}
+config-notify = $${request-mariadb-pseudo-replicating:connection-notification-url}
+config-notification-id = $${request-mariadb-pseudo-replicating:pbs-notification-id}
+config-title = Pushing to MariaDB backup
+slave = true
+
+[directory]
+ssh = $${rootdirectory:etc}/ssh/
+sshkeys = $${rootdirectory:srv}/sshkeys

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

+[buildout]
+extends = ${template-mariadb-pbsready:output}
+
+parts += cron-entry-mariadb-backup
+
+[urls]
+notification-id = http://[$${notifier:host}]:$${notifier:port}/get/$${notifier-mydumper:name}
+
+[mydumper]
+recipe = slapos.cookbook:mydumper
+wrapper = $${rootdirectory:bin}/raw_mydumper
+backup-directory = $${directory:mariadb-backup}
+socket = $${mariadb:socket}
+user = root
+mydumper-binary = ${mydumper:location}/bin/mydumper
+database = $${mariadb:database}
+import = false
+
+[notifier-mydumper]
+<= notifier
+recipe = slapos.cookbook:notifier.notify
+name = mydumper
+title = Dumping MariaDB Database
+executable = $${mydumper:wrapper}
+wrapper = $${rootdirectory:bin}/mydumper
+notify = $${slap-parameter:notify}
+
+[cron-entry-mariadb-backup]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = backup
+frequency = 0 * * * *
+command = $${notifier-mydumper:wrapper}

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

+[buildout]
+
+extends = ${template-mariadb-pbsready:output}
+
+parts += mariadb-import-on-notification
+
+[urls]
+notification-url = http://[$${notifier:host}]:$${notifier:port}/notify
+
+[mydumper-import]
+recipe = slapos.cookbook:mydumper
+wrapper = $${rootdirectory:bin}/myloader
+backup-directory = $${directory:mariadb-backup}
+socket = $${mariadb:socket}
+user = root
+myloader-binary = ${mydumper:location}/bin/myloader
+database = $${mariadb:database}
+import = true
+
+[mariadb-import-on-notification]
+<= notifier
+recipe = slapos.cookbook:notifier.callback
+on-notification-id = $${slap-parameter:on-notification}
+callback = $${mydumper-import:wrapper}

stack/lamp/instance-mariadb-pbsready.cfg

+[buildout]
+
+extends = ${template-mariadb:output}
+
+parts =
+  urls
+  mariadb
+  stunnel
+  certificate-authority
+  ca-stunnel
+  logrotate
+  logrotate-entry-mariadb
+  logrotate-entry-stunnel
+  logrotate-entry-cron
+  logrotate-entry-equeue
+  cron
+  cron-entry-logrotate
+  sshkeys-authority
+  dropbear-server
+  sshkeys-dropbear
+  dropbear-server-pbs-authorized-key
+  notifier
+
+[urls]
+ssh-public-key = $${sshkeys-dropbear:public-key-value}
+ssh-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path}
+
+[sshkeys-directory]
+recipe = slapos.cookbook:mkdirectory
+requests = $${directory:sshkeys}/requests/
+keys = $${directory:sshkeys}/keys/
+
+[sshkeys-authority]
+recipe = slapos.cookbook:sshkeys_authority
+request-directory = $${sshkeys-directory:requests}
+keys-directory = $${sshkeys-directory:keys}
+wrapper = $${basedirectory:services}/sshkeys_authority
+keygen-binary = ${dropbear:location}/bin/dropbearkey
+
+[sshkeys-dropbear]
+<= sshkeys-authority
+recipe = slapos.cookbook:sshkeys_authority.request
+name = dropbear
+type = rsa
+executable = $${dropbear-server:wrapper}
+public-key = $${dropbear-server:rsa-keyfile}.pub
+private-key = $${dropbear-server:rsa-keyfile}
+wrapper = $${basedirectory:services}/sshd
+
+[dropbear-server]
+recipe = slapos.cookbook:dropbear
+host = $${slap-network-information:global-ipv6}
+port = 2222
+home = $${directory:ssh}
+wrapper = $${rootdirectory:bin}/raw_sshd
+shell = $${rdiff-backup-server:wrapper}
+rsa-keyfile = $${directory:ssh}/server_key.rsa
+dropbear-binary = ${dropbear:location}/sbin/dropbear
+
+[dropbear-server-pbs-authorized-key]
+<= dropbear-server
+recipe = slapos.cookbook:dropbear.add_authorized_key
+key = $${slap-parameter:authorized-key}
+
+[rdiff-backup-server]
+recipe = slapos.cookbook:pbs
+client = false
+path = $${directory:mariadb-backup}
+wrapper = $${rootdirectory:bin}/rdiffbackup-server
+rdiffbackup-binary = ${buildout:bin-directory}/rdiff-backup
+
+[logrotate-entry-equeue]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = equeue
+log = $${equeue:log}
+frequency = daily
+rotate-num = 30
+
+[equeue]
+recipe = slapos.cookbook:equeue
+socket = $${basedirectory:run}/equeue.sock
+log = $${basedirectory:log}/equeue.log
+database = $${rootdirectory:srv}/equeue.db
+wrapper = $${basedirectory:services}/equeue
+equeue-binary = ${buildout:bin-directory}/equeue
+
+[notifier]
+recipe = slapos.cookbook:notifier
+feeds = $${directory:notifier-feeds}
+callbacks = $${directory:notifier-callbacks}
+id-file = $${rootdirectory:etc}/notifier.id
+equeue-socket = $${equeue:socket}
+host = $${slap-network-information:global-ipv6}
+port = 8080
+wrapper = $${basedirectory:services}/notifier
+server-binary = ${buildout:bin-directory}/pubsubserver
+notifier-binary = ${buildout:bin-directory}/pubsubnotifier
+
+
+[basedirectory]
+cache = $${rootdirectory:var}/cache/
+notifier = $${rootdirectory:etc}/notifier/
+
+[directory]
+mariadb-backup = $${basedirectory:backup}/mariadb/
+ssh = $${rootdirectory:etc}/ssh/
+sshkeys = $${rootdirectory:srv}/sshkeys
+notifier-feeds = $${basedirectory:notifier}/feeds/
+notifier-callbacks = $${basedirectory:notifier}/callbacks/

stack/lamp/instance-mariadb.cfg

+[buildout]
+parts =
+  urls
+  mariadb
+  stunnel
+  certificate-authority
+  ca-stunnel
+  logrotate
+  logrotate-entry-mariadb
+  logrotate-entry-stunnel
+  logrotate-entry-cron
+  cron
+  cron-entry-logrotate
+
+gzip-binary = ${gzip:location}/bin/gzip
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[urls]
+recipe = slapos.cookbook:publish
+url = mysqls://$${mariadb:user}:$${mariadb:password}@[$${stunnel:remote-host}]:$${stunnel:remote-port}/$${mariadb:database}
+
+[mariadb]
+recipe = slapos.cookbook:mysql
+
+# Options
+recovering = false
+user = user
+port = 3306
+ip = $${slap-network-information:local-ipv4}
+database = db
+
+# Paths
+wrapper = $${basedirectory:services}/mariadb
+update-wrapper = $${basedirectory:services}/mariadb_update
+logrotate-post = $${rootdirectory:bin}/mariadb_post_logrotate
+data-directory = $${directory:mariadb-data}
+pid-file = $${basedirectory:run}/mariadb.pid
+socket = $${basedirectory:run}/mariadb.sock
+error-log = $${basedirectory:log}/mariadb_error.log
+conf-file = $${rootdirectory:etc}/mariadb.cnf
+promise = $${basedirectory:promises}/mysql
+
+# Binary information
+mysql-binary = ${mariadb:location}/bin/mysql
+mysql-install-binary = ${mariadb:location}/bin/mysql_install_db
+mysql-upgrade-binary = ${mariadb:location}/bin/mysql_upgrade
+mysqld-binary = ${mariadb:location}/libexec/mysqld
+
+
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = ${openssl:location}/bin/openssl
+ca-dir = $${directory:ca-dir}
+requests-directory = $${cadirectory:requests}
+wrapper = $${basedirectory:services}/ca
+ca-private = $${cadirectory:private}
+ca-certs = $${cadirectory:certs}
+ca-newcerts = $${cadirectory:newcerts}
+ca-crl = $${cadirectory:crl}
+
+[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-stunnel]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+executable = $${stunnel:wrapper}
+wrapper = $${basedirectory:services}/stunnel
+key-file = $${stunnel:key-file}
+cert-file = $${stunnel:cert-file}
+
+[stunnel]
+recipe = slapos.cookbook:stunnel
+stunnel-binary = ${stunnel:location}/bin/stunnel
+wrapper = $${rootdirectory:bin}/stunnel
+log-file = $${basedirectory:log}/stunnel.log
+config-file = $${directory:stunnel-conf}/stunnel.conf
+key-file = $${directory:stunnel-conf}/stunnel.key
+cert-file = $${directory:stunnel-conf}/stunnel.crt
+pid-file = $${basedirectory:run}/stunnel.pid
+local-host = $${mariadb:ip}
+local-port = $${mariadb:port}
+remote-host = $${slap-network-information:global-ipv6}
+remote-port = 6446
+client = false
+post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate
+
+[logrotate]
+recipe = slapos.cookbook:logrotate
+# Binaries
+logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
+gzip-binary = $${buildout:gzip-binary}
+gunzip-binary = ${gzip:location}/bin/gunzip
+# Directories
+wrapper = $${rootdirectory:bin}/logrotate
+conf = $${rootdirectory:etc}/logrotate.conf
+logrotate-entries = $${directory:logrotate-entries}
+backup = $${directory:logrotate-backup}
+state-file = $${rootdirectory:srv}/logrotate.status
+
+[logrotate-entry-mariadb]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = mariadb
+log = $${mariadb:error-log}
+frequency = daily
+rotate-num = 30
+post = $${mariadb:logrotate-post}
+sharedscripts = true
+notifempty = true
+create = true
+
+[logrotate-entry-stunnel]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = stunnel
+log = $${stunnel:log-file}
+frequency = daily
+rotate-num = 30
+notifempty = true
+create = true
+post = $${stunnel:post-rotate-script}
+
+[logrotate-entry-cron]
+<= logrotate
+recipe =slapos.cookbook:logrotate.d
+name = crond
+log = $${cron-simplelogger:log}
+frequency = daily
+rotate-num = 30
+notifempty = true
+create = true
+
+[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
+
+[cron-entry-logrotate]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+command = $${logrotate:wrapper}
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+var = $${buildout:directory}/var/
+srv = $${buildout:directory}/srv/
+bin = $${buildout:directory}/bin/
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = $${rootdirectory:var}/log/
+services = $${rootdirectory:etc}/run/
+run = $${rootdirectory:var}/run/
+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/
+mariadb-data = $${rootdirectory:srv}/mariadb/
+logrotate-backup = $${basedirectory:backup}/logrotate/
+stunnel-conf = $${rootdirectory:etc}/stunnel/
+logrotate-entries = $${rootdirectory:etc}/logrotate.d/

stack/lamp/instance-pull-backup.cfg

+[buildout]
+
+parts =
+    connection-dict
+    pbs
+    cron
+    cron-entry-logrotate
+    logrotate
+    sshkeys-authority
+    sshkeys-dropbear
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[connection-dict]
+recipe = slapos.cookbook:publish
+ssh-key = $${sshkeys-dropbear:public-key-value}
+notification-url = http://[$${notifier:host}]:$${notifier:port}/notify
+feeds-url = http://[$${notifier:host}]:$${notifier:port}/get/
+
+[equeue]
+recipe = slapos.cookbook:equeue
+socket = $${basedirectory:run}/equeue.sock
+log = $${basedirectory:log}/equeue.log
+database = $${rootdirectory:srv}/equeue.db
+wrapper = $${basedirectory:services}/equeue
+equeue-binary = ${buildout:bin-directory}/equeue
+
+[notifier]
+recipe = slapos.cookbook:notifier
+feeds = $${directory:notifier-feeds}
+callbacks = $${directory:notifier-callbacks}
+id-file = $${rootdirectory:etc}/notifier.id
+equeue-socket = $${equeue:socket}
+host = $${slap-network-information:global-ipv6}
+port = 8080
+wrapper = $${basedirectory:services}/notifier
+server-binary = ${buildout:bin-directory}/pubsubserver
+notifier-binary = ${buildout:bin-directory}/pubsubnotifier
+
+[dropbear-client]
+recipe = slapos.cookbook:dropbear.client
+dbclient-binary = ${dropbear:location}/bin/dbclient
+wrapper = $${rootdirectory:bin}/ssh
+home = $${basedirectory:ssh-home}
+identity-file = $${basedirectory:ssh-home}/id_rsa
+
+[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}
+keygen-binary = ${dropbear:location}/bin/dropbearkey
+wrapper = $${basedirectory:services}/sshkeys_authority
+
+[sshkeys-dropbear]
+<= sshkeys-authority
+recipe = slapos.cookbook:sshkeys_authority.request
+name = pbs
+type = rsa
+executable = $${dropbear-client:wrapper}
+public-key = $${dropbear-client:identity-file}.pub
+private-key = $${dropbear-client:identity-file}
+wrapper = $${rootdirectory:bin}/do_backup
+
+[pbs]
+<= notifier
+recipe = slapos.cookbook:pbs
+client = true
+rdiffbackup-binary = ${buildout:bin-directory}/rdiff-backup
+sshclient-binary = $${dropbear-client:wrapper}
+known-hosts = $${directory:dot-ssh}/known_hosts
+promises-directory = $${basedirectory:promises}
+directory = $${directory:pbs-backup}
+cron-entries = $${cron:cron-entries}
+wrappers-directory = $${directory:pbs-wrappers}
+notifier-url = http://[$${notifier:host}]:$${notifier:port}/
+slave-instance-list = $${slap-parameter:slave_instance_list}
+
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = $${rootdirectory:bin}/cron_simplelogger
+log = $${basedirectory: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 = $${basedirectory:services}/crond
+
+[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}/sbin/logrotate
+gzip-binary = ${gzip:location}/bin/gzip
+gunzip-binary = ${gzip:location}/bin/gunzip
+# Directories
+wrapper = $${rootdirectory:bin}/logrotate
+conf = $${rootdirectory:etc}/logrotate.conf
+logrotate-entries = $${directory:logrotate-entries}
+backup = $${directory:logrotate-backup}
+state-file = $${rootdirectory:srv}/logrotate.status
+
+[logrotate-entry-equeue]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = equeue
+log = $${equeue:log}
+frequency = daily
+rotate-num = 30
+
+[logrotate-entry-equeue]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = cron
+log = $${cron-simplelogger:log}
+frequency = daily
+rotate-num = 30
+
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+var = $${buildout:directory}/var/
+srv = $${buildout:directory}/srv/
+bin = $${buildout:directory}/bin/
+tmp = $${buildout:directory}/tmp/
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = $${rootdirectory:var}/log/
+services = $${rootdirectory:etc}/run/
+run = $${rootdirectory:var}/run/
+backup = $${rootdirectory:srv}/backup/
+promises = $${rootdirectory:etc}/promise/
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+cronstamps = $${rootdirectory:etc}/cronstamps/
+cron-entries = $${rootdirectory:etc}/cron.d/
+crontabs = $${rootdirectory:etc}/crontabs/
+cronoutput = $${basedirectory:log}/cron-ouput/
+pbs-backup = $${basedirectory:backup}/pbs/
+logrotate-entries = $${rootdirectory:etc}/logrotate.d/
+logrotate-backup = $${basedirectory:backup}/logrotate/
+sshkeys = $${rootdirectory:srv}/sshkeys
+pbs-wrappers = $${rootdirectory:bin}/pbs/
+dot-ssh = $${basedirectory:ssh-home}/.ssh/
+notifier-feeds = $${basedirectory:notifier}/feeds/
+notifier-callbacks = $${basedirectory:notifier}/callbacks/
+
+[basedirectory]
+ssh-home = $${rootdirectory:home}/ssh
+notifier = $${rootdirectory:etc}/notifier/
+
+[rootdirectory]
+home = $${buildout:directory}/home/

software/wordpress/instance.cfg → stack/lamp/instance.cfg

@@ -8,5 +8,10 @@ offline = true
 
 [switch_softwaretype]
 recipe = slapos.cookbook:softwaretype
-default = ${instance_wordpress:output}
-mariadb = ${instance_mariadb:output}
+default = ${template-apache-php:output}
+backuped = ${template-backuped:output}
+mariadb = ${template-mariadb:output}
+mariadb-pbsready-import = ${template-mariadb-pbsready-import:output}
+mariadb-pbsready-export = ${template-mariadb-pbsready-export:output}
+pull-backup = ${template-pull-backup:output}
+apache-backup = ${template-apache-backup:output}

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