Merge branch 'master' into grid-computing

Conflicts:
	setup.py

CHANGES.txt

 Changes
 =======
 
-0.61 (Unreleased)
+0.66 (2012-09-10)
+-----------------
+
+  * Add check_page_content promise generator. [Cedric Le Ninivin]
+
+0.65 (2012-09-07)
+-----------------
+
+  * Add egg_test, recipe allowing to do "python setup.py test" on a list of
+    eggs. [Rafael Monnerat, Cedric de Saint Martin]
+
+0.64.2 (2012-08.28)
+-------------------
+
+  * Specify description on gitinit recipe. [Antoine Catton]
+
+0.64.1 (2012-08-28)
+-------------------
+
+  * Fix: minor fix on downloader recipe in order to allow cross-device renaming.
+    [Antoine Catton]
+
+0.64 (2012-08-27)
+----------------
+
+  * Fix: remove "template" recipe which was collinding with slapos.recipe.template.
+    [Antoine Catton]
+
+0.63 (2012-08-22)
+----------------
+
+  * Add the ability to run command line in shellinabox. [Antoine Catton]
+  * Add the ability to run shellinabox as root. (for LXC purpose) [Antoine Catton]
+  * Add "uuid" recipe. [Antoine Catton]
+  * Add "downloader" recipe. [Antoine Catton]
+
+0.62 (2012-08-21)
+-----------------
+
+  * Add "wrapper" recipe. [Antoine Catton]
+  * Add "gitinit" recipe. [Antoine Catton]
+  * librecipe.execute code clean up and factorization. [Antoine Catton]
+  * Add "template" recipe. [Antoine Catton]
+
+0.61 (2012-08-17)
 -----------------
 
   * Add "debug" option for slaprunner. [Alain Takoudjou]
@@ -103,7 +147,7 @@ Changes
     [Cedric de Saint Martin]
   * Apache Frontend: listens to plain http port as well to redirect to https.
     [Cedric de Saint Martin]
-  
+
 0.49 (2012-05-10)
 -----------------
 
@@ -169,7 +213,7 @@ Changes
 -----------------
 
  * apache_frontend initial release. [Cedric de Saint Martin]
- 
+
 0.39 (2012-02-20)
 -----------------
 
@@ -222,7 +266,7 @@ Changes
 0.32 (2011-10-28)
 -----------------
 
-  * LAMP : Recipe can now call lampconfigure from slapos.toolbox which will 
+  * LAMP : Recipe can now call lampconfigure from slapos.toolbox which will
    configure PHP application instance when needed. [Alain Takoudjou Kamdem]
 
 0.31 (2011-10-16)

component/apache/buildout.cfg

@@ -30,10 +30,10 @@ md5sum = 52b31b33fb1aa16e65ddaefc76e41151
 recipe = hexagonit.recipe.cmmi
 depends =
   ${gdbm:version}
-version = 2.4.2
+version = 2.4.3
 revision = 1
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 6bb12f726e22656f0ad2baf91f1f8329
+md5sum = 87aaf7bc7e8715f0455997bb8c6791aa
 configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
 configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
                     --disable-static

component/attr/buildout.cfg

+[buildout]
+
+parts = attr
+
+[attr]
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.igh.cnrs.fr/pub/nongnu/attr/attr-2.4.46.src.tar.gz
+md5sum = db557c17fdfa4f785333ecda08654010
+configure-options =
+    --enable-shared=yes
+    --enable-gettext=no
+make-targets = install install-lib install-dev

component/busybox/buildout.cfg

 [buildout]
-extends =
-  ../patch/buildout.cfg
 
-# https://bugs.busybox.net/show_bug.cgi?id=4838
-[busybox-1.19.3.packed_hack.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = faa5ce46be086763202d7ca24601fbde
-filename = busybox-1.19.3.packed_hack.patch
-download-only = true
+parts = busybox
 
 [busybox]
 recipe = slapos.recipe.build
-url = http://busybox.net/downloads/busybox-1.19.4.tar.bz2
-md5sum = 9c0cae5a0379228e7b55e5b29528df8e
-patch-binary = ${patch:location}/bin/patch
-patch-options = -p1
-patches =
-  ${busybox-1.19.3.packed_hack.patch:location}/${busybox-1.19.3.packed_hack.patch:filename}
+url = http://git.busybox.net/busybox/snapshot/busybox-1_20_1.tar.gz
+md5sum = 15758fc37ae8051d6def1b8afb691821
 script =
     extract_dir = self.extract(self.download(%(url)r, %(md5sum)r))
     workdir = guessworkdir(extract_dir)
-    self.applyPatchList(self.options.get('patches'), self.options.get('patch-options'), self.options.get('patch-binary'), workdir)
-    call(['patch', 'defconfig'], cwd=workdir, env=env)
     self.logger.info("Creating default configuration")
     call(['make', 'defconfig'], cwd=workdir, env=env)
     self.logger.info("Building")

component/busybox/busybox-1.19.3.packed_hack.patch

-diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
-index 2a426db..35f44ac 100644
---- a/miscutils/ubi_tools.c
-+++ b/miscutils/ubi_tools.c
-@@ -60,6 +60,16 @@
- //kbuild:lib-$(CONFIG_UBIUPDATEVOL) += ubi_tools.o
- 
- #include "libbb.h"
-+#if 1
-+// __packed hack for broken kernel headers ubi-user.h
-+// See: https://lkml.org/lkml/2011/6/22/25
-+//   Once ubi-user.h is correctly installed without "__packed", or kernel
-+//   guys correct this another way (with a compiler header??), this can
-+//   go away.
-+# ifndef __packed
-+#  define __packed __attribute__((packed))
-+# endif // ndef __packed
-+#endif // 1
- #include <mtd/ubi-user.h>
- 
- #define OPTION_M  (1 << 0)

component/cloud9/buildout.cfg

@@ -16,11 +16,27 @@ parts =
 
 [node-sm]
 recipe = slapos.recipe.build:npm
-packages = sm
+packages = sm@0.2.7
 node = nodejs
 environment =
   PATH=${nodejs:location}/bin:%(PATH)s
 
+[cloud9-stable]
+# Online IDE written in javascript/node.js
+# URL : c9.io
+# You can use it using the following command :
+# NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location} 
+recipe = plone.recipe.command
+stop-on-error = true
+commit = 97db1467c517d265438684bd2a70b0b76ee282f6
+repository = https://github.com/ajaxorg/cloud9.git
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+git-binary = ${git:location}/bin/git
+npm-binary = ${nodejs-0.4:location}/bin/node ${npm:location}/bin/npm
+command = export GIT_SSL_NO_VERIFY=true; export HOME=${:location}; (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit} && ${:git-binary} submodule update --init && cd support/jsdav && PATH=${nodejs-0.4:location}/bin:$PATH LDFLAGS=-L${libxml2:location}/lib ${:npm-binary} install) || (rm -fr ${:location}; exit 1)
+update-command =
+executable = ${:location}/bin/cloud9.js
+
 [cloud9-git]
 # Online IDE written in javascript/node.js
 # URL : c9.io
@@ -28,12 +44,13 @@ environment =
 # NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location} 
 recipe = plone.recipe.command
 stop-on-error = true
-commit = 1f46081df51e6654cef17c205fbf589b219133a7
+commit = c66284221143c175fc889418d499da6f37492a7c
 repository = https://github.com/ajaxorg/cloud9.git
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 environment = export GIT_SSL_NO_VERIFY=true; export PATH=${git:location}/bin:${nodejs:location}/bin:${node-sm:location}/node_modules/sm/bin:$PATH; export CPPFLAGS="-I${libxml2:location}/include -I${nodejs:location}/include"; export LDFLAGS="-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib"; export HOME=${:location};
 command = ${:environment} (git clone --quiet ${:repository} ${:location} && cd ${:location} && git reset --hard ${:commit} && ${node-sm:location}/node_modules/.bin/sm install) || (rm -fr ${:location}; exit 1)
 update-command =
+executable = ${:location}/server.js
 
 [cloud9-npm]
 # Online IDE written in javascript/node.js
@@ -48,4 +65,4 @@ packages =
   cloud9==0.7
 # Specify environment jsDAV (dependency of cloud9) needs libxml2
 environment = 
-  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib
\ No newline at end of file
+  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib

component/git/buildout.cfg

@@ -21,9 +21,13 @@ configure-options =
   --with-expat=${libexpat:location}
   --without-python
   --without-tcltk
-
 environment =
   NO_PERL=y
   PATH=${curl:location}/bin:${gettext:location}/bin:%(PATH)s
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib
+
+[gitweb]
+<= git
+make-targets = install-gitweb
+make-options = bindir="${git:location}/bin/"

component/imagemagick/buildout.cfg

@@ -28,8 +28,8 @@ filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
 
 [imagemagick]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.8-6.tar.bz2
-md5sum = e9d90a09b42fe8d9a8cf807274adff30
+url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.8-8.tar.bz2
+md5sum = 4e5c8f102f3e7401587c924f5b4bca15
 depends =
   ${libtiff:version}
   ${librsvg:version}

component/libcap/buildout.cfg

+[buildout]
+
+extends =
+  ../attr/buildout.cfg
+
+parts = libcap
+
+[libcap2]
+recipe = slapos.recipe.build
+format = no
+url = http://pkgs.fedoraproject.org/lookaside/pkgs/libcap/libcap-2.22.tar.bz2/ce64058bdb3f086ddbfca8ce6c919845/libcap-2.22.tar.bz2
+md5sum = ce64058bdb3f086ddbfca8ce6c919845
+attr-include = ${attr:location}/include/
+attr-lib = ${attr:location}/lib/
+slapos_promise =
+  directory:sbin
+  directory:usr/include
+  statlib:lib/libcap.a
+  file:lib/libcap.so
+  file:sbin/getcap
+  file:sbin/setcap
+script =
+  import os
+  url = self.download(self.options['url'], self.options['md5sum'])
+  extract_dir = self.extract(url)
+  workdir = guessworkdir(extract_dir)
+  cflags = '-I%(attr)s' % {'attr': self.options['attr-include']}
+  ldflags = '-L%(attr)s -Wl,-rpath=%(attr)s' % {'attr': self.options['attr-lib']}
+  call(['make', 'CFLAGS=%s' % cflags, 'LDFLAGS=%s' % ldflags, 'DESTDIR=%s' % self.options['location'], 'RAISE_SETFCAP=no', 'install'],
+       cwd=workdir, env=env)
+  lib64 = os.path.join(self.options['location'], 'lib64')
+  lib = os.path.join(self.options['location'], 'lib')
+  # XXX: Dirty if case
+  #      if lib64 exists, then create a symlink from lib to lib64
+  os.path.exists(lib64) and os.symlink(lib64, lib)
+
+[libcap]
+<= libcap2

component/libreoffice-bin/buildout.cfg

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

component/libyaml/buildout.cfg

+[buildout]
+
+parts =
+  libyaml
+
+[libyaml]
+recipe = hexagonit.recipe.cmmi
+url = http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz
+md5sum = 36c852831d02cf90508c29852361d01b

component/lxc/buildout.cfg

+[buildout]
+
+extends =
+  ../patch/buildout.cfg
+  ../attr/buildout.cfg
+  ../libcap/buildout.cfg
+
+parts = lxc
+
+[lxc]
+<= lxc-0.8
+
+[lxc-0.8.0-rc2-libexecdir-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = libexecdir-fix.patch
+download-only = true
+md5sum = d674463ccb3a7c205c2326fb4ab5436b
+
+[lxc-0.8.0-rc2-lxc-ls-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = lxc-ls-fix.patch
+download-only = true
+md5sum = 28c155a554d4f4856351085494585c73
+
+[lxc-0.8.0-rc2-cap_get_flag-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = cap_get_flag-fix.patch
+download-only = true
+md5sum = 8d3706a9bd60b6ebfea33998644b1a99
+
+[lxc-0.8]
+recipe = hexagonit.recipe.cmmi
+url = http://lxc.sourceforge.net/download/lxc/lxc-0.8.0-rc2.tar.gz
+md5sum = 9bd6988542fd7dd198d056ef3a2db9f6
+patch-binary = ${patch:location}/bin/patch
+patch-options = -p1
+patches =
+  ${lxc-0.8.0-rc2-cap_get_flag-patch:location}/${lxc-0.8.0-rc2-cap_get_flag-patch:filename}
+  ${lxc-0.8.0-rc2-libexecdir-patch:location}/${lxc-0.8.0-rc2-libexecdir-patch:filename}
+  ${lxc-0.8.0-rc2-lxc-ls-patch:location}/${lxc-0.8.0-rc2-lxc-ls-patch:filename}
+environment =
+  PATH=%(PATH)s:${attr:location}/bin/:${libcap:location}/sbin/
+  CFLAGS=-I${libcap:location}/usr/include
+  LDFLAGS=-L${libcap:location}/lib/ -Wl,-rpath=${libcap:location}/lib/

component/lxc/cap_get_flag-fix.patch

+commit 94767c5249b5802a894f6d84f6245ef86f50bff3
+Author: Serge Hallyn <serge.hallyn@ubuntu.com>
+Date:   Fri Jun 29 10:37:07 2012 -0500
+
+    Fix lxc's handling of CAP_LAST_CAP
+    
+    CAP_LAST_CAP in linux/capability.h doesn't always match what the kernel
+    actually supports.  If the kernel supports fewer capabilities, then a
+    cap_get_flag for an unsupported capability returns -EINVAL.
+    
+    Recognize that, and don't fail when initializing capabilities when this
+    happens, rather accept that we've reached the last capability.
+    
+    Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
+
+diff --git a/src/lxc/caps.c b/src/lxc/caps.c
+index 10a0b4a..c32e7e4 100644
+--- a/src/lxc/caps.c
++++ b/src/lxc/caps.c
+@@ -28,6 +28,7 @@
+ #include <limits.h>
+ #include <sys/prctl.h>
+ #include <sys/capability.h>
++#include <errno.h>
+ 
+ #include "log.h"
+ 
+@@ -90,6 +91,7 @@ int lxc_caps_up(void)
+ 	cap_t caps;
+ 	cap_value_t cap;
+ 	int ret;
++	int lastcap = 0;
+ 
+ 	/* when we are run as root, we don't want to play
+ 	 * with the capabilities */
+@@ -108,9 +110,15 @@ int lxc_caps_up(void)
+ 
+ 		ret = cap_get_flag(caps, cap, CAP_PERMITTED, &flag);
+ 		if (ret) {
+-			ERROR("failed to cap_get_flag: %m");
+-			goto out;
++			if (errno == EINVAL) {
++				INFO("Last supported cap was %d\n", cap-1);
++				break;
++			} else {
++				ERROR("failed to cap_get_flag: %m");
++				goto out;
++			}
+ 		}
++		lastcap = cap;
+ 
+ 		ret = cap_set_flag(caps, CAP_EFFECTIVE, 1, &cap, flag);
+ 		if (ret) {

component/lxc/libexecdir-fix.patch

+commit 00ad19d4dba5c05401125d4217dc8f4e7fd9403a
+Author: David Ward <david.ward@ll.mit.edu>
+Date:   Fri May 4 00:50:15 2012 +0200
+
+    lxc-setcap/lxc-setuid: add autoconf expansion for $libexecdir
+    
+    Support new default location for LXCINITDIR.
+    
+    Signed-off-by: David Ward <david.ward@ll.mit.edu>
+    Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
+
+diff --git a/configure.ac b/configure.ac
+index c2bf4b0..0c8aa69 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,6 +40,7 @@ AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = "xyes"])
+ AS_AC_EXPAND(PREFIX, $prefix)
+ AS_AC_EXPAND(LIBDIR, $libdir)
+ AS_AC_EXPAND(BINDIR, $bindir)
++AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
+ AS_AC_EXPAND(INCLUDEDIR, $includedir)
+ AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+ AS_AC_EXPAND(DATADIR, $datadir)
+diff --git a/src/lxc/lxc-setcap.in b/src/lxc/lxc-setcap.in
+index 52d4b48..71e3710 100644
+--- a/src/lxc/lxc-setcap.in
++++ b/src/lxc/lxc-setcap.in
+@@ -84,6 +84,7 @@ lxc_dropcaps()
+ shortoptions='hd'
+ longoptions='help'
+ libdir=@LIBDIR@
++libexecdir=@LIBEXECDIR@
+ localstatedir=@LOCALSTATEDIR@
+ 
+ getopt=$(getopt -o $shortoptions --longoptions  $longoptions -- "$@")
+diff --git a/src/lxc/lxc-setuid.in b/src/lxc/lxc-setuid.in
+index 0919eac..020dfae 100644
+--- a/src/lxc/lxc-setuid.in
++++ b/src/lxc/lxc-setuid.in
+@@ -81,6 +81,7 @@ lxc_dropuid()
+ shortoptions='hd'
+ longoptions='help'
+ libdir=@LIBDIR@
++libexecdir=@LIBEXECDIR@
+ localstatedir=@LOCALSTATEDIR@
+ 
+ getopt=$(getopt -o $shortoptions --longoptions  $longoptions -- "$@")

component/lxc/lxc-ls-fix.patch

+commit 7ef0141356454503ab81460290b5dffa32c1f441
+Author: David Ward <david.ward@ll.mit.edu>
+Date:   Fri May 4 00:50:15 2012 +0200
+
+    refresh lxc-ls
+    
+    Add an '--active' option that lists active containers by searching
+    cgroups. (Otherwise, the directories in /var/lib/lxc are listed.)
+    Modify the cgroup search to only use hierarchies that contain one
+    or more subsystems. When searching, if a hierarchy contains the
+    'ns' subsystem, do not append '/lxc' to the parent cgroup.
+    
+    Add a '--help' option that prints the command syntax.
+    
+    Print error messages and help information to stderr.
+    
+    Update the documentation.
+    
+    Signed-off-by: David Ward <david.ward@ll.mit.edu>
+    Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
+
+diff --git a/doc/lxc-ls.sgml.in b/doc/lxc-ls.sgml.in
+index 3ffd4f8..d33e9b3 100644
+--- a/doc/lxc-ls.sgml.in
++++ b/doc/lxc-ls.sgml.in
+@@ -48,7 +48,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 
+   <refsynopsisdiv>
+     <cmdsynopsis>
+-      <command>lxc-ls <optional>ls option</optional>
++      <command>lxc-ls <optional>--active</optional> <optional>ls option</optional>
+       </command>
+     </cmdsynopsis>
+   </refsynopsisdiv>
+@@ -67,6 +67,17 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 
+       <varlistentry>
+ 	<term>
++	  <option><optional>--active</optional></option>
++	</term>
++	<listitem>
++	  <para>
++	    List active containers.
++	  </para>
++	</listitem>
++      </varlistentry>
++
++      <varlistentry>
++	<term>
+ 	  <option><optional>ls options</optional></option>
+ 	</term>
+ 	<listitem>
+@@ -94,10 +105,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+       </varlistentry>
+ 
+       <varlistentry>
+-	<term>lxc-ls -1</term>
++	<term>lxc-ls --active -1</term>
+ 	<listitem>
+ 	<para>
+-	  list all the containers and display the list in one column.
++	  list active containers and display the list in one column.
+ 	</para>
+ 	</listitem>
+       </varlistentry>
+diff --git a/src/lxc/lxc-ls.in b/src/lxc/lxc-ls.in
+index a1ad642..11a3b45 100644
+--- a/src/lxc/lxc-ls.in
++++ b/src/lxc/lxc-ls.in
+@@ -1,43 +1,100 @@
+ #!/bin/bash
+ 
+-localstatedir=@LOCALSTATEDIR@
+-lxcpath=@LXCPATH@
++#
++# lxc: linux Container library
+ 
+-if [ ! -r $lxcpath ]; then
+-    exit 0
+-fi
++# This library is free software; you can redistribute it and/or
++# modify it under the terms of the GNU Lesser General Public
++# License as published by the Free Software Foundation; either
++# version 2.1 of the License, or (at your option) any later version.
++
++# This library 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
++# Lesser General Public License for more details.
++
++# You should have received a copy of the GNU Lesser General Public
++# License along with this library; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++localstatedir=@LOCALSTATEDIR@
++lxc_path=@LXCPATH@
+ 
+-function get_cgroup()
++usage()
+ {
+-	local mount_string
+-	mount_string=$(mount -t cgroup |grep -E -e '^lxc ')
+-	if test -n "$mount_string"; then
+-		mount_point=$(echo $mount_string |cut -d' ' -f3)
+-		return
+-	fi
+-	mount_string=`grep -m1 -E '^[^ \t]+[ \t]+[^ \t]+[ \t]+cgroup' /proc/self/mounts`;
+-	if test -z "$mount_string"; then
+-		echo "failed to find mounted cgroup"
+-		exit 1
+-	fi
+-	mount_point=`echo "$mount_string" |cut -d' ' -f2`;
++	echo "usage: $(basename $0) [--active] [--] [LS_OPTIONS...]" >&2
+ }
+ 
+-ls "$@" $lxcpath
++help() {
++	usage
++	echo >&2
++	echo "List containers existing on the system." >&2
++	echo >&2
++	echo "  --active     list active containers" >&2
++	echo "  LS_OPTIONS   ls command options (see \`ls --help')" >&2
++}
++
++get_parent_cgroup()
++{
++	local hierarchies hierarchy fields subsystems init_cgroup mountpoint
++
++	parent_cgroup=""
++
++	# Obtain a list of hierarchies that contain one or more subsystems
++	hierarchies=$(tail -n +2 /proc/cgroups | cut -f 2)
+ 
+-active=$(netstat -xl 2>/dev/null | grep $lxcpath | \
+-	sed -e 's#.*'"$lxcpath/"'\(.*\)/command#\1#');
++	# Iterate through the list until a suitable hierarchy is found
++	for hierarchy in $hierarchies; do
++		# Obtain information about the init process in the hierarchy
++		fields=$(grep -E "^$hierarchy:" /proc/1/cgroup | head -n 1)
++		if [ -z "$fields" ]; then continue; fi
++		fields=${fields#*:}
+ 
+-if test -n "$active"; then
+-	get_cgroup
+-	if test -n "$mount_point"; then
+-		# get cgroup for init
+-		init_cgroup=`cat /proc/1/cgroup | awk -F: '{ print $3 }' | head -1`
+-		if [ ! -d $mount_point/$init_cgroup/lxc  ]; then
+-			cd $mount_point/$init_cgroup
++		# Get a comma-separated list of the hierarchy's subsystems
++		subsystems=${fields%:*}
++
++		# Get the cgroup of the init process in the hierarchy
++		init_cgroup=${fields#*:}
++
++		# Get the filesystem mountpoint of the hierarchy
++		mountpoint=$(grep -E "^cgroup [^ ]+ [^ ]+ ([^ ]+,)?$subsystems(,[^ ]+)? " /proc/self/mounts | cut -d ' ' -f 2)
++		if [ -z "$mountpoint" ]; then continue; fi
++
++		# Return the absolute path to the containers' parent cgroup
++		# (do not append '/lxc' if the hierarchy contains the 'ns' subsystem)
++		if [[ ",$subsystems," == *,ns,* ]]; then
++			parent_cgroup="${mountpoint}${init_cgroup%/}"
+ 		else
+-			cd $mount_point/$init_cgroup/lxc
++			parent_cgroup="${mountpoint}${init_cgroup%/}/lxc"
+ 		fi
+-		ls "$@" -d $active
+-	fi
++		break
++	done
++}
++
++directory="$lxc_path"
++
++for i in "$@"; do
++	case $i in
++		--help)
++			help; exit 1;;
++		--active)
++			get_parent_cgroup; directory="$parent_cgroup"; shift;;
++		--)
++			shift; break;;
++		*)
++			break;;
++        esac
++done
++
++containers=""
++if [ ! -z "$directory" ]; then
++	containers=$(find $directory -mindepth 1 -maxdepth 1 -type d -printf "%f\n" 2>/dev/null)
+ fi
++
++if [ -z "$containers" ]; then
++	echo "$(basename $0): no containers found" >&2
++	exit 1
++fi
++
++cd "$directory"
++ls -d $@ $containers

component/mydumper/buildout.cfg

@@ -3,6 +3,7 @@
 extends =
     ../cmake/buildout.cfg
     ../glib/buildout.cfg
+    ../openssl/buildout.cfg
     ../pcre/buildout.cfg
     ../mariadb/buildout.cfg
 
@@ -15,17 +16,17 @@ parts = mydumper
 recipe = slapos.recipe.build
 depends =
   ${mariadb:version}
-url = http://launchpad.net/mydumper/0.2/0.2.3/+download/mydumper-0.2.3.tar.gz
-md5sum = 36e6a1c97a9634a6882ddaac5e2697d5
+url = https://launchpad.net/mydumper/0.5/0.5.1/+download/mydumper-0.5.1.tar.gz
+md5sum = b4df42dfe23f308ab13eb6ecb73a0d21
 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/
-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
+pkg-config-path = ${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/:${openssl:location}/lib/pkgconfig/
+libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/:${openssl:location}/lib/
+includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include:${openssl:location}/include/
+cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include -I${openssl:location}/include/
+mysql-include-dir = ${mariadb:location}/include
 mydumper-patches =
    ${:_profile_base_location_}/mydumper-remove-warnings-errors.patch 917fea16b5ddea195cfa33fbd9827f57 -p1
 slapos_promise =
@@ -49,17 +50,13 @@ script =
                     '-DMYSQL_CONFIG=%%s' %% self.options['mysql-config'],
                     '-DCMAKE_C_FLAGS=%%s' %% self.options['cflags'],
                     '-DCMAKE_INSTALL_RPATH=%%s' %% self.options['libraries'],
+                    '-DMYSQL_INCLUDE_DIR=%%s' %% self.options['mysql-include-dir'],
+                    '-DBUILD_DOCS=OFF',
                     '.']
     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]
@@ -78,4 +75,3 @@ dependent-scripts = true
 #environment=
 #    PATH=$PATH:${buildout:bin-directory}
 #    PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/
-

component/nginx/buildout.cfg

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

component/nodejs/buildout.cfg

@@ -9,6 +9,24 @@ parts =
   nodejs
 
 [nodejs]
+<= nodejs-0.8
+
+[nodejs-0.8]
+# Server-side Javascript.
+recipe = hexagonit.recipe.cmmi
+url = http://nodejs.org/dist/v0.8.8/node-v0.8.8.tar.gz
+md5sum = f4dae84e96a94b768404c14633bccd49
+configure-options =
+  --openssl-includes=${openssl:location}/include
+  --openssl-libpath=${openssl:location}/lib
+environment =
+  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+
+[nodejs-0.6]
 # Server-side Javascript.
 recipe = hexagonit.recipe.cmmi
 url = http://nodejs.org/dist/v0.6.21/node-v0.6.21.tar.gz

component/openldap/buildout.cfg

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

component/python-setuptools/buildout.cfg

+[buildout]
+parts = python-setuptools
+
+[setuptools-download]
+recipe = slapos.recipe.download
+filename = setuptools-0.6c11-py2.7.egg
+url = http://pypi.python.org/packages/2.7/s/setuptools/${:filename}
+md5sum = fe1f997bc722265116870bc7919059ea
+
+[python-setuptools]
+# Hack to manually install setuptools outside of the Buildout environment.
+# It is useful in case of using things like "python setup.py test" in eggs
+# downloaded from source (so not using bildout magic).
+# To be able to use it, you should in your instance do an:
+# export PYTHONPATH=${:location} (defined in ${:environment})
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+environment = export PATH=${python2.7:location}/bin:$PATH; export PYTHONPATH=${:location};
+stop-on-error = true
+recipe = plone.recipe.command
+update = true
+command = ${:environment} (mkdir ${:location}; sh ${setuptools-download:location}/${setuptools-download:filename} --install-dir ${:location}) || (rm -fr ${:location}; exit 1)

component/ruby/buildout.cfg

+[buildout]
+
+extends =
+  ../libyaml/buildout.cfg
+
+parts = ruby
+
+[ruby-1.9.3]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz
+md5sum = bc0c715c69da4d1d8bd57069c19f6c0e
+configure-options =
+  --enable-shared --enable-rpath
+environment =
+  CFLAGS=-I${libyaml:location}/include
+  LDFLAGS=-L${libyaml:location}/lib -Wl,-rpath=${libyaml:location}/lib
+
+[ruby-1.9]
+<= ruby-1.9.3
+
+[ruby]
+<= ruby-1.9

component/slapos/buildout.cfg

@@ -111,55 +111,49 @@ scripts =
   slapgrid-supervisorctl = slapos.grid.svcbackend:supervisorctl
   slapgrid-supervisord = slapos.grid.svcbackend:supervisord
   slapproxy = slapos.proxy:main
+  slapos = slapos.entry:main
 
 [versions]
 zc.buildout = 1.6.0-dev-SlapOS-006
 
 Jinja2 = 2.6
-Pygments = 1.5
 Werkzeug = 0.8.3
 buildout-versions = 1.7
 collective.recipe.template = 1.9
-docutils = 0.9.1
 hexagonit.recipe.cmmi = 1.6
-ipython = 0.13
-lxml = 2.3.5
+lxml = 3.0alpha2
 meld3 = 0.6.8
-netaddr = 0.7.7
-slapos.core = 0.27
-slapos.libnetworkcache = 0.12
+netaddr = 0.7.10
+slapos.core = 0.28.6
+slapos.libnetworkcache = 0.13.2
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.6
 Flask = 0.9
 
-# Required by:
-# netaddr==0.7.7
-Sphinx = 1.1.3
-
 # Required by:
 # hexagonit.recipe.cmmi==1.6
 hexagonit.recipe.download = 1.5.1
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.6
 netifaces = 0.8
 
 # Required by:
-# slapos.core==0.27
-# slapos.libnetworkcache==0.12
+# slapos.core==0.28.6
+# slapos.libnetworkcache==0.13.2
 # supervisor==3.0a12
 # zc.buildout==1.6.0-dev-SlapOS-006
 # zope.interface==4.0.1
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.6
 supervisor = 3.0a12
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.6
 zope.interface = 4.0.1

component/tar/buildout.cfg

+[buildout]
+
+parts = tar
+
+[tar-drop.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 9352820566aa3534a04bd269c9f89f48
+download-only = true
+filename = drop.gets.patch
+
+[tar]
+virtual-depends = ${tar-drop.gets.patch:md5sum}
+patch-options = -p1
+patches =
+  ${tar-drop.gets.patch:location}/${tar-drop.gets.patch:filename}
+
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnu.org/gnu/tar/tar-1.26.tar.gz
+md5sum = 00d1e769c6af702c542cca54b728920d
+environment =
+  FORCE_UNSAFE_CONFIGURE=1

component/tar/drop.gets.patch

+diff -ur tar-1.26.orig/gnu/stdio.in.h tar-1.26/gnu/stdio.in.h
+--- tar-1.26.orig/gnu/stdio.in.h	2011-03-12 10:14:33.000000000 +0100
++++ tar-1.26/gnu/stdio.in.h	2012-08-24 15:35:22.299190847 +0200
+@@ -164,7 +164,10 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
++
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@

component/varnish/buildout.cfg

@@ -40,5 +40,5 @@ environment =
 
 [varnish-3.0]
 <= varnish-2.1
-url = http://repo.varnish-cache.org/source/varnish-3.0.2.tar.gz
-md5sum = c8eae0aabbe66b6daabdf3a1f58cd47a
+url = http://repo.varnish-cache.org/source/varnish-3.0.3.tar.gz
+md5sum = 714310c83fdbd2061d897dacd3f63d8b

component/xz-utils/buildout.cfg

+[buidout]
+parts =
+  xz-utils
+
+[xz-utils]
+recipe = hexagonit.recipe.cmmi
+url = http://tukaani.org/xz/xz-5.0.4.tar.gz
+md5sum = df3df690aef18384e1e031be7ec3a964

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.61-dev'
+version = '0.67-dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
@@ -45,105 +45,113 @@ setup(name=name,
           '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',
+	  'boinc = slapos.recipe.boinc:Recipe',
+          'boinc.app = slapos.recipe.boinc:App',
+          'boinc.client = slapos.recipe.boinc:Client',
           'certificate_authority.request = slapos.recipe.certificate_authority:Request',
+          'certificate_authority = slapos.recipe.certificate_authority:Recipe',
           'check_port_listening = slapos.recipe.check_port_listening:Recipe',
           'check_url_available = slapos.recipe.check_url_available:Recipe',
+          'check_page_content = slapos.recipe.check_page_content:Recipe',
           'cloud9 = slapos.recipe.cloud9:Recipe',
-          'cron = slapos.recipe.dcron:Recipe',
+          'cloudooo.test = slapos.recipe.erp5_test:CloudoooRecipe',
+	  'condor = slapos.recipe.condor:Recipe',
           'cron.d = slapos.recipe.dcron:Part',
+          'cron = slapos.recipe.dcron:Recipe',
           'davstorage = slapos.recipe.davstorage:Recipe',
-          'dropbear = slapos.recipe.dropbear:Recipe',
+          'downloader = slapos.recipe.downloader:Recipe',
           'dropbear.add_authorized_key = slapos.recipe.dropbear:AddAuthorizedKey',
           'dropbear.client = slapos.recipe.dropbear:Client',
+          'dropbear = slapos.recipe.dropbear:Recipe',
           'duplicity = slapos.recipe.duplicity:Recipe',
-          'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe',
+          'egg_test = slapos.recipe.erp5_test:EggTestRecipe',
           'equeue = slapos.recipe.equeue:Recipe',
+          'erp5.bootstrap = slapos.recipe.erp5_bootstrap:Recipe',
+          'erp5.promise = slapos.recipe.erp5_promise:Recipe',
+          'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe',
           'erp5testnode = slapos.recipe.erp5testnode:Recipe',
+          'erp5.test = slapos.recipe.erp5_test:Recipe',
+          'erp5.update = slapos.recipe.erp5_update:Recipe',
+          'firefox = slapos.recipe.firefox:Recipe',
+          'fontconfig = slapos.recipe.fontconfig:Recipe',
           'generate.mac = slapos.recipe.generatemac:Recipe',
           'generate.password = slapos.recipe.generatepassword:Recipe',
-          'nbdserver = slapos.recipe.nbdserver:Recipe',
-          'onetimeupload = slapos.recipe.onetimeupload:Recipe',
-          'helloworld = slapos.recipe.helloworld:Recipe',
           'generic.cloudooo = slapos.recipe.generic_cloudooo:Recipe',
-          'cloudooo.test = slapos.recipe.cloudooo_test:Recipe',
-          'firefox = slapos.recipe.firefox:Recipe',
-          'fontconfig = slapos.recipe.fontconfig:Recipe',
+          'generic.kumofs = slapos.recipe.generic_kumofs:Recipe',
+          'generic.memcached = slapos.recipe.generic_memcached:Recipe',
+          'generic.mysql = slapos.recipe.generic_mysql:Recipe',
+          'generic.varnish = slapos.recipe.generic_varnish:Recipe',
+          'generic.zope = slapos.recipe.generic_zope:Recipe',
+          'generic.zope.zeo.client = slapos.recipe.generic_zope_zeo_client:Recipe',
+          'gitinit = slapos.recipe.gitinit:Recipe',
+          'haproxy = slapos.recipe.haproxy:Recipe',
+          'helloworld = slapos.recipe.helloworld:Recipe',
           'java = slapos.recipe.java:Recipe',
           'kumofs = slapos.recipe.kumofs:Recipe',
-          'kvm = slapos.recipe.kvm:Recipe',
           'kvm.frontend = slapos.recipe.kvm_frontend:Recipe',
-          'generic.kumofs = slapos.recipe.generic_kumofs:Recipe',
-          'haproxy = slapos.recipe.haproxy:Recipe',
-          'libcloud = slapos.recipe.libcloud:Recipe',
+          'kvm = slapos.recipe.kvm:Recipe',
+          'lamp.request = slapos.recipe.lamp:Request',
+          'lamp.simple = slapos.recipe.lamp:Simple',
+          'lamp = slapos.recipe.lamp:Request',
+          'lamp.static = slapos.recipe.lamp:Static',
           'libcloudrequest = slapos.recipe.libcloudrequest:Recipe',
+          'libcloud = slapos.recipe.libcloud:Recipe',
           'lockfile = slapos.recipe.lockfile:Recipe',
+          'logrotate.d = slapos.recipe.logrotate:Part',
+          'logrotate = slapos.recipe.logrotate: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',
+          'mydumper = slapos.recipe.mydumper:Recipe',
+          'mysql = slapos.recipe.mysql: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',
+          'notifier = slapos.recipe.notifier:Recipe',
           'novnc = slapos.recipe.novnc:Recipe',
-          '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',
+          'onetimeupload = slapos.recipe.onetimeupload:Recipe',
           'pbs = slapos.recipe.pbs:Recipe',
+          'proactive = slapos.recipe.proactive:Recipe',
           'publish = slapos.recipe.publish:Recipe',
           'publishurl = slapos.recipe.publishurl:Recipe',
           'pwgen = slapos.recipe.pwgen:Recipe',
           'pwgen.stable = slapos.recipe.pwgen:StablePasswordGeneratorRecipe',
-          'proactive = slapos.recipe.proactive:Recipe',
-          'request = slapos.recipe.request:Recipe',
           'requestoptional = slapos.recipe.requestoptional: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',
-          'slapconfiguration = slapos.recipe.slapconfiguration:Recipe',
-          'symbolic.link = slapos.recipe.symbolic_link:Recipe',
-          'softwaretype = slapos.recipe.softwaretype:Recipe',
-          'siptester = slapos.recipe.siptester:SipTesterRecipe',
+          'shell = slapos.recipe.shell:Recipe',
+          'signalwrapper= slapos.recipe.signal_wrapper:Recipe',
           'simplelogger = slapos.recipe.simplelogger:Recipe',
-          'slaprunner = slapos.recipe.slaprunner:Recipe',
+          'siptester = slapos.recipe.siptester:SipTesterRecipe',
+          'slapconfiguration = slapos.recipe.slapconfiguration:Recipe',
+          'slapcontainer = slapos.recipe.container:Recipe',
           'slapmonitor = slapos.recipe.slapmonitor:Recipe',
           'slapreport = slapos.recipe.slapreport:Recipe',
-          'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
-          'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
+          'slaprunner = slapos.recipe.slaprunner:Recipe',
+          'softwaretype = slapos.recipe.softwaretype:Recipe',
           'sphinx= slapos.recipe.sphinx:Recipe',
+          'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
+          'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
           'stunnel = slapos.recipe.stunnel:Recipe',
+          'symbolic.link = slapos.recipe.symbolic_link:Recipe',
           'testnode = slapos.recipe.testnode:Recipe',
+          'tidstorage = slapos.recipe.tidstorage:Recipe',
           'urlparse = slapos.recipe._urlparse:Recipe',
+          'uuid = slapos.recipe._uuid:Recipe',
           'vifib = slapos.recipe.vifib:Recipe',
           'waitfor = slapos.recipe.waitfor:Recipe',
+          'webchecker = slapos.recipe.web_checker:Recipe',
+          'wrapper = slapos.recipe.wrapper:Recipe',
           'xvfb = slapos.recipe.xvfb:Recipe',
           'xwiki = slapos.recipe.xwiki:Recipe',
           'zabbixagent = slapos.recipe.zabbixagent:Recipe',
-          'generic.zope = slapos.recipe.generic_zope:Recipe',
-          'generic.zope.zeo.client = slapos.recipe.generic_zope_zeo_client:Recipe',
           'zeo = slapos.recipe.zeo:Recipe',
-          'tidstorage = slapos.recipe.tidstorage:Recipe',
-          'erp5.bootstrap = slapos.recipe.erp5_bootstrap:Recipe',
-          'erp5.promise = slapos.recipe.erp5_promise:Recipe',
-          'erp5.update = slapos.recipe.erp5_update:Recipe',
-          'erp5.test = slapos.recipe.erp5_test:Recipe',
-          'generic.varnish = slapos.recipe.generic_varnish:Recipe',
-          'webchecker = slapos.recipe.web_checker:Recipe',
-          'signalwrapper= slapos.recipe.signal_wrapper:Recipe',
-          'condor = slapos.recipe.condor:Recipe',
-          'boinc = slapos.recipe.boinc:Recipe',
-          'boinc.app = slapos.recipe.boinc:App',
-          'boinc.client = slapos.recipe.boinc:Client',
         ],
         'slapos.recipe.nosqltestbed.plugin': [
           'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',
         ],
       },
     )
+

slapos/recipe/cloudooo_test/__init__.py → slapos/recipe/_uuid.py

@@ -24,28 +24,32 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
+
+import uuid
+
+import os
+
 from slapos.recipe.librecipe import GenericBaseRecipe
-import urlparse
 
 class Recipe(GenericBaseRecipe):
-  def install(self):
-    path_list = []
-    common_dict = dict(
-        prepend_path=self.options['prepend-path'],
-    )
-    common_list = [
-           "--paster_path", self.options['ooo-paster'],
-           self.options['configuration-file']
-          ]
-    run_unit_test_path = self.createPythonScript(self.options['run-unit-test'],
-        __name__ + '.test.runUnitTest', [dict(
-        call_list=[self.options['run-unit-test-binary'],
-          ] + common_list, **common_dict)])
-
-    path_list.append(run_unit_test_path)
-    path_list.append(self.createPythonScript(self.options['run-test-suite'],
-        __name__ + '.test.runTestSuite', [dict(
-        call_list=[self.options['run-test-suite-binary'],
-          ], **common_dict)]))
-
-    return path_list
+
+    def _options(self, options):
+        write = True
+        if os.path.exists(options['cache-file']):
+            with open(options['cache-file'], 'r') as cache_file:
+                try:
+                    generated_uuid = uuid.UUID(hex=cache_file.read())
+                    write = False
+                except ValueError:
+                    generated_uuid = uuid.uuid4()
+        else:
+            generated_uuid = uuid.uuid4()
+
+        if write:
+            with open(options['cache-file'], 'w') as cache_file:
+                cache_file.write(generated_uuid.hex)
+
+        options['uuid'] = generated_uuid.hex
+
+    def install(self):
+        return []

slapos/recipe/check_page_content/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+import sys
+
+class Recipe(GenericBaseRecipe):
+  """
+  Create script that will check if content at "url" is available 
+  (e.g page has a link to itself).
+  """
+
+  def install(self):
+    config = {
+      'url': self.options['url'],
+      'shell_path': self.options['dash_path'],
+      'curl_path': self.options['curl_path'],
+    }
+
+    # XXX-Cedric in this script, curl won't check certificate
+    promise = self.createExecutable(
+      self.options['path'],
+      self.substituteTemplate(self.getTemplateFilename('check_page_content.in'), config)
+    )
+
+    return [promise]

slapos/recipe/check_page_content/template/check_page_content.in

+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+
+URL="%(url)s"
+
+if [ -z $URL ]; then
+  echo "No URL specified." >&2
+  exit 3
+fi
+
+%(curl_path)s -k -sL $URL | grep "$URL" > /dev/null
+
+if [ $? != 0 ]; then
+  echo "Content at $URL seems to be corrupted" >&2
+  exit 1
+fi

slapos/recipe/check_url_available/template/check_url.in

@@ -11,6 +11,10 @@ fi
 
 CODE=$(%(curl_path)s -k -sL $URL -w %%{http_code} -o /dev/null)
 
+if [ ! $CODE ]; then
+  echo "$URL is not available (server not reachable)." >&2
+  exit 1
+
 if [ $CODE -eq 000 ]; then
   echo "$URL is not available (server not reachable)." >&2
   exit 1

slapos/recipe/container.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 ConfigParser
+import uuid
+import os
+import subprocess
+
+# XXX : This is in order to get the computer_partition object
+#       which exposes the state of the current partition.
+#
+# XXX : We could have modify slapgrid in order to put the
+#       state of the current partition offline. But this is
+#       written to have the most minimal impact.
+from slapos.recipe.librecipe import GenericSlapRecipe
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericSlapRecipe):
+
+    def _options(self, options):
+        config_filename = self.options['config']
+
+        container_uuid = None
+
+        if os.path.exists(config_filename):
+            config = ConfigParser.ConfigParser()
+            config.read(config_filename)
+            if config.has_option('requested', 'name'):
+                container_uuid = uuid.UUID(hex=config.get('requested', 'name'))
+
+        if container_uuid is None:
+            # uuid wasn't generated at first in order to avoid
+            # wasting entropy
+            container_uuid = uuid.uuid4()
+
+        options['slapcontainer-name'] = container_uuid.hex
+
+        return options
+
+
+
+    def _install(self):
+        path_list = []
+
+        self.logger.info("Putting slapcontainer configuration file...")
+
+        config = ConfigParser.ConfigParser()
+        config.add_section('requested')
+        config.set('requested', 'status',
+                   self.computer_partition.getState())
+        config.set('requested', 'name', self.options['slapcontainer-name'])
+        config.add_section('rootfs')
+        config.set('rootfs', 'image', self.options['image'])
+        config.set('rootfs', 'complete', self.options['image-complete'])
+        config.add_section('network')
+        config.set('network', 'interface', self.options['interface'])
+        config.add_section('config')
+        config.set('config', 'file', self.options['lxc-config'])
+
+        # Just a touch
+        open(self.options['lxc-config'], 'a').close()
+
+        config_filename = self.options['config']
+        with open(config_filename, 'w') as config_file:
+            config.write(config_file)
+        path_list.append(config_filename)
+
+        return path_list

slapos/recipe/downloader.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 urllib
+import hashlib
+import tempfile
+import shutil
+import subprocess
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+BUFFER_SIZE = 1024
+
+def service(args):
+    environ = os.environ.copy()
+    environ.update(PATH=args['path'])
+    if not os.path.exists(args['confirm']):
+        tmpdir = tempfile.mkdtemp()
+        try:
+            # XXX: Hardcoded path
+            tmpoutput = os.path.join(tmpdir, 'downloaded')
+            urllib.urlretrieve(args['url'], tmpoutput)
+
+            if args['md5'] is not None:
+                # XXX: we need to find a better way to do a md5sum
+                md5sum = hashlib.md5()
+                with open(args['output'], 'r') as output:
+                    file_buffer = output.read(BUFFER_SIZE)
+                    while len(file_buffer) > 0:
+                        md5sum.update(file_buffer)
+                        file_buffer = output.read(BUFFER_SIZE)
+
+                if args['md5'] != md5sum.hexdigest():
+                    return 127 # Not-null return code
+
+            if not args['archive']:
+                shutil.move(tmpoutput, args['output'])
+            else:
+                # XXX: hardcoding path
+                extract_dir = os.path.join(tmpdir, 'extract')
+                os.mkdir(extract_dir)
+                subprocess.check_call(
+                    ['tar', '-x', '-f', tmpoutput,
+                            '-C', extract_dir,
+                    ],
+                    env=environ,
+                )
+                archive_content = os.listdir(extract_dir)
+                if len(archive_content) == 1 and \
+                   os.path.isfile(os.path.join(extract_dir,
+                                               archive_content[0])):
+                    shutil.move(os.path.join(extract_dir,
+                                             archive_content[0]),
+                              args['output'])
+                else:
+                    return 127 # Not-null return code
+
+        finally:
+            shutil.rmtree(tmpdir)
+
+        # Just a touch on args['confirm'] file
+        open(args['confirm'], 'w').close()
+
+    return 0
+
+
+
+class Recipe(GenericBaseRecipe):
+
+    def install(self):
+        path_list = []
+
+        md5sum = self.options.get('md5sum', '')
+        if len(md5sum) == 0:
+            md5sum = None
+
+        keywords = {
+            'url': self.options['url'],
+            'md5': md5sum,
+            'output': self.options['downloaded-file'],
+            'confirm': self.options['downloaded-file-complete'],
+            'archive': self.optionIsTrue('archive', False),
+        }
+        if keywords['archive']:
+            keywords['path'] = self.options['path']
+        path_list.append(
+            self.createPythonScript(
+                self.options['binary'],
+                'slapos.recipe.downloader.service',
+                keywords,
+            )
+        )
+
+        return path_list

slapos/recipe/erp5_test/__init__.py

@@ -27,6 +27,9 @@
 from slapos.recipe.librecipe import GenericBaseRecipe
 import urlparse
 
+# The follow recipes should be unified somehow in order to improve
+# code mantainence.
+
 class Recipe(GenericBaseRecipe):
   def install(self):
     testinstance = self.options['test-instance-path']
@@ -72,3 +75,62 @@ class Recipe(GenericBaseRecipe):
           ] + common_list, **common_dict)]))
 
     return path_list
+
+class CloudoooRecipe(GenericBaseRecipe):
+  def install(self):
+    path_list = []
+    common_dict = dict(
+        prepend_path=self.options['prepend-path'],
+    )
+    common_list = [
+           "--paster_path", self.options['ooo-paster'],
+           self.options['configuration-file']
+          ]
+    run_unit_test_path = self.createPythonScript(self.options['run-unit-test'],
+        __name__ + '.test.runUnitTest', [dict(
+        call_list=[self.options['run-unit-test-binary'],
+          ] + common_list, **common_dict)])
+
+    path_list.append(run_unit_test_path)
+    path_list.append(self.createPythonScript(self.options['run-test-suite'],
+        __name__ + '.test.runTestSuite', [dict(
+        call_list=[self.options['run-test-suite-binary'],
+          ], **common_dict)]))
+
+    return path_list
+
+class EggTestRecipe(GenericBaseRecipe):
+  """
+  Recipe used to create wrapper used to run test suite (python setup.py test)
+  off a list of Python eggs.
+  """
+  def install(self):
+    path_list = []
+    test_list = self.options['test-list'].strip().replace('\n', ',')
+    common_dict = {}
+
+    environment_dict = {}
+    if self.options.get('environment'):
+      environment_part = self.buildout.get(self.options['environment'])
+      if environment_part:
+        for key, value in environment_part.iteritems():
+          environment_dict[key] = value
+
+    common_list = [ "--source_code_path_list", test_list]
+
+    argument_dict = dict(
+        call_list=[self.options['run-test-suite-binary'],] + common_list,
+        environment=environment_dict,
+        **common_dict
+    )
+    if 'prepend-path' in self.options:
+      argument_dict['prepend_path'] = self.options['prepend-path']
+
+    run_test_suite_script = self.createPythonScript(
+        self.options['run-test-suite'], __name__ + '.test.runTestSuite',
+        [argument_dict]
+    )
+
+    path_list.append(run_test_suite_script)
+
+    return path_list

slapos/recipe/erp5_test/test.py

@@ -29,11 +29,20 @@ import sys
 def runTestSuite(args):
   env = os.environ.copy()
   d = args[0]
-  env['OPENSSL_BINARY'] = d['openssl_binary']
-  env['TEST_CA_PATH'] = d['test_ca_path']
-  env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
-  env['INSTANCE_HOME'] = d['instance_home']
-  env['REAL_INSTANCE_HOME'] = d['instance_home']
+  if 'openssl_binary' in d:
+    env['OPENSSL_BINARY'] = d['openssl_binary']
+  if 'test_ca_path' in d:
+    env['TEST_CA_PATH'] = d['test_ca_path']
+  if 'prepend_path' in d:
+    env['PATH'] = ':'.join([d['prepend_path']] + os.environ.get('PATH', '').split(':'))
+  if 'instance_home' in d:
+    env['INSTANCE_HOME'] = d['instance_home']
+    env['REAL_INSTANCE_HOME'] = d['instance_home']
+
+  # If defined, will add (and replace if existing) envvars to environment.
+  if 'environment' in d:
+    env.update(d['environment'])
+
   # Deal with Shebang size limitation
   executable_filepath = d['call_list'][0]
   file_object = open(executable_filepath, 'r')
@@ -51,11 +60,15 @@ def runTestSuite(args):
 def runUnitTest(args):
   env = os.environ.copy()
   d = args[0]
-  env['OPENSSL_BINARY'] = d['openssl_binary']
-  env['TEST_CA_PATH'] = d['test_ca_path']
-  env['PATH'] = ':'.join([d['prepend_path']] + os.environ.get('PATH', '').split(':'))
-  env['INSTANCE_HOME'] = d['instance_home']
-  env['REAL_INSTANCE_HOME'] = d['instance_home']
+  if 'openssl_binary' in d:
+    env['OPENSSL_BINARY'] = d['openssl_binary']
+  if 'test_ca_path' in d:
+    env['TEST_CA_PATH'] = d['test_ca_path']
+  if 'prepend_path' in d:
+    env['PATH'] = ':'.join([d['prepend_path']] + os.environ.get('PATH', '').split(':'))
+  if 'instance_home' in d:
+    env['INSTANCE_HOME'] = d['instance_home']
+    env['REAL_INSTANCE_HOME'] = d['instance_home']
   # Deal with Shebang size limitation
   executable_filepath = d['call_list'][0]
   file_object = open(executable_filepath, 'r')

slapos/recipe/generic_varnish/template/default.vcl.in

@@ -23,10 +23,6 @@ backend default {
 
 # Called at the beginning of a request, after the complete request has been received and parsed
 sub vcl_recv {
-    # Force lookup if the request is a no-cache request from the client
-    if (req.http.cache-control ~ "no-cache") {
-        ban_url(req.url);
-    }
     # Pass any requests that Varnish does not understand straight to the backend.
     if (req.request != "GET" &&
         req.request != "HEAD" &&

slapos/recipe/cloudooo_test/test.py → slapos/recipe/gitinit.py

@@ -24,41 +24,26 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
+import json
 import os
-import sys
-def runTestSuite(args):
-  env = os.environ.copy()
-  d = args[0]
-  env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
-  # Deal with Shebang size limitation
-  executable_filepath = d['call_list'][0]
-  file_object = open(executable_filepath, 'r')
-  line = file_object.readline()
-  file_object.close()
-  argument_list = []
-  if line[:2] == '#!':
-    executable_filepath = line[2:].strip()
-    argument_list.append(executable_filepath)
-  argument_list.extend(d['call_list'])
-  argument_list.extend(sys.argv[1:])
-  argument_list.append(env)
-  os.execle(executable_filepath, *argument_list)
 
-def runUnitTest(args):
-  env = os.environ.copy()
-  d = args[0]
-  env['PATH'] = ':'.join([d['prepend_path']] + os.environ.get('PATH', '').split(':'))
-  # Deal with Shebang size limitation
-  executable_filepath = d['call_list'][0]
-  file_object = open(executable_filepath, 'r')
-  line = file_object.readline()
-  file_object.close()
-  argument_list = []
-  if line[:2] == '#!':
-    executable_filepath = line[2:].strip()
-    argument_list.append(executable_filepath)
-  argument_list.extend(d['call_list'])
-  argument_list.extend(sys.argv[1:])
-  argument_list.append(env)
-  os.execle(executable_filepath, *argument_list)
+from subprocess import check_call
 
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+    def install(self):
+
+        repolist = json.loads(self.options['repos'])
+        for repo, desc in repolist.iteritems():
+            absolute_path = os.path.join(self.options['base-directory'], '%s.git' % repo)
+            if not os.path.exists(absolute_path):
+                check_call([self.options['git-binary'], 'init',
+                            '--bare', absolute_path])
+                # XXX: Hardcoded path
+                description_filename = os.path.join(absolute_path, 'description')
+                with open(description_filename, 'w') as description_file:
+                    description_file.write(desc)
+
+        return []

slapos/recipe/librecipe/execute.py

@@ -47,15 +47,13 @@ def _wait_files_creation(file_list):
 
 def execute(args):
   """Portable execution with process replacement"""
-  # Note: Candidate for slapos.lib.recipe
-  os.execv(args[0], args + sys.argv[1:])
+  # XXX: Kept for backward compatibility
+  generic_exec([args, None, None])
 
 def execute_wait(args):
   """Execution but after all files in args[1] exists"""
-  exec_list = list(args[0])
-  file_list = list(args[1])
-  _wait_files_creation(file_list)
-  os.execv(exec_list[0], exec_list + sys.argv[1:])
+  # XXX: Kept for backward compatibility
+  generic_exec([args[0], args[1], None])
 
 
 child_pg = None
@@ -63,23 +61,27 @@ child_pg = None
 
 def executee(args):
   """Portable execution with process replacement and environment manipulation"""
-  exec_list = list(args[0])
-  environment = args[1]
-  env = os.environ.copy()
-  for k,v in environment.iteritems():
-    env[k] = v
-  os.execve(exec_list[0], exec_list + sys.argv[1:], env)
+  # XXX: Kept for backward compatibility
+  generic_exec([args[0], None, args[1]])
 
 def executee_wait(args):
   """Portable execution with process replacement and environment manipulation"""
+  # XXX: Kept for backward compatibility
+  generic_exec(args)
+
+def generic_exec(args):
   exec_list = list(args[0])
-  file_list = list(args[1])
-  environment = args[2]
-  env = os.environ.copy()
-  for k,v in environment.iteritems():
-    env[k] = v
-  _wait_files_creation(file_list)
-  os.execve(exec_list[0], exec_list + sys.argv[1:], env)
+  file_list = args[1]
+  environment_overriding = args[2]
+
+  exec_env = os.environ.copy()
+  if environment_overriding is not None:
+      exec_env.update(environment_overriding)
+
+  if file_list is not None:
+      _wait_files_creation(file_list)
+
+  os.execve(exec_list[0], exec_list + sys.argv[1:], exec_env)
 
 def sig_handler(signal, frame):
   print 'Received signal %r, killing children and exiting' % signal

slapos/recipe/mysql/__init__.py

@@ -107,6 +107,7 @@ class Recipe(GenericBaseRecipe):
         mysql_binary=mysql_binary,
         socket=socket,
         configuration_file=mysql_conf_file,
+        cwd=self.options['mysql-base-directory'],
        )
     )
     path_list.append(mysqld)

slapos/recipe/mysql/mysql.py

@@ -17,7 +17,7 @@ def runMysql(conf):
       popen = subprocess.Popen([conf['mysql_install_binary'],
         '--skip-name-resolve', '--skip-host-cache', '--no-defaults',
         '--datadir=%s' % conf['data_directory']],
-        stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=conf['cwd'])
       result = popen.communicate()[0]
       if popen.returncode is None or popen.returncode != 0:
         print "Failed to initialise server.\nThe error was: %s" % result

slapos/recipe/pwgen.py

@@ -41,7 +41,9 @@ class Recipe(GenericBaseRecipe):
         password = password_file.read()
     options['password'] = password
 
-  update = install = lambda self: []
+  def install(self):
+    os.chmod(self.options['file'], 0600)
+    return []
 
 class StablePasswordGeneratorRecipe(GenericBaseRecipe):
   """

slapos/recipe/shellinabox.py

@@ -28,6 +28,7 @@ from getpass import getpass
 import pwd
 import grp
 import os
+import shlex
 
 from slapos.recipe.librecipe import GenericBaseRecipe
 
@@ -38,7 +39,9 @@ def login_shell(args):
   if entered_password != password:
     return 1
   else:
-    os.execl(args['shell'], args['shell'])
+    commandline = shlex.split(args['shell'])
+    path = commandline[0]
+    os.execv(path, commandline)
 
 def shellinabox(args):
   certificate_dir = args['certificate_dir']
@@ -69,6 +72,14 @@ def shellinabox(args):
     '-p', args['port'],
   ]
 
+  # XXX: By default shellinbox drop privileges
+  #      switching to nobody:nogroup user.
+  # This force root.
+  if group == 'root':
+    command_line.extend(['-g', group])
+  if user == 'root':
+    command_line.extend(['-u', group])
+
   os.execv(command_line[0], command_line)
 
 

slapos/recipe/softwaretype.py

@@ -128,6 +128,8 @@ class Recipe:
     for key, value in self.buildout['slap_connection'].iteritems():
       # XXX: Waiting for SlapBaseRecipe to use dash instead of underscores
       buildout.set('slap-connection', key.replace('_', '-'), value)
+    # XXX: Needed for lxc. Use non standard API
+    buildout.set('slap-connection', 'requested', self.computer_partition._requested_state)
 
     work_directory = os.path.abspath(self.buildout['buildout'][
       'directory'])

slapos/recipe/template.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 slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+    def install(self):
+        mapping = self.options.copy()
+        for key in ('output', 'template', 'recipe', 'mode'):
+            if key in mapping:
+                del mapping[key]
+
+        with open(self.options['output'], 'w') as output, \
+             open(self.options['template'], 'r') as template:
+            output.write(template.read() % mapping)
+
+        if 'mode' in self.options:
+            os.chmod(self.options['output'], int(self.options['mode'], 8))
+
+        return [self.options['output'], ]

slapos/recipe/wrapper.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 shlex
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+    def install(self):
+
+        command_line = shlex.split(self.options['command-line'])
+
+        wait_files = self.options.get('wait-for-files')
+        if wait_files is not None:
+            wait_files = [filename.strip() for filename in wait_files.split()
+                          if filename.strip()]
+
+        environment = self.options.get('environment')
+        if environment is not None:
+            environment = {k.strip(): v.strip() for k, v in [
+                             line.split('=')
+                             for line in environment.split('\n')
+                           ]}
+
+        return [self.createPythonScript(
+            self.options['output'],
+            'slapos.recipe.librecipe.execute.generic_exec',
+            (command_line, wait_files, environment,),
+        )]

software/MediaWiki/software.cfg

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

software/SilverStripe/software.cfg

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

software/b2evolution/software.cfg

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

software/cloudooo/software.cfg

@@ -111,6 +111,7 @@ mode = 640
 #   Cedric de Saint Martin
 #   Yingjie Xu
 #   Gabriel Monnerat
+#   Test Agent (Automatic Update from Tests)
 signature-certificate-list =
   -----BEGIN CERTIFICATE-----
   MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
@@ -190,3 +191,16 @@ signature-certificate-list =
   Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
   yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
   -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
+  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
+  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
+  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
+  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
+  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
+  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
+  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
+  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
+  -----END CERTIFICATE-----

software/cmsmadesimple/software.cfg

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

software/coppermine/software.cfg

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

software/davstorage/software.cfg

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

software/dotclear/software.cfg

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

software/dotproject/software.cfg

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

software/eSKUeL/software.cfg

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

software/erp5/software.cfg

@@ -11,6 +11,7 @@ extends =
 #   Yingjie Xu
 #   Gabriel Monnerat
 #   Łukasz Nowak
+#   Test Agent (Automatic update from tests)
 signature-certificate-list =
   -----BEGIN CERTIFICATE-----
   MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
@@ -103,3 +104,16 @@ signature-certificate-list =
   Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
   Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
   -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
+  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
+  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
+  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
+  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
+  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
+  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
+  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
+  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
+  -----END CERTIFICATE-----

software/erp5testnode/software.cfg

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

software/ezpublish/software.cfg

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

software/gitrepo/README.txt

+gitrepo
+=======
+
+This software release allow you to get a private mono-user git
+repository with web interface.
+
+This software release only need one parameter “repos”, which is
+a json object of the repos and their description.
+
+It can receive a “title” parameter as well in order to specify
+a title for gitweb interface interface.
+
+Example
+--------
+
+::
+  repo = request(
+      software_release=gitrepo,
+      partiion_reference="My SlapGit",
+      partition_parameter_kw={
+        'repos': """
+          {
+            "repo": "description",
+            "foo": "bar"
+          }
+        """,
+        'title': 'optional title',
+      }
+  )
+

software/gitrepo/git-http-backend.cgi.in

+#!/usr/bin/env sh
+
+## This is a very dirty hack
+export PATH_INFO="$${REDIRECT_URL:-$PATH_INFO}"
+
+GIT_PROJECT_ROOT='${git-repos:base-directory}' GIT_HTTP_EXPORT_ALL= exec '${:githttpbackend}' $@

software/gitrepo/gitweb.cgi.in

+#!/usr/bin/env sh
+
+GITWEB_CONFIG='${gitweb-conf:output}' exec '${:perl}' '${:gitweb}' $@

software/gitrepo/gitweb.conf.in

+$projectroot = '${git-repos:base-directory}';
+
+$site_name = '${slap-parameter:title}';
+
+our @git_base_url_list = qw(${:url-list});
+
+# Beautiful URLs
+$feature{'pathinfo'}{'default'} = [1];
+$feature{'blame'}{'default'} = [1];

software/gitrepo/httpd.conf.in

+PidFile "${:pid-file}"
+Listen ${slap-network-information:global-ipv6}:${:port}
+ServerAdmin someone@email
+
+ErrorLog "${:error-log}"
+LogLevel warn
+
+ScriptSock "${:cgid-sock}"
+
+<Directory />
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+</Directory>
+
+Alias "/static/" "${:gitweb-static-dir}"
+<Directory "${:gitweb-static-dir}">
+    Options FollowSymLinks
+    Order deny,allow
+    Allow from all
+</Directory>
+
+# This is Static Accelerated git pull
+AliasMatch "^/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$"          "${:project-dir}/$1"
+AliasMatch "^/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$" "${:project-dir}/$1"
+
+# When it can't be statically delivered, we rely on git-http-backend
+ScriptAliasMatch \
+        "(?x)^/(.*/(HEAD | \
+                        info/refs | \
+                        objects/info/[^/]+ | \
+                        git-(upload|receive)-pack))(/push)?$" \
+        "${:git-http-backend}/$1"
+
+# Everything else is gitweb interface
+ScriptAlias "/"                                                "${:gitweb-script}/"
+
+<Location />
+    Order deny,allow
+    Allow from all
+    RewriteEngine On
+    RewriteCond %{QUERY_STRING} service=git-receive-pack
+    RewriteRule ^(.*)$ $1/push [END]
+</Location>
+
+<LocationMatch "(^/.*/git-receive-pack|/push)$">
+    AuthType Basic
+    AuthName "Git Push Access"
+    AuthBasicProvider file
+    AuthUserFile "${:passwd-file}"
+    Require valid-user
+    SetEnv REMOTE_USER $REDIRECT_REMOTE_USER
+</LocationMatch>
+
+
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule alias_module modules/mod_alias.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authn_file_module modules/mod_authn_file.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule authz_user_module modules/mod_authz_user.so
+LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule cgid_module modules/mod_cgid.so
+LoadModule env_module modules/mod_env.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule unixd_module modules/mod_unixd.so

software/gitrepo/instance-gitrepo.cfg

+[buildout]
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+parts =
+  publish
+  httpd
+  httpd-conf
+  gitweb-conf
+  gitweb-cgi
+  gitdaemon
+  git-http-backend-cgi
+  htpasswd
+  pwgen
+  git-repos
+
+[publish]
+recipe = slapos.cookbook:publish
+url = http://[$${slap-network-information:global-ipv6}]:$${httpd-conf:port}/
+user = $${pwgen:user}
+password = $${pwgen:password}
+
+[httpd]
+recipe = slapos.cookbook:wrapper
+command-line = ${apache:location}/bin/httpd -DFOREGROUND -f "$${httpd-conf:output}"
+output = $${basedirectory:services}/httpd
+
+
+[httpd-conf]
+recipe = slapos.recipe.template
+url = ${template-httpd-conf:location}/${template-httpd-conf:filename}
+output = $${rootdirectory:etc}/httpd.conf
+
+pid-file = $${basedirectory:run}/httpd.pid
+error-log = $${basedirectory:log}/httpd-errorlog.log
+gitweb-static-dir = ${gitweb:location}/share/gitweb/static/
+gitweb-script = $${gitweb-cgi:output}
+git-http-backend = $${git-http-backend-cgi:output}
+cgid-sock = $${basedirectory:run}/cgid.sock
+project-dir = $${git-repos:base-directory}
+passwd-file = $${htpasswd:output}
+port = 8080
+
+
+[gitweb-conf]
+recipe = slapos.recipe.template
+url = ${template-gitweb-conf:location}/${template-gitweb-conf:filename}
+output = $${rootdirectory:etc}/gitweb.conf
+url-list = http://[$${slap-network-information:global-ipv6}]:$${httpd-conf:port} git://[$${slap-network-information:global-ipv6}]
+
+[gitweb-cgi]
+recipe = slapos.recipe.template
+url = ${template-gitweb-cgi:location}/${template-gitweb-cgi:filename}
+output = $${rootdirectory:bin}/gitweb.cgi
+mode = 700
+
+perl = ${perl:location}/bin/perl
+gitweb = ${gitweb:location}/share/gitweb/gitweb.cgi
+
+
+[git-http-backend-cgi]
+recipe = slapos.recipe.template
+url = ${template-git-http-backend-cgi:location}/${template-git-http-backend-cgi:filename}
+output = $${rootdirectory:bin}/git-http-backend.cgi
+mode = 700
+
+githttpbackend = ${git:location}/libexec/git-core/git-http-backend
+
+[gitdaemon]
+recipe = slapos.cookbook:wrapper
+ip = $${slap-network-information:global-ipv6}
+port = 9418
+command-line = ${git:location}/bin/git daemon --export-all --listen=$${:ip} --port=$${:port} --interpolated-path=$${git-repos:base-directory}/%D
+output = $${basedirectory:services}/git-daemon
+
+[htpasswd]
+recipe = collective.recipe.cmd
+output = $${rootdirectory:etc}/httpd.htpasswd
+on_install = true
+on_udptae = true
+cmds =
+  ${apache:location}/bin/htpasswd -cb $${:output} $${pwgen:user} $${pwgen:password}
+
+[pwgen]
+recipe = slapos.cookbook:pwgen
+file = $${buildout:directory}/.password
+pwgen-binary = ${pwgen:location}/bin/pwgen
+user = slapos
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+srv = $${buildout:directory}/srv/
+var = $${buildout:directory}/var/
+bin = $${buildout:directory}/bin/
+
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+services = $${rootdirectory:etc}/run/
+run = $${rootdirectory:var}/run/
+git-repos = $${rootdirectory:srv}/git/
+log = $${rootdirectory:var}/log/
+
+
+[git-repos]
+recipe = slapos.cookbook:gitinit
+base-directory = $${basedirectory:git-repos}
+repos = $${slap-parameter:repos}
+git-binary = ${git:location}/bin/git
+
+[slap-parameter]
+title = GitSlap

software/gitrepo/instance.cfg

+[buildout]
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+parts =
+  switch-softwaretype
+
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${template-gitrepo:output}

software/gitrepo/software.cfg

+[buildout]
+
+extends =
+  ../../component/apache/buildout.cfg
+  ../../component/perl/buildout.cfg
+  ../../component/git/buildout.cfg
+  ../../component/pwgen/buildout.cfg
+  ../../stack/slapos.cfg
+
+parts =
+  apache
+  perl
+  git
+  gitweb
+  slapos-cookbook
+  template
+  template-gitrepo
+  collective-recipe-cmd
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = 5917cf0a9d6cc5d6d184e89ca2d72a91
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[template-gitrepo]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-gitrepo.cfg
+md5sum = 15dd1b7ea3259197b847e94342adf872
+output = ${buildout:directory}/template-gitrepo.cfg
+mode = 0644
+
+[template-download]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+
+[template-gitweb-cgi]]
+<= template-download
+filename = gitweb.cgi.in
+md5sum = 5c720202053bfba06eec6e97d8d47cd0
+
+[template-gitweb-conf]
+<= template-download
+filename = gitweb.conf.in
+md5sum = 580d4bd2723f7e0a44ec8fc5b360b429
+
+[template-git-http-backend-cgi]
+<= template-download
+filename = git-http-backend.cgi.in
+md5sum = 7e0562b0ce8d48bc8f6b422850dc53af
+
+[template-httpd-conf]
+<= template-download
+filename = httpd.conf.in
+md5sum = e5e6a6de32323248d11918934f6aad99
+
+[collective-recipe-cmd]
+recipe = zc.recipe.egg
+eggs =
+  collective.recipe.cmd
+
+
+[version]
+slapos.cookbook = 0.64.2

software/html5as/README.md

+# Html5 Application Server #
+
+## Presentation ##
+
+* Fast hosting software for static website (html5)
+
+* Use Nginx server
+
+## Parameter ##
+
+download_url (string) :required
+
+Details :
+
+* Only tarball (tar) is supported
+
+* Compressed format is gunzip (optional)
+
+* Tarball must contain an index.html at its root
+
+## How it works ##
+
+Each time you (re)start your instance or update parameters, html5as will remove previous website then download tarball and extract it in docroot directory.

software/html5as/instance.cfg

+[buildout]
+parts =
+  switch-softwaretype
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${instance_html5as:output}

software/html5as/instance_html5as.cfg

+[buildout]
+parts =
+    nginx_conf
+    downloader
+    launcher
+    mime_types
+    publish-connection-information
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+# partition tree
+# /
+# |- etc/
+# |    |- nginx.conf
+# |    |- run/
+# |         |- html5as (binary)
+# |- var/
+# |    |- run/
+# |    |    |- nginx.pid
+# |    |- log/
+# |    |    |- nginx.log
+# |    |    |- nginx.access.log
+# |- srv/
+# |    |- html5as/ (doc root)
+# |    |        |- index.html
+# |    |- backup/
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+var = $${buildout:directory}/var
+srv = $${buildout:directory}/srv
+tmp = $${buildout:directory}/tmp
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+services = $${rootdirectory:etc}/run
+log = $${rootdirectory:var}/log
+run = $${rootdirectory:var}/run
+backup = $${rootdirectory:srv}/backup
+data = $${rootdirectory:srv}/html5as
+
+[tempdirectory]
+recipe = slapos.cookbook:mkdirectory
+client_body_temp_path = $${rootdirectory:tmp}/client_body_temp_path
+proxy_temp_path = $${rootdirectory:tmp}/proxy_temp_path
+fastcgi_temp_path = $${rootdirectory:tmp}/fastcgi_temp_path
+uwsgi_temp_path = $${rootdirectory:tmp}/uwsgi_temp_path
+scgi_temp_path = $${rootdirectory:tmp}/scgi_temp_path
+
+[html5as]
+# Options
+nb_workers = 2
+
+# Network
+ip = $${slap-network-information:global-ipv6}
+port = 8080
+
+# Paths
+# Log
+path_pid = $${basedirectory:run}/nginx.pid
+path_log = $${basedirectory:log}/nginx.log
+path_access_log = $${basedirectory:log}/nginx.access.log
+path_error_log = $${basedirectory:log}/nginx.error.log
+path_tmp = $${buildout:directory}/tmp
+# Docroot
+docroot = $${basedirectory:data}
+default_index = $${basedirectory:data}/index.html
+# Config files
+path_nginx_conf = $${rootdirectory:etc}/nginx.conf
+path_mime_types = $${rootdirectory:etc}/mime_types
+# Executables
+bin_nginx = ${nginx:location}/sbin/nginx
+bin_launcher = $${basedirectory:services}/launcher
+bin_downloader = $${basedirectory:services}/downloader
+
+# Utils
+path_shell = ${dash:location}/bin/dash
+path_curl = ${curl:location}/bin/curl
+path_tar = ${tar:location}/bin/tar
+
+[nginx_conf]
+recipe = slapos.recipe.template:jinja2
+template = ${template_nginx_conf:location}/${template_nginx_conf:filename}
+rendered = $${html5as:path_nginx_conf}
+context = 
+    section param_html5as html5as
+    section param_tempdir tempdirectory
+
+[mime_types]
+recipe = slapos.recipe.template:jinja2
+template = ${template_mime_types:location}/${template_mime_types:filename}
+rendered = $${html5as:path_mime_types}
+
+[downloader]
+recipe = slapos.recipe.template:jinja2
+template = ${template_downloader:location}/${template_downloader:filename}
+rendered = $${html5as:bin_downloader}
+mode = 700
+context = 
+    section param_html5as html5as
+    key download_url slap-parameter:download_url
+
+[launcher]
+recipe = slapos.recipe.template:jinja2
+template = ${template_launcher:location}/${template_launcher:filename}
+rendered = $${html5as:bin_launcher}
+mode = 700
+context = 
+    section param_html5as html5as
+
+[publish-connection-information]
+recipe = slapos.cookbook:publish
+server_url = http://[$${html5as:ip}]:$${html5as:port}

software/html5as/software.cfg

+[buildout]
+versions = versions
+extensions = buildout-versions
+
+
+
+extends =
+  ../../stack/slapos.cfg
+  ../../component/nginx/buildout.cfg
+  ../../component/curl/buildout.cfg
+  ../../component/dash/buildout.cfg
+  ../../component/tar/buildout.cfg
+
+allow-hosts =
+    *.nexedi.org
+    *.python.org
+    *.sourceforge.net
+    www.slapos.org
+    launchpad.net
+    github.com
+    alastairs-place.net
+    www.alittletooquiet.net
+
+parts =
+    dash
+    tar
+    curl
+    nginx
+    eggs
+    template
+    template_nginx_conf
+    template_downloader
+    template_launcher
+    template_mime_types
+    instance_html5as
+
+[eggs]
+recipe = z3c.recipe.scripts
+eggs = slapos.cookbook
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+output = ${buildout:directory}/template.cfg
+md5sum = 918e0d6513e4d1c92051431d83261dab
+mode = 0644
+
+[instance_html5as]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance_html5as.cfg
+output = ${buildout:directory}/template_html5as.cfg
+md5sum = 579eceb768e8d25fb53338fc4fac6944
+mode = 0644
+
+[template_nginx_conf]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/templates/nginx_conf.in
+md5sum = 0ae1fb1c777c332d76f680c681a4f48a
+filename = nginx_conf.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[template_launcher]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/templates/launcher.in
+md5sum = acf5bb55ceac2e826259d28ed5c1de3a
+filename = launcher.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[template_downloader]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/templates/downloader.in
+md5sum = 7b374a03f4086fcae47491d449da1f09
+filename = downloader.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[template_mime_types]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/templates/mime_types.in
+md5sum = 4ef94a7b458d885cd79ba0b930a5727e
+filename = mime_types.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[versions]
+zc.buildout = 1.6.0-dev-SlapOS-006
+Jinja2 = 2.6
+Pygments = 1.5
+Werkzeug = 0.8.3
+buildout-versions = 1.7
+docutils = 0.9.1
+hexagonit.recipe.cmmi = 1.6
+ipython = 0.13
+meld3 = 0.6.8
+slapos.cookbook = 0.61
+slapos.recipe.template = 2.4.2
+slapos.recipe.download = 1.0.dev-r4053
+z3c.recipe.scripts = 1.0.1
+
+# Required by:
+# slapos.core==0.28.2
+Flask = 0.9
+
+# Required by:
+# slapos.cookbook==0.61
+PyXML = 0.8.4
+
+# Required by:
+# netaddr==0.7.7
+Sphinx = 1.1.3
+
+# Required by:
+# slapos.cookbook==0.61
+inotifyx = 0.2.0
+
+# Required by:
+# slapos.cookbook==0.61
+# slapos.core==0.28.2
+# xml-marshaller==0.9.7
+lxml = 2.3.5
+
+# Required by:
+# slapos.cookbook==0.61
+netaddr = 0.7.7
+
+# Required by:
+# slapos.core==0.28.2
+netifaces = 0.8
+
+# Required by:
+# slapos.cookbook==0.61
+# slapos.core==0.28.2
+# zc.buildout==1.6.0-dev-SlapOS-006
+# zc.recipe.egg==1.3.2
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.61
+slapos.core = 0.28.2
+
+# Required by:
+# slapos.core==0.28.2
+supervisor = 3.0a12
+
+# Required by:
+# slapos.cookbook==0.61
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.cookbook==0.61
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.28.2
+zope.interface = 4.0.1
+
+# Required by:
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.5.1
+
+[networkcache]
+# signature certificates of the following uploaders.
+# Łukasz Nowak
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJANLesB1hoQIEMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMTMyMCAXDTEyMDgyODE0MjEyOFoYDzIxMTIwODA0MTQyMTI4WjAT
+  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  9ED8i6211znu1Z0milwuNZCLlmQlFP590neGjvSRla7wzIBwWreNAX2Hl05sd1og
+  PFZBSeWsStFHQRqjNYOx1WoS4olRGIAwiwLh3Hgmkc8oOe7/q3W22xOZTUXOIiq1
+  FV96jUHe9RmZ910VqLPCMK44aCTmabSCWwk4OfRzI3kCAwEAAaNQME4wHQYDVR0O
+  BBYEFBgvpmTAS/O9vfvSLnwKy/eJC/NAMB8GA1UdIwQYMBaAFBgvpmTAS/O9vfvS
+  LnwKy/eJC/NAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAM3qIP3sY
+  DtqzUJJ7WEbD0dcniHGEycOk/3EKB663jULar+KOuTIFmMGOy5MVWcDsCqjODWXK
+  9LnVeCSkC4Ct8kvkT/WdRFF/nqprbZ6bUrhx2yAKTH6CMhIjDJ8F7fAkH48fLD7M
+  HPuwnRO7OewFpzT/gfQgFKpmVBNUYq7YddE=
+  -----END CERTIFICATE-----

software/html5as/templates/downloader.in

+#! {{ param_html5as['path_shell'] }}
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+
+# Remove exsistant website
+rm -r {{ param_html5as['docroot'] }}/*
+
+# Download and extract website tarball into docroot directory
+exec {{ param_html5as['path_curl'] }} -s {{ download_url }} | {{ param_html5as['path_tar'] }} -z -x -C {{ param_html5as['docroot'] }}

software/html5as/templates/launcher.in

+#! {{ param_html5as['path_shell'] }}
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+
+# Run nginx
+exec {{ param_html5as['bin_nginx'] }} -c {{ param_html5as['path_nginx_conf'] }}

software/html5as/templates/mime_types.in

+types {
+	text/html				html htm shtml;
+	text/css				css;
+	text/xml				xml rss;
+	image/gif				gif;
+	image/jpeg				jpeg jpg;
+	application/x-javascript		js;
+	application/atom+xml			atom;
+
+	text/mathml				mml;
+	text/plain				txt;
+	text/vnd.sun.j2me.app-descriptor	jad;
+	text/vnd.wap.wml			wml;
+	text/x-component			htc;
+
+	image/png				png;
+	image/tiff				tif tiff;
+	image/vnd.wap.wbmp			wbmp;
+	image/x-icon				ico;
+	image/x-jng				jng;
+	image/x-ms-bmp				bmp;
+	image/svg+xml				svg svgz;
+
+	application/java-archive		jar war ear;
+	application/mac-binhex40		hqx;
+	application/msword			doc;
+	application/pdf				pdf;
+	application/postscript			ps eps ai;
+	application/rtf				rtf;
+	application/vnd.ms-excel		xls;
+	application/vnd.ms-powerpoint		ppt;
+	application/vnd.wap.wmlc		wmlc;
+	application/vnd.google-earth.kml+xml	kml;
+	application/vnd.google-earth.kmz	kmz;
+	application/x-7z-compressed		7z;
+	application/x-cocoa			cco;
+	application/x-java-archive-diff		jardiff;
+	application/x-java-jnlp-file		jnlp;
+	application/x-makeself			run;
+	application/x-perl			pl pm;
+	application/x-pilot			prc pdb;
+	application/x-rar-compressed		rar;
+	application/x-redhat-package-manager	rpm;
+	application/x-sea			sea;
+	application/x-shockwave-flash		swf;
+	application/x-stuffit			sit;
+	application/x-tcl			tcl tk;
+	application/x-x509-ca-cert		der pem crt;
+	application/x-xpinstall			xpi;
+	application/xhtml+xml			xhtml;
+	application/zip				zip;
+
+	application/octet-stream		bin exe dll;
+	application/octet-stream		deb;
+	application/octet-stream		dmg;
+	application/octet-stream		eot;
+	application/octet-stream		iso img;
+	application/octet-stream		msi msp msm;
+	application/ogg				ogx;
+
+	audio/midi				mid midi kar;
+	audio/mpeg				mpga mpega mp2 mp3 m4a;
+	audio/ogg				oga ogg spx;
+	audio/x-realaudio			ra;
+	audio/webm				weba;
+
+	video/3gpp				3gpp 3gp;
+	video/mp4				mp4;
+	video/mpeg				mpeg mpg mpe;
+	video/ogg				ogv;
+	video/quicktime				mov;
+	video/webm				webm;
+	video/x-flv				flv;
+	video/x-mng				mng;
+	video/x-ms-asf				asx asf;
+	video/x-ms-wmv				wmv;
+	video/x-msvideo				avi;
+}

software/html5as/templates/nginx_conf.in

+worker_processes {{ param_html5as['nb_workers'] }};
+
+pid {{ param_html5as['path_pid'] }};
+error_log {{ param_html5as['path_error_log'] }};
+
+daemon off;
+
+events {
+	worker_connections 1024;
+	accept_mutex off;
+}
+
+http {
+	include {{ param_html5as['path_mime_types'] }};
+	default_type application/octet-stream;
+    access_log {{ param_html5as['path_access_log'] }} combined;
+	index index.html;
+
+    server {
+        listen [{{ param_html5as['ip'] }}]:{{ param_html5as['port'] }};
+        server_name _;
+
+        keepalive_timeout 5;
+        client_body_temp_path {{ param_tempdir['client_body_temp_path'] }};
+        proxy_temp_path {{ param_tempdir['proxy_temp_path'] }};
+        fastcgi_temp_path {{ param_tempdir['fastcgi_temp_path'] }};
+        uwsgi_temp_path {{ param_tempdir['uwsgi_temp_path'] }};
+        scgi_temp_path {{ param_tempdir['scgi_temp_path'] }};
+
+        # path for static files
+        root {{ param_html5as['docroot'] }};
+    }
+}

software/joomla/database.xml-in

+<?xml version="1.0" encoding="utf-8"?>
+<form>
+  <fieldset>
+  	<fieldset name="basic">
+			<field name="db_type" type="databaseconnection"
+				id="db_type" class="inputbox"
+				label="INSTL_DATABASE_TYPE_LABEL"
+				supported="mysql,mysqli,sqlsrv,sqlazure"
+				required="true"
+				default="mysql"
+				filter="string"
+			/>
+
+			<field name="db_host" type="text" id="db_host" class="inputbox"
+				label="INSTL_DATABASE_HOST_LABEL"
+				default="%(mysql_host)s"
+				required="true"
+			/>
+			<field name="db_user" type="text" id="db_user" class="inputbox"
+				label="INSTL_DATABASE_USER_LABEL"
+        default="%(mysql_user)s"
+				required="true"
+			/>
+			<field name="db_pass" type="password" id="db_pass" class="inputbox"
+				label="INSTL_DATABASE_PASSWORD_LABEL"
+        default="%(mysql_password)s"
+				filter="raw"
+			/>
+			<field name="db_name" type="text" id="db_name" class="inputbox"
+				label="INSTL_DATABASE_NAME_LABEL"
+        default="%(mysql_database)s"
+				required="true"
+			/>
+		</fieldset>
+
+		<!-- Advanced Settings -->
+		<fieldset name="advanced">
+			<field name="db_old" type="radio" id="db_old" class="inputbox"
+				label="INSTL_DATABASE_OLD_PROCESS_LABEL"
+				default="backup"
+				required="true"
+			>
+				<option value="backup">INSTL_DATABASE_FIELD_VALUE_BACKUP</option>
+				<option value="remove">INSTL_DATABASE_FIELD_VALUE_REMOVE</option>
+			</field>
+			<field name="db_prefix" type="prefix" id="db_prefix" class="inputbox"
+				label="INSTL_DATABASE_PREFIX_LABEL"
+				required="true"
+				validate="prefix"
+				message="INSTL_DATABASE_PREFIX_MSG"
+			/>
+		</fieldset>
+	</fieldset>
+</form>

software/joomla/instance.cfg

 [buildout]
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
 
 parts = instance
 
 [instance]
-recipe = ${instance-recipe:egg}:${instance-recipe:module}
-source = ${application:location}
-
 httpd_binary = ${apache:location}/bin/httpd
 mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql

software/joomla/software.cfg

 [buildout]
 versions = versions
 
-parts =
-  template
-  apache-php
-  mariadb
-  eggs
-  instance-recipe-egg
-  downloadcache-workaround
+
   
 extends =
-  ../../stack/lamp.cfg
+  ../../stack/lamp/buildout.cfg
   ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked
-url = http://joomlacode.org/gf/download/frsrelease/15278/66554/Joomla_1.7.0-Stable-Full_Package.tar.gz
-md5sum = 19451c0352e4c72d871cc8817126286a
+url = http://joomlacode.org/gf/download/frsrelease/17173/74758/Joomla_2.5.6-Stable-Full_Package.zip
+md5sum = 3aa7d7b58bfa4eec3c3724209894d14e
+strip-top-level-dir = false
   
-[instance-recipe]
-egg = slapos.cookbook
-module = lamp.simple
-
-[template]
-# Default template for the instance.
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-#${:_profile_base_location_}/instance.cfg
-#md5sum = Student shall put md5 of instance.cfg here
-output = ${buildout:directory}/template.cfg
+[application-template]
+recipe = slapos.recipe.download
+url = ${:_profile_base_location_}/database.xml-in
+md5sum = 6ae063318a251b70ae7d037e3ae375d6 
+download-only = True
+filename = template.in
 mode = 0644
-
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-eggs = ${instance-recipe:egg}
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
-
-Jinja2 = 2.6
-MySQL-python = 1.2.3
-Werkzeug = 0.8.1
-apache-libcloud = 0.5.2
-buildout-versions = 1.7
-hexagonit.recipe.cmmi = 1.5.0
-meld3 = 0.6.7
-plone.recipe.command = 1.1
-slapos.cookbook = 0.34
-slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
-slapos.recipe.template = 2.2
-slapos.toolbox = 0.10
-
-# Required by:
-# slapos.core==0.18
-# slapos.toolbox==0.10
-Flask = 0.8
-
-# Required by:
-# slapos.cookbook==0.34
-PyXML = 0.8.4
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-# xml-marshaller==0.9.7
-lxml = 2.3.1
-
-# Required by:
-# slapos.cookbook==0.34
-netaddr = 0.7.6
-
-# Required by:
-# slapos.core==0.18
-netifaces = 0.6
-
-# Required by:
-# slapos.toolbox==0.10
-paramiko = 1.7.7.1
-
-# Required by:
-# slapos.toolbox==0.10
-psutil = 0.3.0
-
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
-# Required by:
-# slapos.cookbook==0.34
-# slapos.toolbox==0.10
-slapos.core = 0.18
-
-# Required by:
-# slapos.core==0.18
-supervisor = 3.0a10
-
-# Required by:
-# slapos.cookbook==0.34
-# slapos.toolbox==0.10
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.34
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.18
-zope.interface = 3.8.0
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+ 
+[application-configuration]
+location = installation/models/forms/database.xml
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically

software/kumofs/software.cfg

 [buildout]
-extensions =
-  buildout-versions
-
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
 
 extends =
   ../../component/kumo/buildout.cfg
@@ -11,23 +6,7 @@ extends =
   ../../component/stunnel/buildout.cfg
   ../../component/rdiff-backup/buildout.cfg
   ../../component/lxml-python/buildout.cfg
-  ../../stack/shacache-client.cfg
-
-# 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
-
-versions = versions
+  ../../stack/slapos.cfg
 
 parts =
 # Create instance template
@@ -39,11 +18,6 @@ parts =
   eggs
   instance-recipe-egg
 
-# 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
-
 [instance-recipe]
 egg = slapos.cookbook
 module = kumofs
@@ -65,74 +39,6 @@ md5sum = 056a4af7128fd9e31da42c85cc039420
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-003
-
-Jinja2 = 2.6
-Werkzeug = 0.8.2
-buildout-versions = 1.7
-erp5.recipe.cmmiforcei686 = 0.1.3
-hexagonit.recipe.cmmi = 1.5.0
-meld3 = 0.6.8
-rdiff-backup = 1.0.5
-slapos.cookbook = 0.38
-slapos.recipe.template = 2.2
-
-# Required by:
-# slapos.core==0.21
-Flask = 0.8
-
-# Required by:
-# slapos.cookbook==0.38
-PyXML = 0.8.5
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# Required by:
-# slapos.cookbook==0.38
-# slapos.core==0.21
-# xml-marshaller==0.9.7
-lxml = 2.3.3
-
-# Required by:
-# slapos.cookbook==0.38
-netaddr = 0.7.6
-
-# Required by:
-# slapos.core==0.21
-netifaces = 0.6
-
-# Required by:
-# slapos.cookbook==0.38
-# slapos.core==0.21
-# zc.buildout==1.6.0-dev-SlapOS-003
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
-
-# Required by:
-# slapos.cookbook==0.38
-slapos.core = 0.21
-
-# Required by:
-# slapos.core==0.21
-supervisor = 3.0a12
-
-# Required by:
-# slapos.cookbook==0.38
-xml-marshaller = 0.9.7
-
-# Required by:
-# erp5.recipe.cmmiforcei686==0.1.3
-# slapos.cookbook==0.38
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.21
-zope.interface = 3.8.0
-
 [networkcache]
 # Cedric de Saint Martin signature certificate
 signature-certificate-list =

software/lamp-template-static/software.cfg

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

software/lxc/check_exists.sh.in

+#!${:bash} -e
+
+${:test-binary} -f ${:file}

software/lxc/check_state.sh.in

+#!${:bash} -e
+
+if [ -f ${:file} ]
+then
+    ${:test-binary} $(${:cat} ${:file}) = ${:value}
+else
+    exit 1
+fi

software/lxc/instance-lxc.cfg

+[buildout]
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+parts =
+    publish
+    rootfs
+    uuid
+    lxc-conf
+    shellinabox
+    certificate-authority
+    ca-shellinabox
+    container-promise
+    shellinabox-promise
+    rootfs-promise
+
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+tmp = $${buildout:directory}/tmp
+srv = $${buildout:directory}/srv
+bin = $${buildout:directory}/bin
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+services = $${rootdirectory:etc}/run
+promises = $${rootdirectory:etc}/promise
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+shellinabox = $${rootdirectory:srv}/shellinabox/
+ca-dir = $${rootdirectory:srv}/ca/
+
+[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/
+
+[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/
+
+[rootfs]
+recipe = slapos.cookbook:downloader
+url = $${slap-parameter:rootfs}
+md5sum = $${slap-parameter:rootfs-md5sum}
+downloaded-file = $${rootdirectory:srv}/rootfs.img
+downloaded-file-complete = $${:downloaded-file}.complete
+binary = $${basedirectory:services}/rootfsdownload
+path = ${tar:location}/bin/:${gzip:location}/bin/:${bzip2:location}/bin/:${xz-utils:location}/bin/
+archive = true
+
+[lxc-conf]
+recipe = slapos.recipe.template
+url = ${lxc-conf-in:location}/${lxc-conf-in:filename}
+output = $${rootdirectory:etc}/lxc.conf
+bridge = !!BRIDGE_NAME!!
+interface = lxc$${slap-network-information:network-interface}
+
+[passwd]
+recipe = slapos.cookbook:pwgen
+file = $${buildout:directory}/.password
+pwgen-binary = ${pwgen:location}/bin/pwgen
+
+[shellinabox]
+recipe = slapos.cookbook:shellinabox
+ipv6 = $${slap-network-information:global-ipv6}
+port = 8080
+shell = ${lxc:location}/bin/lxc-console -n $${uuid:uuid}
+wrapper = $${rootdirectory:bin}/shellinaboxd_raw
+shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd
+password = $${passwd: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
+
+[ca-shellinabox]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+executable = $${shellinabox:wrapper}
+wrapper = $${rootdirectory:bin}/shellinaboxd
+key-file = $${shellinabox:key-file}
+cert-file = $${shellinabox:cert-file}
+
+[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}
+
+[ca-shellinabox]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+executable = $${shellinabox:wrapper}
+wrapper = $${rootdirectory:bin}/shellinaboxd
+key-file = $${shellinabox:key-file}
+cert-file = $${shellinabox:cert-file}
+
+[uuid]
+recipe = slapos.cookbook:uuid
+cache-file = $${buildout:directory}/.slapcontainername
+
+[publish]
+recipe = slapos.cookbook:publish
+url = https://[$${shellinabox:ipv6}]:$${shellinabox:port}/
+password = $${shellinabox:password}
+
+[template-promise-state]
+recipe = slapos.recipe.template
+url = ${promise-state:location}/${promise-state:filename}
+bash = ${bash:location}/bin/bash
+test-binary = ${coreutils:location}/bin/test
+cat = ${coreutils:location}/bin/cat
+value = started
+mode = 700
+
+[container-promise]
+<= template-promise-state
+output = $${basedirectory:promises}/slapcontainer
+file = $${buildout:directory}/.slapcontainer.state
+
+[shellinabox-promise]
+<= template-promise-state
+output = $${basedirectory:promises}/shellinabox
+file = $${buildout:directory}/.shellinabox.state
+
+[rootfs-promise]
+recipe = slapos.recipe.template
+url = ${promise-exists:location}/${promise-exists:filename}
+output = $${basedirectory:promises}/rootfs
+bash = ${bash:location}/bin/bash
+test-binary = ${coreutils:location}/bin/test
+file = $${rootfs:downloaded-file-complete}
+mode = 700
+
+[slap-parameter]
+rootfs-md5sum =

software/lxc/instance.cfg

+[buildout]
+parts = 
+    switch-softwaretype
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${template-lxc:output}
+
+[slap-connection]
+# part to migrate to new - separated words
+computer-id = $${slap_connection:computer_id}
+partition-id = $${slap_connection:partition_id}
+server-url = $${slap_connection:server_url}
+software-release-url = $${slap_connection:software_release_url}
+key-file = $${slap_connection:key_file}
+cert-file = $${slap_connection:cert_file}

software/lxc/lxc.conf.in

+# ${slap-connection:requested}
+
+lxc.utsname = ${uuid:uuid}
+
+lxc.network.type = veth
+lxc.network.link = ${:bridge}
+lxc.network.veth.pair = ${:interface}
+lxc.network.name = eth0
+lxc.network.flags = up
+
+lxc.tty = 4
+lxc.pts = 1024
+
+lxc.cgroup.devices.deny = a
+lxc.cgroup.devices.allow = c 1:3 rwm
+lxc.cgroup.devices.allow = c 1:5 rwm
+lxc.cgroup.devices.allow = c 5:1 rwm
+lxc.cgroup.devices.allow = c 5:0 rwm
+lxc.cgroup.devices.allow = c 4:0 rwm
+lxc.cgroup.devices.allow = c 4:1 rwm
+lxc.cgroup.devices.allow = c 1:9 rwm
+lxc.cgroup.devices.allow = c 1:8 rwm
+lxc.cgroup.devices.allow = c 136:* rwm
+lxc.cgroup.devices.allow = c 5:2 rwm
+lxc.cgroup.devices.allow = c 254:0 rwm
+
+lxc.rootfs = ${rootfs:downloaded-file}
+
+lxc.cap.drop = sys_module sys_time sys_chroot mknod

software/lxc/rootfs.README

+This file explain how to easily generate a rootfs for slapcontainer,
+explaining how to generate a debian rootfs.
+
+This can be used in order to generate any rootfs.
+
+NB: A ready to use rootfs is available at :
+  http://[2001:380:e0c:155:5054:ff:fe5d:a604]/debian-wheezy.tar.xz
+
+Requirements:
+=============
+
+  Any Linux distro with the following programs installed :
+
+    * LXC userland tools (for generating the rootfs)
+    * debootstrap (in order to use lxc-debian script)
+    * dpkg (a dependency of debootstrap)
+    * Qemu tools (providing qemu-img)
+
+Step by step instructions explained:
+====================================
+
+  First we need to generate a raw image.
+
+  1. Run ::
+    $ qemu-img create -f raw image-name.raw SIZE
+
+  2. Now format it (in this example we will format in in ext4) ::
+    $ mkfs.ext4 image-name.raw
+
+  We will used lxc-debian script provided in lxc tools in order to
+  generate the rootfs.
+
+  lxc-debian is run this way ::
+    lxc-debian -p /path/
+  
+  lxc-debian will create a subdirectory in /path/ named “rootfs”,
+  and a configuration file in /path/.
+
+  So in order to generate the rootfs on the raw image, create rootfs
+  directory and mount the raw img in it.
+
+  3. ::
+    $ mkdir -p /path/rootfs/
+    $ mount image-name.raw /path/rootfs
+
+  4. Next, run the lxc-debian script ::
+    $ lxc-debian -p /path/
+
+  Dont forget to change the default password, before unmount it.
+
+  5. ::
+    $ sudo chroot /path/rootfs/ /bin/passwd
+
+  6. ::
+    $ umount /path/rootfs
+
+  Next, you can archive it using sparse tar, and compress it.
+  7. ::
+    $ tar -Sc image-name.raw | pxz -T8 > image-name.tar.gz

software/lxc/software.cfg

+[buildout]
+
+extends =
+  ../../stack/slapos.cfg
+  ../../component/lxc/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../component/curl/buildout.cfg
+  ../../component/gzip/buildout.cfg
+  ../../component/bzip2/buildout.cfg
+  ../../component/xz-utils/buildout.cfg
+  ../../component/tar/buildout.cfg
+  ../../component/shellinabox/buildout.cfg
+  ../../component/pwgen/buildout.cfg
+  ../../component/bash/buildout.cfg
+  ../../component/coreutils/buildout.cfg
+
+parts =
+  lxml-python
+  template
+  template-lxc
+  lxc-conf-in
+  slapos-cookbook
+  slapos-toolbox
+  lxc
+  shellinabox
+  pwgen
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = c722ba58b06d3105f64fdeccbbd689bb
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[template-lxc]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-lxc.cfg
+md5sum = af5e31fb41e2d31b25f172df45f29fc6
+output = ${buildout:directory}/template-lxc.cfg
+mode = 0644
+
+[download]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+mode = 0644
+
+[lxc-conf-in]
+<= download
+filename = lxc.conf.in
+md5sum = b25334fc369e4e0f608bc64f14b0315d
+
+[promise-state]
+<= download
+filename = check_state.sh.in
+md5sum = 725fb0477f8b8778566ed4b22b25bf27
+
+[promise-exists]
+<= download
+filename = check_exists.sh.in
+md5sum = 60d4f5f73a3d10a3d7d7201aab977d19
+
+[slapos-toolbox]
+recipe = zc.recipe.egg
+scripts = slapcontainer
+eggs =
+  slapos.toolbox
+
+[versions]
+slapos.cookbook = 0.64.1
+slapos.toolbox = 0.30

software/magento/software.cfg

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

software/mariadb/software.cfg

 [buildout]
 
-extensions =
-  slapos.zcbworkarounds
-
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-
 extends =
   ../../component/mariadb/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/logrotate/buildout.cfg
   ../../component/stunnel/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
   ../../component/lxml-python/buildout.cfg
   ../../component/gzip/buildout.cfg
   ../../component/duplicity/buildout.cfg
-  ../../stack/shacache-client.cfg
-
-# 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
-
-# XXX: This is dirty, recipe trick shall be used.
-develop =
-  /opt/slapdev
-
-versions = versions
+  ../../stack/slapos.cfg
 
 parts =
 # Create instance template
@@ -50,28 +25,16 @@ parts =
   mariadb
   stunnel
 
-# XXX: Workaround of SlapOS limitation
-# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
-# development / fast switching environment for whole software
-unzip = true
-
-[rebootstrap]
-# Default first version of rebootstrapped python
-version = 2
-section = python2.7
-
 [instance-recipe]
 egg = slapos.cookbook
 module = mysql
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [eggs]
 recipe = zc.recipe.egg
-python = python2.7
 eggs =
   ${lxml-python:egg}
 
@@ -103,20 +66,3 @@ url = ${:_profile_base_location_}/instance-recover.cfg
 md5sum = a8df936b6abf82d0d798b83ddfebdc8a
 output = ${buildout:directory}/template-recover.cfg
 mode = 0644
-
-[versions]
-slapos.cookbook =
-
-# Required by slapos.cookbook==0.25
-slapos.core = 0.4
-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

software/memcached/software.cfg

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

software/mysql-5.1/software.cfg

 [buildout]
-extensions =
-  buildout-versions
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
 
 extends =
   ../../component/dcron/buildout.cfg
@@ -13,23 +9,7 @@ extends =
   ../../component/rdiff-backup/buildout.cfg
   ../../component/stunnel/buildout.cfg
   ../../component/xtrabackup/buildout.cfg
-  ../../stack/shacache-client.cfg
-
-# 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
-
-versions = versions
+  ../../stack/slapos.cfg
 
 parts =
   template
@@ -42,11 +22,6 @@ parts =
   eggs
   instance-recipe-egg
 
-# 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
-
 [instance-recipe]
 egg = slapos.cookbook
 module = mysql
@@ -77,7 +52,7 @@ Jinja2 = 2.6
 Werkzeug = 0.8.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 meld3 = 0.6.8
 rdiff-backup = 1.0.5
 slapos.recipe.template = 2.2

software/net2ftp/software.cfg

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

software/openX/software.cfg

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

software/os-commerce/software.cfg

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

software/phpbb/software.cfg

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

software/phpmyadmin/software.cfg

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

software/phpnuke/software.cfg

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

software/pimcore/software.cfg

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

software/piwigo/software.cfg

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

software/piwik/software.cfg

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

software/prestashop/software.cfg

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

software/pulse/software.cfg

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

software/punbb/software.cfg

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

software/seleniumrunner/software.cfg

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

software/simpleMachineForum/software.cfg

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

software/slapos-testing/instance.cfg

+[buildout]
+parts = 
+  slapos-test-runner
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[create-directory]
+recipe = slapos.cookbook:mkdirectory
+bin = $${buildout:directory}/bin
+etc = $${buildout:directory}/etc
+services = $${:etc}/run
+srv = $${buildout:directory}/srv
+source-code = $${:srv}/eggs-source-code
+
+[download-source]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+
+# Local development
+[slapos.core]
+<= download-source
+repository = ${slapos.core-repository:location}
+
+[slapos.recipe.template]
+<= download-source
+repository = ${slapos.recipe.template-repository:location}
+
+[slapos.recipe.build]
+<= download-source
+repository = ${slapos.recipe.build-repository:location}
+
+[slapos-test-runner]
+recipe = slapos.cookbook:egg_test
+run-test-suite = $${create-directory:bin}/runTestSuite
+run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
+# The list of executables should be defined here and a combination
+# of tests should dynamically generated.
+#python-list = $${}
+test-list =
+  $${slapos.core:location}
+  $${slapos.recipe.template:location}
+  $${slapos.recipe.build:location}
+prepend-path = ${git:location}/bin:${libxslt:location}/bin:${python2.7:location}/bin
+environment = environment
+
+[environment]
+CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
+LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib
+PYTHONPATH = ${python-setuptools:location}

software/slapos-testing/software.cfg

+[buildout]
+
+extends =
+  ../../component/git/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../component/libxml2/buildout.cfg
+  ../../component/libxslt/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/python-setuptools/buildout.cfg
+  ../../component/zlib/buildout.cfg
+  ../../stack/slapos.cfg
+
+parts =
+  slapos.cookbook-repository
+  slapos.core-repository
+  slapos.recipe.template-repository
+  slapos.recipe.build-repository
+  eggs
+  template
+
+[eggs]
+recipe = zc.recipe.egg
+eggs = 
+  ${lxml-python:egg}
+  erp5.util
+  slapos.cookbook
+entry-points =
+  runTestSuite=erp5.util.testsuite:runTestSuite
+scripts =
+  runTestSuite
+
+[erp5.util-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+repository = http://git.erp5.org/repos/erp5.git
+branch = master
+
+[slapos.cookbook-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+repository = http://git.erp5.org/repos/slapos.git
+branch = slapos-testing
+
+[slapos.core-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+repository = http://git.erp5.org/repos/slapos.core.git
+branch = master
+
+[slapos.recipe.template-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+repository = http://git.erp5.org/repos/slapos.recipe.template.git
+branch = master
+
+[slapos.recipe.build-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+repository = http://git.erp5.org/repos/slapos.recipe.build.git
+branch = master
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = d7dbd5da07c1170d0b80199d99f932eb
+output =  ${buildout:directory}/template.cfg
+mode = 640
+
+[versions]
+Jinja2 = 2.6
+Werkzeug = 0.8.3
+buildout-versions = 1.7
+erp5.util = 0.4.7
+hexagonit.recipe.cmmi = 1.6
+lxml = 3.0alpha2
+meld3 = 0.6.8
+plone.recipe.command = 1.1
+slapos.cookbook = 0.65
+slapos.libnetworkcache = 0.13.2
+slapos.recipe.build = 0.11.2
+slapos.recipe.download = 1.0.dev-r4053
+slapos.recipe.template = 2.4.2
+
+# Required by:
+# slapos.core==0.28.5
+Flask = 0.9
+
+# Required by:
+# slapos.cookbook==0.65
+PyXML = 0.8.4
+
+# Required by:
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.5.1
+
+# Required by:
+# slapos.cookbook==0.65
+inotifyx = 0.2.0
+
+# Required by:
+# slapos.cookbook==0.65
+netaddr = 0.7.10
+
+# Required by:
+# slapos.core==0.28.5
+netifaces = 0.8
+
+# Required by:
+# erp5.util==0.4.7
+# slapos.cookbook==0.65
+# slapos.core==0.28.5
+# zc.buildout==1.6.0-dev-SlapOS-006
+# zc.recipe.egg==1.3.2
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.65
+slapos.core = 0.28.5
+
+# Required by:
+# slapos.core==0.28.5
+supervisor = 3.0a12
+
+# Required by:
+# slapos.cookbook==0.65
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.cookbook==0.65
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.28.5
+zope.interface = 4.0.1

software/slaprunner/instance-runner.cfg

@@ -6,7 +6,12 @@ parts =
   dropbear-server-add-authorized-key
   sshkeys-authority
   publish-connection-informations
+  slaprunner-promise
+  slaprunner-frontend-promise
+  cloud9-promise
+  dropbear-promise
 
+  
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
@@ -56,7 +61,7 @@ wrapper = $${basedirectory:services}/cloud9
 working-directory = $${runnerdirectory:home}
 git-binary = ${git:location}/bin/git
 node-binary = ${nodejs:location}/bin/node
-cloud9 = ${cloud9:location}/server.js
+cloud9 = ${cloud9:executable}
 
 [slaprunner]
 recipe = slapos.cookbook:slaprunner
@@ -145,6 +150,35 @@ cloud9_url = $${cloud9:access-url}
 ssh_command = ssh $${dropbear-server:host} -p $${dropbear-server:port}
 password_recovery_code = $${recovery-code:passwd}
 
+
+# Deploy promises scripts
+[slaprunner-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${basedirectory:promises}/slaprunner
+hostname = $${slaprunner:ipv6}
+port = $${slaprunner:runner_port}
+
+[slaprunner-frontend-promise]
+recipe = slapos.cookbook:check_url_available
+path = $${basedirectory:promises}/slaprunner_frontend
+url = $${request-frontend:connection-site_url}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+
+[cloud9-promise]
+recipe = slapos.cookbook:check_url_available
+path = $${basedirectory:promises}/cloud9
+url = http://$${cloud9:ip}:$${cloud9:port}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
+
+[dropbear-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${basedirectory:promises}/dropbear
+hostname = $${dropbear-server:host}
+port = $${dropbear-server:port}
+
+
 [slap-parameter]
 # Default value if no ssh key is specified
 authorized-key =

software/slaprunner/software.cfg

 [buildout]
+
 extends =
   ../../stack/slapos.cfg
   ../../stack/flask.cfg
@@ -6,6 +7,7 @@ extends =
   ../../component/dropbear/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/cloud9/buildout.cfg
+  ../../component/dash/buildout.cfg
 
 parts =
   template
@@ -23,7 +25,7 @@ md5sum = 5307e4200f044ae57b504ad68444491c
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg
-md5sum = 963ef5b43cd52a5804a6d254d842cae5
+md5sum = b57ebff565595fa92cd7d5adc6a22c7e
 mode = 0644
 
 [eggs]
@@ -54,49 +56,42 @@ signature-certificate-list =
 [versions]
 Flask-Auth = 0.8
 Jinja2 = 2.6
-Pygments = 1.5
 Werkzeug = 0.8.3
 apache-libcloud = 0.11.1
 async = 0.6.1
 buildout-versions = 1.7
-docutils = 0.9.1
 gitdb = 0.5.4
 hexagonit.recipe.cmmi = 1.6
-ipython = 0.13
 meld3 = 0.6.8
 plone.recipe.command = 1.1
 pycrypto = 2.6
-slapos.cookbook = 0.60
-slapos.libnetworkcache = 0.12
-slapos.recipe.build = 0.10.2
-slapos.recipe.template = 2.4.1
-slapos.toolbox = 0.28.1
+slapos.cookbook = 0.64.2
+slapos.libnetworkcache = 0.13.2
+slapos.recipe.build = 0.11
+slapos.recipe.template = 2.4.2
+slapos.toolbox = 0.30
 smmap = 0.8.2
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.core==0.27
-# slapos.toolbox==0.28.1
+# slapos.core==0.28.5
+# slapos.toolbox==0.30
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.28.1
+# slapos.toolbox==0.30
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.cookbook==0.60
+# slapos.cookbook==0.64.2
 PyXML = 0.8.4
 
 # Required by:
-# netaddr==0.7.7
-Sphinx = 1.1.3
-
-# Required by:
-# slapos.toolbox==0.28.1
+# slapos.toolbox==0.30
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.28.1
+# slapos.toolbox==0.30
 feedparser = 5.1.2
 
 # Required by:
@@ -104,58 +99,58 @@ feedparser = 5.1.2
 hexagonit.recipe.download = 1.5.1
 
 # Required by:
-# slapos.cookbook==0.60
+# slapos.cookbook==0.64.2
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.core==0.27
-# slapos.toolbox==0.28.1
+# slapos.core==0.28.5
+# slapos.toolbox==0.30
 # xml-marshaller==0.9.7
-lxml = 2.3.5
+lxml = 3.0alpha2
 
 # Required by:
-# slapos.cookbook==0.60
-netaddr = 0.7.7
+# slapos.cookbook==0.64.2
+netaddr = 0.7.9
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.5
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.28.1
+# slapos.toolbox==0.30
 paramiko = 1.7.7.2
 
 # Required by:
-# slapos.toolbox==0.28.1
-psutil = 0.6.0
+# slapos.toolbox==0.30
+psutil = 0.6.1
 
 # Required by:
-# slapos.cookbook==0.60
-# slapos.core==0.27
-# slapos.libnetworkcache==0.12
-# slapos.toolbox==0.28.1
+# slapos.cookbook==0.64.2
+# slapos.core==0.28.5
+# slapos.libnetworkcache==0.13.2
+# slapos.toolbox==0.30
 # supervisor==3.0a12
-# zc.buildout==1.6.0-dev-SlapOS-006
+# zc.buildout==1.6.0-dev-SlapOS-007
 # zc.recipe.egg==1.3.2
 # zope.interface==4.0.1
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.60
-slapos.core = 0.27
+# slapos.cookbook==0.64.2
+slapos.core = 0.28.5
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.5
 supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.60
+# slapos.cookbook==0.64.2
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.60
+# slapos.cookbook==0.64.2
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.5
 zope.interface = 4.0.1

software/spip/software.cfg

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

software/statusnet/software.cfg

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

software/sugar-crm/software.cfg

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

software/tiki/software.cfg

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

software/wordpress/software.cfg

 [buildout]
-versions = versions
-
-  
 extends =
   ../../stack/lamp/buildout.cfg
 
-
 [application]
-url = http://wordpress.org/latest.tar.gz
-#md5sum = Student may put here md5sum of this file, this is good idea
+url = http://wordpress.org/wordpress-3.4.2.tar.gz
+md5sum = dfc56cee27eec8fb79070f033ecd4b25
 
 [application-template]
 recipe = slapos.recipe.download

software/xoops/software.cfg

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

software/xwiki/software.cfg

@@ -2,18 +2,12 @@
 extends =
   ../../stack/tomcat.cfg
 
-find-links =
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-
-versions = versions
-
 [instance-recipe]
 egg = slapos.cookbook
 module = xwiki
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 
 [template]
@@ -40,7 +34,7 @@ xml-marshaller = 0.9.7
 setuptools = 0.6c12dev-r88846
 
 hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.0
+hexagonit.recipe.download = 1.5.1
 plone.recipe.command = 1.1
 
 # Use SlapOS patched zc.buildout

software/zencart/software.cfg

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

stack/erp5/buildout.cfg

@@ -247,7 +247,7 @@ mode = 640
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 9704211fdbed6b23854dcc2222d387c4
+md5sum = 26d26c357053af48602b5110120bd085
 extra-context =
     key apache_location apache:location
     key aspell_location aspell:location
@@ -287,8 +287,8 @@ extra-context =
     key poppler_location poppler:location
     key sed_location sed:location
     key template_cloudooo template-cloudooo:target
-    key template_erp5_development template-erp5-development:target
-    key template_erp5_production template-erp5-production:rendered
+    key template_erp5_single template-erp5-single:target
+    key template_erp5_cluster template-erp5-cluster:rendered
     key template_kumofs template-kumofs:rendered
     key template_mariadb template-mariadb:rendered
     key template_memcached template-memcached:rendered
@@ -311,15 +311,15 @@ extra-context =
     key dash_location dash:location
     key memcached_location memcached:location
 
-[template-erp5-development]
+[template-erp5-single]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-erp5-development.cfg.in
+url = ${:_profile_base_location_}/instance-erp5-single.cfg.in
 md5sum = 2a4312202a3160f874c4fa3ee9155a1d
 mode = 640
 
-[template-erp5-production]
+[template-erp5-cluster]
 < = template-jinja2-base
-filename = instance-erp5-production.cfg
+filename = instance-erp5-cluster.cfg
 md5sum = 3051f3fea39d7409c417dcac26027b56
 extra-context =
     key local_bt5_repository local-bt5-repository:list

stack/erp5/instance.cfg.in

@@ -165,32 +165,33 @@ extra-context =
     key tesseract_location dynamic-template-zope-parameters:tesseract
     key w3m_location dynamic-template-zope-parameters:w3m
 
-[template-erp5-development-parameters]
+[template-erp5-single-parameters]
 bin-directory = {{ bin_directory }}
 openssl = {{ openssl_location }}
 local_bt5_repository = {{ local_bt5_repository  }}
 dash = {{ dash_location }}
 curl = {{ curl_location }}
 
-[template-erp5-development]
+[template-erp5-single]
 < = jinja2-template-base
-template = {{ template_erp5_development }}
-filename = instance-erp5-development.cfg
+template = {{ template_erp5_single }}
+filename = instance-erp5-single.cfg
 # XXX: duplicates above section, so less is modified in template in this
 # commit. Should be replaced by a "section" line (preserving template_zope
 # definition).
 extra-context =
-    key bin_directory template-erp5-development-parameters:bin-directory
-    key openssl_location template-erp5-development-parameters:openssl
-    key curl_location template-erp5-development-parameters:curl
-    key dash_location template-erp5-development-parameters:dash
+    key bin_directory template-erp5-single-parameters:bin-directory
+    key openssl_location template-erp5-single-parameters:openssl
+    key curl_location template-erp5-single-parameters:curl
+    key dash_location template-erp5-single-parameters:dash
     key template_zope dynamic-template-zope:rendered
-    key local_bt5_repository template-erp5-development-parameters:local_bt5_repository
+    key local_bt5_repository template-erp5-single-parameters:local_bt5_repository
 
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype
-default = ${template-erp5-development:rendered}
-production = {{ template_erp5_production }}
+default = ${template-erp5-single:rendered}
+production = {{ template_erp5_cluster }}
+cluster = {{ template_erp5_cluster }}
 kumofs = {{ template_kumofs }}
 memcached = {{ template_memcached }}
 cloudooo = ${dynamic-template-cloudooo:rendered}

stack/lamp/buildout.cfg

@@ -66,7 +66,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-php.cfg
 output = ${buildout:directory}/template-apache-php.cfg
-md5sum = 8bb0b03689d2be9566ed1ef3e96b4403
+md5sum = 59cee571ea0fcdf2e6c9b3195e258738
 mode = 0644
 
 [template-apache-backup]
@@ -87,7 +87,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
 output = ${buildout:directory}/template-mariadb.cfg
-md5sum = ba5ebecbfe9fbb96d48f2baa43c37065  
+md5sum = 767452bc503ff6c1b7af0ebfac590c9f
 mode = 0644
 
 [template-mariadb-pbsready]
@@ -135,6 +135,16 @@ eggs =
 [networkcache]
 # Romain Courteaud + Sebastien Robin + Alain Takoudjou
 # + Cedric de Saint Martin signature certificate
+# List of signatures of uploaders we trust:
+#   Romain Courteaud
+#   Sebastien Robin
+#   Kazuhiko Shiozaki
+#   Cedric de Saint Martin
+#   Yingjie Xu
+#   Gabriel Monnerat
+#   Łukasz Nowak
+#   Test Agent Signature
+#   Alain Takoudjou
 signature-certificate-list =
   -----BEGIN CERTIFICATE-----
   MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
@@ -163,17 +173,17 @@ signature-certificate-list =
   hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
   -----END CERTIFICATE-----
   -----BEGIN CERTIFICATE-----
-  MIIB9DCCAV2gAwIBAgIJAL392bEdqpFQMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjM0MB4XDTExMTEwOTE1MzA0M1oXDTEyMTEwODE1MzA0M1owEzER
-  MA8GA1UEAwwIQ09NUC0yMzQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMRR
-  T0cacZKztie/DaRRjq3mgcqfPKoGXu6zXmeRQI+6Y4bnzjf8h/jAuPzR552P0xK5
-  psxhavXA8hOGRLFDtvDMQLepVHWfwqtFtcp5vNf2+KWqOYy0OxHfVIlnatvCqTZN
-  NG1vRsSOAQ+v7QNFHh6NBbiSrjBBfg4vkfzqnsUvAgMBAAGjUDBOMB0GA1UdDgQW
-  BBTGGw+ASoDi9kqPElDkC0Q5RtAfRjAfBgNVHSMEGDAWgBTGGw+ASoDi9kqPElDk
-  C0Q5RtAfRjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAIOuR1OqXLke
-  LLzH0kRnlIOe60dYJvRya53wDx5x2g4/qkXZPLx2RcbaUrX/SCbL70vfr+apUPss
-  dOSJ86sf/PQHW3/1fhTTE+Vck1MiiAq0aIx6WnKnz4+ZcQctB7b0DCsTcQnmbpi2
-  n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR
+  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
+  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
+  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
+  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
+  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
+  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
+  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
+  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
+  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
+  vaZhjNYKWQf79l6zXfOvphzJ
   -----END CERTIFICATE-----
   -----BEGIN CERTIFICATE-----
   MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
@@ -188,51 +198,110 @@ signature-certificate-list =
   Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
   If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
   -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
+  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
+  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
+  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
+  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
+  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
+  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
+  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
+  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
+  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
+  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
+  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
+  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
+  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
+  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
+  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
+  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
+  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
+  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
+  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
+  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
+  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
+  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
+  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
+  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
+  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
+  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
+  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
+  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
+  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
+  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
+  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
+  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9DCCAV2gAwIBAgIJAL392bEdqpFQMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjM0MB4XDTExMTEwOTE1MzA0M1oXDTEyMTEwODE1MzA0M1owEzER
+  MA8GA1UEAwwIQ09NUC0yMzQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMRR
+  T0cacZKztie/DaRRjq3mgcqfPKoGXu6zXmeRQI+6Y4bnzjf8h/jAuPzR552P0xK5
+  psxhavXA8hOGRLFDtvDMQLepVHWfwqtFtcp5vNf2+KWqOYy0OxHfVIlnatvCqTZN
+  NG1vRsSOAQ+v7QNFHh6NBbiSrjBBfg4vkfzqnsUvAgMBAAGjUDBOMB0GA1UdDgQW
+  BBTGGw+ASoDi9kqPElDkC0Q5RtAfRjAfBgNVHSMEGDAWgBTGGw+ASoDi9kqPElDk
+  C0Q5RtAfRjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAIOuR1OqXLke
+  LLzH0kRnlIOe60dYJvRya53wDx5x2g4/qkXZPLx2RcbaUrX/SCbL70vfr+apUPss
+  dOSJ86sf/PQHW3/1fhTTE+Vck1MiiAq0aIx6WnKnz4+ZcQctB7b0DCsTcQnmbpi2
+  n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR
+  -----END CERTIFICATE-----
 
 [versions]
 Jinja2 = 2.6
-Pygments = 1.5
 Werkzeug = 0.8.3
 apache-libcloud = 0.11.1
 async = 0.6.1
 buildout-versions = 1.7
-docutils = 0.9.1
 gitdb = 0.5.4
 hexagonit.recipe.cmmi = 1.6
-ipython = 0.13
 meld3 = 0.6.8
 pycrypto = 2.6
 rdiff-backup = 1.0.5
-slapos.cookbook = 0.60
-slapos.recipe.build = 0.10.2
+slapos.cookbook = 0.66
+slapos.libnetworkcache = 0.13.2
+slapos.recipe.build = 0.11.2
 slapos.recipe.download = 1.0.dev-r4053
-slapos.recipe.template = 2.4.1
-slapos.toolbox = 0.28
+slapos.recipe.template = 2.4.2
+slapos.toolbox = 0.30
 smmap = 0.8.2
 
 # Required by:
-# slapos.core==0.27
-# slapos.toolbox==0.28
+# slapos.core==0.28.5
+# slapos.toolbox==0.30
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.28
+# slapos.toolbox==0.30
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.cookbook==0.60
+# slapos.cookbook==0.66
 PyXML = 0.8.4
 
 # Required by:
-# netaddr==0.7.7
-Sphinx = 1.1.3
-
-# Required by:
-# slapos.toolbox==0.28
+# slapos.toolbox==0.30
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.28
+# slapos.toolbox==0.30
 feedparser = 5.1.2
 
 # Required by:
@@ -240,57 +309,58 @@ feedparser = 5.1.2
 hexagonit.recipe.download = 1.5.1
 
 # Required by:
-# slapos.cookbook==0.60
+# slapos.cookbook==0.66
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.cookbook==0.60
-# slapos.core==0.27
+# slapos.cookbook==0.66
+# slapos.core==0.28.5
 # xml-marshaller==0.9.7
-lxml = 2.3.5
+lxml = 3.0alpha2
 
 # Required by:
-# slapos.cookbook==0.60
-netaddr = 0.7.7
+# slapos.cookbook==0.66
+netaddr = 0.7.10
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.5
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.28
+# slapos.toolbox==0.30
 paramiko = 1.7.7.2
 
 # Required by:
-# slapos.toolbox==0.28
-psutil = 0.6.0
+# slapos.toolbox==0.30
+psutil = 0.6.1
 
 # Required by:
-# slapos.cookbook==0.60
-# slapos.core==0.27
-# slapos.toolbox==0.28
+# slapos.cookbook==0.66
+# slapos.core==0.28.5
+# slapos.toolbox==0.30
 # zc.buildout==1.6.0-dev-SlapOS-006
 # zc.recipe.egg==1.3.2
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.60
-# slapos.toolbox==0.28
-slapos.core = 0.27
+# slapos.cookbook==0.66
+# slapos.toolbox==0.30
+slapos.core = 0.28.5
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.5
 supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.60
-# slapos.toolbox==0.28
+# slapos.cookbook==0.66
+# slapos.toolbox==0.30
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.60
+# slapos.cookbook==0.66
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.27
+# slapos.core==0.28.5
 zope.interface = 4.0.1
+

stack/lamp/instance-apache-php.cfg

@@ -12,6 +12,7 @@ parts =
   slapmonitor
   slapreport
   frontend-promise
+  content-promise
   publish-connection-informations
 
 eggs-directory = ${buildout:eggs-directory}
@@ -105,6 +106,8 @@ name = MariaDB
 software-url = $${slap-connection:software-release-url}
 software-type = mariadb
 return = url
+sla = computer_guid
+sla-computer_guid = ${slap-connection:computer-id}
 
 [mariadb-urlparse]
 recipe = slapos.cookbook:urlparse
@@ -256,6 +259,12 @@ url = $${request-frontend:connection-site_url}
 dash_path = ${dash:location}/bin/dash
 curl_path = ${curl:location}/bin/curl
 
+[content-promise]
+recipe = slapos.cookbook:check_page_content
+path = $${basedirectory:promises}/content
+url = $${request-frontend:connection-site_url}
+dash_path = ${dash:location}/bin/dash
+curl_path = ${curl:location}/bin/curl
 
 [slap-parameter]
 # Default value if no domain is specified

stack/slapos.cfg

@@ -21,7 +21,6 @@ exec-sitecustomize = false
 # Add location for modified non-official slapos.buildout
 find-links +=
   http://www.nexedi.org/static/packages/source/slapos.buildout/
-  http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
 
 # Use only quite well working sites.
 allow-hosts +=
@@ -60,7 +59,7 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-006
+zc.buildout = 1.6.0-dev-SlapOS-007
 
 [networkcache]
 download-cache-url = http://www.shacache.org/shacache

stack/tomcat.cfg

@@ -3,24 +3,8 @@ extends =
   ../component/lxml-python/buildout.cfg
   ../component/java/buildout.cfg
   ../component/mysql-5.1/buildout.cfg
-  ../component/python-2.7/buildout.cfg
   ../component/tomcat/buildout.cfg
-  ../stack/shacache-client.cfg
-
-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
+  ../stack/slapos.cfg
 
 parts =
   template
@@ -45,7 +29,6 @@ md5sum = 22e1aff6104bb9006f8744a02bf73124
 
 [eggs]
 recipe = zc.recipe.egg
-python = python2.7
 eggs =
   ${lxml-python:egg}
   slapos.cookbook