Merge remote-tracking branch 'origin/erp5' into erp5-vifib

Conflicts:
	component/imagemagick/buildout.cfg
	software/erp5/software.cfg
	stack/erp5.cfg

CHANGES.txt

 Changes
 =======
 
-0.46 (Unreleased)
+0.58 (Unreleased)
 -----------------
 
-  * No change yet.
+
+0.57 (2012-06-22)
+-----------------
+
+  * Do not use system curl. [Romain Courteaud]
+
+0.56 (2012-06-18)
+-----------------
+
+  * Add signalwrapper, generate.mac, generate.password recipes. [Romain
+    Courteaud]
+
+0.55 (2012-06-18)
+-----------------
+
+  * Add slapmonitor and slapreport recipes. [Mohamadou Mbengue]
+
+0.54.1 (2012-06-18)
+-----------------
+
+  * Fix 0.54 release containing wrong code in request.py.
+
+0.54 (2012-06-18)
+-----------------
+
+  * Apache frontend: won't block sending slave informations to SlapOS Master
+    in case of problem from one slave instance.[Cedric de Saint Martin]
+  * Apache frontend will send IP informations for slaves in case slave is about
+    custom domain. [Cedric de Saint Martin]
+  * Ability to use LAMP applications without configuration. [Cedric de Saint
+    Martin]
+  * Users can specify custom domain in LAMP applications. [Cedric de Saint
+    Martin]
+
+0.53 (2012-06-07)
+-----------------
+
+  * Switch slaprunner into generic recipe, and add cloud9 recipe. [Cedric de
+    Saint Martin]
+
+0.52 (2012-05-16)
+-----------------
+
+  * Request bugfix: Correct default software_type (was: RootInstanceSoftware).
+    [Cedric de Saint Martin]
+  * Request will raise again if requested instance is not ready
+    [Romain Courteaud]
+  * Apache Frontend: assume apache is available from standard ports.
+    Consequence: url connection parameter of slave instance doesn't contain
+    port. [Cedric de Saint Martin]
+  * Apache Frontend bugfix: correctly detect slave instance type (zope).
+    [Cedric de Saint Martin]
+  * Apache Frontend: "default" slave instances are available through http
+    in addition to https. [Cedric de Saint Martin]
+  * Apache Frontend: Configuration: Add mod_deflate and set ProxyPreserveHost
+    [Cedric de Saint Martin]
+
+0.51 (2012-05-14)
+-----------------
+
+  * LAMP stack bugfix: Users were losing data when slapgrid is ran (Don't
+    erase htdocs if it already exist). [Cedric de Saint Martin]
+
+0.50 (2012-05-12)
+-----------------
+
+  * LAMP stack bugfix: fix a crash where recipe was trying to restart
+    non-existent httpd process. [Cedric de Saint Martin]
+  * LAMP stack bugfix: don't erase htdocs at update [Cedric de Saint Martin]
+  * Apache Frontend: Improve Apache configuration, inspired by Nexedi
+    production frontend. [Cedric de Saint Martin]
+  * Allow sysadmin of node to customize frontend instance.
+    [Cedric de Saint Martin]
+  * Apache Frontend: Change 'zope=true' option to 'type=zope'.
+    [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)
+-----------------
+
+  * Apache Frontend supports Zope and Varnish. [Cedric de Saint Martin]
+
+0.48 (2012-04-26)
+-----------------
+
+  * New utility recipe: slapos.recipe.generate_output_if_input_not_null.
+    [Cedric de Saint Martin]
+  * New promise recipe: slapos.recipe.url_available: check if url returns http
+    code 200. [Cedric de Saint Martin]
+  * Fix: slapos.recipe.request won't raise anymore if instance is not ready.
+    [Cedric de Saint Martin]
+  * Fix: slapos.recipe.request won't assume instance reference if not
+    specified. [Cedric de Saint Martin]
+
+0.47 (2012-04-19)
+-----------------
+
+  * Slap Test Agent [Yingjie Xu]
+
+0.46 (2012/04/12)
+-----------------
+
+  * xvfb and firefox initial release [Romain Courteaud]
 
 0.45 (2012-03-29)
 -----------------

component/apache-php/buildout.cfg

@@ -22,8 +22,8 @@ extends =
 recipe = hexagonit.recipe.cmmi
 depends =
   ${mariadb:version}
-url = http://fr2.php.net/distributions/php-5.3.10.tar.gz
-md5sum = 2b3d2d0ff22175685978fb6a5cbcdc13
+url = http://fr2.php.net/distributions/php-5.3.13.tar.gz
+md5sum = 179c67ce347680f468edbfc3c425476a
 configure-options =
   --with-apxs2=${apache:location}/bin/apxs
   --with-libxml-dir=${libxml2:location}

component/apache/buildout.cfg

@@ -30,10 +30,10 @@ md5sum = 52b31b33fb1aa16e65ddaefc76e41151
 recipe = hexagonit.recipe.cmmi
 depends =
   ${gdbm:version}
-version = 2.4.1
+version = 2.4.2
 revision = 1
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 7d3001c7a26b985d17caa367a868f11c
+md5sum = 6bb12f726e22656f0ad2baf91f1f8329
 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
@@ -45,6 +45,7 @@ configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_na
                     --enable-cgid
                     --enable-charset-lite
                     --enable-disk-cache
+                    --enable-mem-cache
                     --enable-echo
                     --enable-exception-hook
                     --enable-mods-shared=all
@@ -115,3 +116,73 @@ configure-options = -c mod_antiloris.c
 make-binary = ${:configure-command}
 make-options = -i -a -n antiloris mod_antiloris.la
 make-targets =
+
+[apache-2.2]
+# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
+recipe = hexagonit.recipe.cmmi
+url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.22.tar.gz
+md5sum = d77fa5af23df96a8af68ea8114fa6ce1
+patch-options = -p1
+configure-options = --disable-static
+                    --enable-authn-alias
+                    --enable-bucketeer
+                    --enable-cache
+                    --enable-case-filter
+                    --enable-case-filter-in
+                    --enable-cgid
+                    --enable-charset-lite
+                    --enable-disk-cache
+                    --enable-mem-cache
+                    --enable-echo
+                    --enable-exception-hook
+                    --enable-mods-shared=all
+                    --enable-optional-fn-export
+                    --enable-optional-fn-import
+                    --enable-optional-hook-export
+                    --enable-optional-hook-import
+                    --enable-proxy
+                    --enable-proxy-ajp
+                    --enable-proxy-balancer
+                    --enable-proxy-connect
+                    --enable-proxy-ftp
+                    --enable-proxy-http
+                    --enable-proxy-scgi
+                    --enable-dav
+                    --enable-dav-fs
+                    --enable-so
+                    --enable-ssl
+                    --with-included-apr
+                    --with-ssl=${openssl:location}
+                    --with-z=${zlib:location}
+                    --with-expat=${libexpat:location}
+                    --with-pcre=${pcre:location}
+                    --with-sqlite3=${sqlite3:location}
+                    --with-gdbm=${gdbm:location}
+                    --without-lber
+                    --without-ldap
+                    --without-ndbm
+                    --without-berkeley-db
+                    --without-pgsql
+                    --without-mysql
+                    --without-sqlite2
+                    --without-oracle
+                    --without-freedts
+                    --without-odbc
+                    --without-iconv
+
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
+  CPPFLAGS =-I${libuuid:location}/include
+  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
+
+[apache-antiloris-apache-2.2]
+# Note: Shall react on each build of apache and reinstall itself
+recipe = hexagonit.recipe.cmmi
+url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
+md5sum = 66862bf10e9be3a023e475604a28a0b4
+configure-command = ${apache-2.2:location}/bin/apxs
+configure-options = -c mod_antiloris.c
+make-binary = ${:configure-command}
+make-options = -i -a -n antiloris mod_antiloris.la
+make-targets =

component/aspell/buildout.cfg

 [buildout]
 parts =
   aspell
+  aspell-en-dictonary
 
 extends = 
   ../ncurses/buildout.cfg
 
+[aspell-common-dictionary]
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+recipe = plone.recipe.command
+command = mkdir -p ${:location}
+update-command = ${:command}
+stop-on-error = yes
+
 [aspell]
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz
 md5sum = e66a9c9af6a60dc46134fdacf6ce97d7
+
+[aspell-en-dictionary]
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2
+md5sum = beba5e8f3afd3ed1644653bb685b2dfb
+configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin
\ No newline at end of file

component/cloud9/buildout.cfg

@@ -14,6 +14,13 @@ parts =
 [cloud9]
 <= cloud9-git
 
+[node-sm]
+recipe = slapos.recipe.build:npm
+packages = sm
+node = nodejs
+environment =
+  PATH=${nodejs:location}/bin:%(PATH)s
+
 [cloud9-git]
 # Online IDE written in javascript/node.js
 # URL : c9.io
@@ -21,12 +28,13 @@ parts =
 # NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location} 
 recipe = plone.recipe.command
 stop-on-error = true
-commit = 97db1467c517d265438684bd2a70b0b76ee282f6
+commit = 4bde3206ac0dc1e5736cb18a42851e203a6cc68f
 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; (${: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)
+npm-binary = ${nodejs:location}/bin/node ${nodejs:location}/bin/npm
+environment = export GIT_SSL_NO_VERIFY=true; export PATH=${nodejs:location}/bin:$PATH; export LDFLAGS=-L${libxml2:location}/lib;
+command = ${:environment} (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit} && ${node-sm:location}/node_modules/.bin/sm install && ${:npm-binary} install) || (rm -fr ${:location}; exit 1)
 update-command =
 
 [cloud9-npm]
@@ -36,10 +44,10 @@ update-command =
 # NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location} 
 recipe = slapos.recipe.npm
 # Node part has to be specified, otherwise system node is used.
-node = nodejs-0.6
+node = nodejs
 # List of packages to install
 packages =
-  cloud9
+  cloud9==0.7
 # Specify environment jsDAV (dependency of cloud9) needs libxml2
 environment = 
   LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib

component/cloudooo/buildout.cfg

@@ -5,21 +5,43 @@ extends =
 parts =
   cloudooo
 
-sources = sources
+develop +=
+  ${:parts-directory}/cloudooo-repository
 
-[sources]
-# Include information related to official cloudooo source code.
-cloudooo = git http://git.erp5.org/repos/cloudooo.git
+[cloudooo-check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/cloudooo.egg-link
 
-[lxml-python]
-python = python2.6
+[cloudooo-repository]
+recipe = plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+stop-on-error = true
+repository = http://git.erp5.org/repos/cloudooo.git
+branch = master
+revision =
+command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
+update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
 
 [cloudooo]
 recipe = zc.recipe.egg
 python = python2.6
+extra-paths = ${cloudooo-repository:location}
 eggs =
   ${lxml-python:egg}
-  cloudooo
   PasteScript
-scripts =
+  python-magic
+  psutil
+  WSGIUtils
+  cloudooo
+entry-points =
+  main=cloudooo.paster_application:application
+  cloudooo_tester=cloudooo.bin.cloudooo_tester:main
+  runCloudoooUnitTest=cloudooo.tests.runHandlerUnitTest:run
+  runCloudoooTestSuite=cloudooo.tests.runTestSuite:run
+scripts = 
   paster=cloudooo_paster
+  runCloudoooUnitTest
+  runCloudoooTestSuite
+ugly-depend-on = ${cloudooo-repository:command} ${cloudooo-repository:update-command} ${cloudooo-check-recipe:command}

component/cloudooo/buildout.eggversion.cfg

+[buildout]
+extends =
+  ../lxml-python/buildout.cfg
+
+parts =
+  cloudooo
+
+[lxml-python]
+python = python2.6
+
+[cloudooo]
+recipe = zc.recipe.egg
+python = python2.6
+eggs =
+  ${lxml-python:egg}
+  cloudooo
+  cloudooo.handler.ooo
+  cloudooo.handler.pdf
+  cloudooo.handler.ffmpeg
+  cloudooo.handler.imagemagick
+  PasteScript
+  python-magic
+entry-points =
+  cloudooo_tester=cloudooo.bin.cloudooo_tester:main
+  runCloudoooUnitTest=cloudooo.tests.runHandlerUnitTest:run
+
+scripts =
+  paster=cloudooo_paster
+  runCloudoooUnitTest
+
+

component/cmake/buildout.cfg

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

component/couchdb/buildout.cfg

+[buildout]
+
+extends =
+  ../openssl/buildout.cfg
+  ../curl/buildout.cfg
+  ../erlang/buildout.cfg
+  ../icu/buildout.cfg
+  ../spidermonkey/buildout.cfg
+
+parts = couchdb
+
+[couchdb]
+recipe = hexagonit.recipe.cmmi
+url = http://mir2.ovh.net/ftp.apache.org/dist//couchdb/1.1.1/apache-couchdb-1.1.1.tar.gz
+md5sum = cd126219b9cb69a4c521abd6960807a6
+configure-options =
+  --with-erlang=${erlang:location}/lib/erlang/usr/include
+  --with-js-include=${spidermonkey-1.7:location}/include
+  --with-js-lib=${erlang:location}/lib
+  --enable-js-trunk
+environment-section = couchdb-environ
+
+[couchdb-environ]
+PATH = ${erlang:location}/bin:${icu4c:location}/bin:${curl:location}/bin:%(PATH)s
+# XXX: Gotta put everything on the same line. If not, it won't compile
+CFLAGS = -I${icu4c:location}/include -I${spidermonkey-1.7:location}/include -I${curl:location}/include
+LDFLAGS = -L${icu4c:location}/lib -Wl,-rpath=${icu4c:location}/lib -L${spidermonkey-1.7:location}/lib -Wl,-rpath=${spidermonkey-1.7:location}/lib -L${curl:location}/lib -Wl,-rpath=${curl:location}/lib

component/erlang/buildout.cfg

 [buildout]
-parts =
-  erlang
+extends =
+  ../openssl/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../zlib/buildout.cfg
+  ../java/buildout.cfg
+
+parts = erlang
 
 [erlang]
 recipe = hexagonit.recipe.cmmi
-url = http://www.erlang.org/download/otp_src_R14B03.tar.gz
-md5sum = 7979e662d11476b97c462feb7c132fb7
+url = http://www.erlang.org/download/otp_src_R14B04.tar.gz
+md5sum = 4b469729f103f52702bfb1fb24529dc0
+configure-options =
+    --with-ssl=${openssl:location}
+    --with-java
+    --enable-dynamic-ssl-lib
+    --enable-shared-zlib
+    --enable-native-libs
+environment=
+    PATH=${java-sdk-1.6.0:location}/bin:%(PATH)s
+    CFLAGS=-I${ncurses:location}/include -I${zlib:location}/include/
+    LDFLAGS=-L${ncurses:location}/lib/ -L${zlib:location}/lib/ -Wl,-rpath=${ncurses:location}/lib/ -Wl,-rpath=${zlib:location}/lib/
+
+make-options =
+    -j1

component/ffmpeg/buildout.cfg

@@ -9,7 +9,7 @@ parts =
   ffmpeg
 
 [ffmpeg]
-<= ffmpeg-0.6
+<= ffmpeg-0.8
 
 [libogg]
 recipe = hexagonit.recipe.cmmi
@@ -53,8 +53,8 @@ environment =
 
 [libx264]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20110412-2245.tar.bz2
-md5sum = 423c402214544d0e2f21455175a0d01f
+url = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20111005-2245-stable.tar.bz2
+md5sum = f86260b2ea6d6cb5186937c9363891d7
 configure-options =
   --enable-shared
   --enable-pic
@@ -76,10 +76,10 @@ md5sum = 8e8b8b253eb046340ff7b6bf7a6ccd3e
 configure-options =
   --disable-static
 
-[ffmpeg-0.6]
+[ffmpeg-0.8]
 recipe = hexagonit.recipe.cmmi
-url = http://www.ffmpeg.org/releases/ffmpeg-0.6.3.tar.bz2
-md5sum = cdf4ad9b2a4d195b5ca874494bc7b0b0
+url = http://ffmpeg.org/releases/ffmpeg-0.8.5.tar.bz2
+md5sum = 726877b19ece7ea64def8b7e6727e182
 configure-options = 
  --enable-gpl
  --enable-version3

component/firefox/buildout.cfg

@@ -6,6 +6,8 @@ extends =
   ../dbus/buildout.cfg
   ../gtk-2/buildout.cfg
   ../libpng/buildout.cfg
+  ../dash/buildout.cfg
+  ../openssl/buildout.cfg
 
 parts =
   firefox
@@ -30,11 +32,11 @@ script =
   self.copyTree(workdir, "%(location)s")
   wrapper_location = os.path.join("%(location)s", "firefox-slapos")
   wrapper = open(wrapper_location, 'w')
-  wrapper.write("""#!/bin/sh
+  wrapper.write("""#!${dash:location}/bin/dash
   cd %(location)s
-  export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${dbus-glib:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:${libpng:location}/lib:${libSM:location}/lib:${libICE:location}/lib:${alsa:location}/lib:%(location)s
+  export LD_LIBRARY_PATH=%(location)s:${libXrender:location}/lib/:${freetype:location}/lib/:${fontconfig:location}/lib/:${libX11:location}/lib/:${bzip2:location}/lib/:${libXext:location}/lib/:${libXt:location}/lib/:${zlib:location}/lib/:${libXcursor:location}/lib/:${gtk-2:location}/lib/:${cairo:location}/lib/:${pango:location}/lib/:${glib:location}/lib/:${atk:location}/lib/:${gdk-pixbuf:location}/lib/:${alsa:location}/lib/:${libpng:location}/lib/:${libSM:location}/lib/:${libICE:location}/lib:${libxml2:location}/lib:${openssl:location}/lib
   export PATH=${fontconfig:location}/bin:$PATH
-  %(location)s/firefox $*""")
+  exec %(location)s/firefox $*""")
   wrapper.close()
   os.chmod(wrapper_location, 0777)
 

component/fontconfig/buildout.cfg

@@ -6,6 +6,7 @@ extends =
   ../pkgconfig/buildout.cfg
   ../bzip2/buildout.cfg
   ../zlib/buildout.cfg
+  ../bzip2/buildout.cfg
 
 parts =
   fontconfig

component/giflib/buildout.cfg

+[buildout]
+parts =
+  giflib
+
+[giflib]
+recipe = hexagonit.recipe.cmmi
+url = http://prdownloads.sourceforge.net/giflib/giflib-4.2.0.tar.bz2?download
+md5sum = 711ad48551ee14db7c200b5f402df849
+configure-options =
+  --without-x
+  --disable-x11
+  --disable-static
+
+# restrict building to libraries only, we don't care about binaries
+# and specially docs which would require more dependencies (e.g. xmlto):
+make-options =
+  SUBDIRS=lib
\ No newline at end of file

component/git/buildout.cfg

@@ -6,25 +6,24 @@ extends =
   ../curl/buildout.cfg
   ../libexpat/buildout.cfg
   ../openssl/buildout.cfg
-  ../perl/buildout.cfg
   ../zlib/buildout.cfg
 parts =
   git
 
 [git]
 recipe = hexagonit.recipe.cmmi
-url = http://git-core.googlecode.com/files/git-1.7.8.4.tar.gz
-md5sum = e6c3319d76d52a830af395046fc56143
+url = http://git-core.googlecode.com/files/git-1.7.10.4.tar.gz
+md5sum = 68319d593d051ef76c26e945bbd2d7ac
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}
   --with-zlib=${zlib:location}
   --with-expat=${libexpat:location}
-  --with-perl=${perl:location}/bin/perl
   --without-python
   --without-tcltk
 
 environment =
-  PATH=${curl:location}/bin:%(PATH)s
+  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

component/gnutls/buildout.cfg

@@ -13,13 +13,13 @@ md5sum = 7c2710ef439f82ac429b88fec88e9a4c
 
 [gcrypt]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.6.tar.gz
-md5sum = bfd45922eefb8a24d598af77366220d4
+url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.gz
+md5sum = 78f8f8bec4580f75b25816f7896d0389
 configure-options =
   --with-gpg-error-prefix=${gpg-error:location}
 environment =
   CPPFLAGS=-I${gpg-error:location}/include
-  LDFLAGS=-Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gpg-error:location}/lib/libgpg-error.so.0
+  LDFLAGS=-lgpg-error -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
 
 [gnutls]
 # XXX-Cedric : update to latest gnutls
@@ -28,7 +28,8 @@ url = ftp://ftp.gnupg.org/gcrypt/gnutls/gnutls-2.8.6.tar.bz2
 md5sum = eb0a6d7d3cb9ac684d971c14f9f6d3ba
 configure-options =
   --with-libgcrypt-prefix=${gcrypt:location}
+  --disable-static
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gcrypt:location}/include -I${gpg-error:location}/include
-  LDFLAGS=-L${readline:location}/lib -L${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${gcrypt:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gcrypt:location}/lib/libgcrypt.so.11
+  LDFLAGS=-lgcrypt -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
   PKG_CONFIG=${zlib:location}/lib/pkgconfig

component/groff/buildout.cfg

+[buildout]
+parts =
+  groff
+
+[groff]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnu.org/gnu/groff/groff-1.21.tar.gz
+md5sum = 8b8cd29385b97616a0f0d96d0951c5bf
+configure-options =
+  --disable-static
+  --without-x

component/groonga/buildout.cfg

@@ -7,11 +7,12 @@ parts =
 
 [groonga]
 recipe = hexagonit.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-2.0.1.tar.gz
-md5sum = 806daed3e0e5bb12d591dcf326e4ccd5
+url = http://packages.groonga.org/source/groonga/groonga-2.0.4.tar.gz
+md5sum = c26aaf2944ed0ffba9e1e051b1c86642
 configure-options =
   --disable-static
   --disable-glibtest
   --disable-benchmark
   --disable-document
+  --disable-nginx
   --without-mecab

component/gtk-2/buildout.cfg

@@ -37,8 +37,8 @@ configure-options =
 environment = 
   PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig::${libXrender:location}/lib/pkgconfig
-  CPPFLAGS=-I${cairo:location}/include/cairo
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -lXrender
+  CPPFLAGS=-I${cairo:location}/include/cairo -I${libX11:location}/include/X11 -I${libxcb:location}/include/xcb -I${libXau:location}/include/X11 -I${bzip2:location}/include -L${libXrender:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${cairo:location}/lib -Wl,-rpath=${cairo:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libxcb:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libXau:location}/lib -Wl,-rpath=${libXau:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -lXrender -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
   LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib
 
 [gdk-pixbuf]
@@ -74,9 +74,10 @@ configure-options =
   --disable-cups
   --disable-papi
   --enable-explicit-deps
+  --disable-xinerama
 environment = 
   PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gettext:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig
-  CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include -I${cairo:location}/include/cairo
-  LDFLAGS=-L${gettext:location}/lib -L${glib:location}/lib -L${libtiff:location}/lib -L${libjpeg:location}/lib -L${libpng:location}/lib -L${zlib:location}/lib -L${libXrender:location}/lib -L${libX11:location}/lib -L${libXext:location}/lib -L${pango:location}/lib
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig
+  CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include -I${cairo:location}/include/cairo -I${zlib:location}/include -I${bzip2:location}/include -I${libXdmcp:location}/include -I${glib:location}/include/gio-unix-2.0 -I${glib:location}/include/glib-2.0 -I${glib:location}/include -I${atk:location}/include/atk-1.0
+  LDFLAGS=-L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${xproto:location}/lib -Wl,-rpath=${xproto:location}/lib -L${kbproto:location}/lib -Wl,-rpath=${kbproto:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -L${render:location}/lib -Wl,-rpath=${render:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${cairo:location}/lib -Wl,-rpath=${cairo:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libXdmcp:location}/lib -Wl,-rpath=${libXdmcp:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib  -L${atk:location}/lib -Wl,-rpath=${atk:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
   LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib:${libX11:location}/lib

component/haproxy/buildout.cfg

@@ -9,8 +9,8 @@ parts = haproxy
 
 [haproxy]
 recipe = hexagonit.recipe.cmmi
-url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.20.tar.gz
-md5sum = 0cd3b91812ff31ae09ec4ace6355e29e
+url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.21.tar.gz
+md5sum = f36d5d13fd4a44ab454eee5d06cb38a2
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".

component/icu/buildout.cfg

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

component/imagemagick/buildout.cfg

@@ -8,6 +8,7 @@ extends =
   ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
   ../ghostscript/buildout.cfg
+  ../librsvg/buildout.cfg
   ../libjpeg/buildout.cfg
   ../libpng/buildout.cfg
   ../libtiff/buildout.cfg
@@ -27,10 +28,11 @@ 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.6-8.tar.bz2
-md5sum = fc189f4a81e8aa9e07bc1a9beb867ecb
+url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.7-9.tar.bz2
+md5sum = 1ab883719ce3c9787c45971c7fc3c532
 depends =
   ${libtiff:version}
+  ${librsvg:version}
 configure-options =
   --disable-static
   --without-x
@@ -50,19 +52,19 @@ configure-options =
   --without-lzma
   --without-openexr
   --without-pango
-  --without-rsvg
   --without-wmf
   --without-xml
   --with-bzlib=${bzip2:location}
   --with-zlib=${zlib:location}
   --with-ltdl-include=${libtool:location}/include
   --with-ltdl-lib=${libtool:location}/lib
+  --with-rsvg=${librsvg:location}
   --with-frozenpaths
 patch-options = -p1
 patches =
   ${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:location}/${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:filename}
 environment =
   PATH=${freetype:location}/bin:${ghostscript:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${librsvg:location}/lib/pkgconfig
   CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib

component/leptonica/buildout.cfg

+[buildout]
+parts = leptonica
+extends =
+  ../libtool/buildout.cfg
+  ../zlib/buildout.cfg
+  ../libjpeg/buildout.cfg
+  ../libpng/buildout.cfg
+  ../libtiff/buildout.cfg
+  ../webp/buildout.cfg
+  ../giflib/buildout.cfg
+
+[leptonica]
+recipe = hexagonit.recipe.cmmi
+url = http://leptonica.googlecode.com/files/leptonica-1.68.tar.gz
+md5sum = 5cd7092f9ff2ca7e3f3e73bfcd556403
+configure-command =
+  ./autogen.sh
+  ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static
+patch-options = -p1
+patches =
+  ${leptonica-1.69-zlib-include.patch:location}/${leptonica-1.69-zlib-include.patch:filename}
+environment =
+  ACLOCAL_ARGS=-I${libtool:location}/share/aclocal
+  CPPFLAGS=-I${zlib:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${webp:location}/include -I${giflib:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${giflib:location}/lib -Wl,-rpath=${giflib:location}/lib
+
+[leptonica-1.69-zlib-include.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = cff3dc942075190939b407c38e0d3201
+download-only = true
+filename = ${:_buildout_section_name_}

component/leptonica/leptonica-1.69-zlib-include.patch

+This patch is originally taken from:
+
+http://leptonica.googlecode.com/issues/attachment?aid=560001000&name=zlib-include.patch&token=m2sugSYxB4xwAuNgrKXyHTxBYNg%3A1337345966091
+
+To fix the following issue with leptonica:
+
+http://code.google.com/p/leptonica/issues/detail?id=56
+
+diff -Nurd -x'*~' leptonica-1.68.orig/src/pngio.c leptonica-1.68/src/pngio.c
+--- leptonica-1.68.orig/src/pngio.c	2011-02-01 00:41:12.000000000 -0500
++++ leptonica-1.68/src/pngio.c	2011-07-09 09:17:17.000000000 -0400
+@@ -108,6 +108,10 @@
+ 
+ #include "png.h"
+ 
++#ifdef HAVE_LIBZ
++#include "zlib.h"
++#endif
++
+ /* ----------------Set defaults for read/write options ----------------- */
+     /* strip 16 bpp --> 8 bpp on reading png; default is for stripping */
+ static l_int32   var_PNG_STRIP_16_TO_8 = 1;

component/libpng/buildout.cfg

@@ -21,5 +21,5 @@ md5sum = d5106b70b4f8b464a7da66bffe4565fb
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.10.tar.bz2
-md5sum = f4395eaf426bdd870446c246df307aae
+url = http://download.sourceforge.net/libpng/libpng-1.5.11.tar.bz2
+md5sum = cc1f78c87292161464c6f6f51fa19428

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.1
+version = 3.5.5
 url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
 
 # supported architectures md5sums
-md5sum_x86 = ee46fdafb8361b8e131994508c2723b3
-md5sum_x86-64 = ddda58719358e5c97ca5d1c118646574
+md5sum_x86 = 88434a91af56a751fad2e737c2ad6bba
+md5sum_x86-64 = a8c2c35af75807c3ed6c8d04fe6c6419
 
 # where office code can be found?
 officedir = libreoffice3.5

component/librsvg/buildout.cfg

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

component/libtiff/buildout.cfg

@@ -9,14 +9,15 @@ parts =
 
 [libtiff]
 recipe = hexagonit.recipe.cmmi
-version = 4.0.1
+version = 4.0.2
 #url = http://download.osgeo.org/libtiff/tiff-${:version}.tar.gz
 # server is down - circumvent
 url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz
-md5sum = fae149cc9da35c598d8be897826dfc63
+md5sum = 04a08fa1e07e696e820a0c3f32465a13
 configure-options =
   --disable-static
   --without-x
+  --disable-lzma
 environment =
   CPPFLAGS=-I${libjpeg:location}/include -I${jbigkit:location}/include -I${zlib:location}/include
   LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/libuuid/buildout.cfg

@@ -4,7 +4,7 @@ parts =
 
 [libuuid]
 recipe = hexagonit.recipe.cmmi
-url = http://mirror.be.gbxs.net/pub/linux/utils/util-linux-ng/v2.18/util-linux-ng-2.18.tar.bz2
+url = http://www.kernel.org/pub/linux/utils/util-linux/v2.18/util-linux-ng-2.18.tar.bz2
 md5sum = 2f5f71e6af969d041d73ab778c141a77
 configure-options =
   --disable-static

component/libxml2/buildout.cfg

@@ -8,11 +8,12 @@ parts =
 
 [libxml2]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz
-md5sum = 8127a65e8c3b08856093099b52599c86
+url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz
+md5sum = c62106f02ee00b6437f0fb9d370c1093
 configure-options =
   --disable-static
   --without-python
+  --without-lzma
   --with-zlib=${zlib:location}
 environment =
     LDFLAGS = -Wl,-rpath=${zlib:location}/lib

component/mariadb/buildout.cfg

@@ -25,10 +25,10 @@ download-only = true
 
 [mariadb]
 recipe = hexagonit.recipe.cmmi
-version = 5.5.22
-revision = 2
+version = 5.5.25
+revision = 1
 url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
-md5sum = d7d3bedd56cede5a045cb3fadf6b344e
+md5sum = 943f67c267d73a4080ab497e11740daf
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0
@@ -44,11 +44,11 @@ configure-options =
   -DWITH_ZLIB=system
   -DWITH_READLINE=0
   -DWITH_PIC=1
+  -DENABLE_DTRACE=0
   -DWITH_EXTRA_CHARSETS=complex
   -DWITH_EMBEDDED_SERVER=0
   -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
   -DWITHOUT_DAEMON_EXAMPLE=1
-  -DWITH_SPHINX_STORAGE_ENGINE=1
   -DCMAKE_C_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
   -DCMAKE_CXX_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
   -DCMAKE_INSTALL_RPATH=${libaio:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
@@ -60,8 +60,8 @@ environment =
 
 [mroonga-mariadb]
 recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-2.01.tar.gz
-md5sum = e1c4ba8ac50aa3750b9acde147eeec4b
+url = https://github.com/downloads/mroonga/mroonga/mroonga-2.04.tar.gz
+md5sum = 3c77aa2bf989f8b5531af08a5ffab359
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config

component/mariadb/mroonga-2.01-mariadb-5.5.23.patch

+--- ha_mroonga.cc.orig	2012-04-11 17:59:24.171323133 +0200
++++ ha_mroonga.cc	2012-04-11 18:01:50.431325458 +0200
+@@ -10319,10 +10319,11 @@
+ bool ha_mroonga::wrapper_auto_repair() const
+ {
+   bool res;
++  int ha_err = 0;
+   MRN_DBUG_ENTER_METHOD();
+   MRN_SET_WRAP_SHARE_KEY(share, table->s);
+   MRN_SET_WRAP_TABLE_KEY(this, table);
+-  res = wrap_handler->auto_repair();
++  res = wrap_handler->auto_repair(ha_err);
+   MRN_SET_BASE_SHARE_KEY(share, table->s);
+   MRN_SET_BASE_TABLE_KEY(this, table);
+   DBUG_RETURN(res);
+@@ -10330,9 +10331,10 @@
+ 
+ bool ha_mroonga::storage_auto_repair() const
+ {
++  int ha_err = 0;
+   MRN_DBUG_ENTER_METHOD();
+   // XXX: success is valid variable name?
+-  bool success = handler::auto_repair();
++  bool success = handler::auto_repair(ha_err);
+   DBUG_RETURN(success);
+ }
+ 

component/mariadb/plugin_handler_socket_libhsclient_fatal.patch

+# inspired by handlersocket-1.0.6-80-g88bf1e0-1.1-nmu.diff by gregoa@debian.org
+
+Description: add missing include to avoid FTBFS with gcc 4.7
+bug-debian: http://bugs.debian.org/667198
+More informations: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667198
+Author: gregor herrmann <gregoa@debian.org>
+
+--- plugin/handler_socket/libhsclient/fatal.cpp
++++ plugin/handler_socket/libhsclient/fatal.cpp
+@@ -9,6 +9,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <syslog.h>
++#include <unistd.h>
+
+ #include "fatal.hpp"

component/mydumper/buildout.cfg

@@ -24,8 +24,8 @@ 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/
-cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include/
+includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include/mysql
+cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include/mysql
 mydumper-patches =
    ${:_profile_base_location_}/mydumper-remove-warnings-errors.patch 917fea16b5ddea195cfa33fbd9827f57 -p1
 slapos_promise =

component/nodejs/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 [nodejs]
 # Server-side Javascript.
 recipe = hexagonit.recipe.cmmi
-url = http://nodejs.org/dist/v0.6.12/node-v0.6.12.tar.gz
-md5sum = a12766ae4003c9712927d1fa134ed9f6
+url = http://nodejs.org/dist/v0.6.19/node-v0.6.19.tar.gz
+md5sum = f5669a9717422b811c6bad1cc961b1e5
 configure-options =
   --openssl-includes=${openssl:location}/include
   --openssl-libpath=${openssl:location}/lib

component/openldap/buildout.cfg

@@ -2,13 +2,14 @@
 parts =
   openldap
 extends =
+  ../groff/buildout.cfg
   ../openssl/buildout.cfg
   ../cyrus-sasl/buildout.cfg
 
 [openldap]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.26.tgz
-md5sum = f36f3086031dd56ae94f722ffae8df5e
+url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.31.tgz
+md5sum = 804c6cb5698db30b75ad0ff1c25baefd
 configure-options =
   --disable-static
   --disable-slapd
@@ -24,3 +25,4 @@ configure-options =
 environment =
   CPPFLAGS=-I${openssl:location}/include -I${cyrus-sasl:location}/include
   LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${cyrus-sasl:location}/lib -Wl,-rpath=${cyrus-sasl:location}/lib
+  PATH=${groff:location}/bin:%(PATH)s

component/openssl/buildout.cfg

@@ -28,8 +28,8 @@ download-only = true
 
 [openssl]
 recipe = hexagonit.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.1.tar.gz
-md5sum = 134f168bc2a8333f19f81d684841710b
+url = https://www.openssl.org/source/openssl-1.0.1c.tar.gz
+md5sum = ae412727c8c15b67880aef7bd2999b2e
 patches =
   ${openssl-nodoc.patch:location}/${openssl-nodoc.patch:filename}
   ${openssl-exlibs.patch:location}/${openssl-exlibs.patch:filename}

component/perl/buildout.cfg

@@ -16,9 +16,9 @@ filename = ${:_buildout_section_name_}
 recipe = hexagonit.recipe.cmmi
 depends =
   ${gdbm:version}
-version = 5.14.2
+version = 5.16.0
 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
-md5sum = 04a4c5d3c1f9f19d77daff8e8cd19a26
+md5sum = 15a2f95fb27231e10998240f13acf961
 siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
 patch-options = -p1
 patches =

component/poppler/buildout.cfg

@@ -12,12 +12,9 @@ extends =
   ../zlib/buildout.cfg
 
 [poppler]
-<= poppler-0.17.1
-
-[poppler-0.17.1]
 recipe = hexagonit.recipe.cmmi
-md5sum = b566d1fbaa29b9257bf0ecc130e7b2ca
-url = http://poppler.freedesktop.org/poppler-0.17.2.tar.gz
+md5sum = a61e3b844061f5324512a16d6d16984c
+url = http://poppler.freedesktop.org/poppler-0.20.1.tar.gz
 depends =
   ${libtiff:version}
 configure-options =

component/python-2.6/buildout.cfg

@@ -10,6 +10,7 @@ extends =
   ../readline/buildout.cfg
   ../sqlite3/buildout.cfg
   ../zlib/buildout.cfg
+  ../file/buildout.cfg
 
 parts =
     python2.6
@@ -31,12 +32,12 @@ depends =
 prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
 version = 2.6
 package_version = ${:version}.8
-package_version_suffix = rc2
+package_version_suffix =
 executable = ${:prefix}/bin/python${:version}
 
 url =
   http://python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tar.bz2
-md5sum = 85d08abe34a7015b99b220ca383253f8
+md5sum = c6e0420a21d8b23dee8b0195c9b9a125
 patch-options = -p1
 patches =
   ${python-2.6.6-no_system_inc_dirs.patch:location}/${python-2.6.6-no_system_inc_dirs.patch:filename}
@@ -45,9 +46,11 @@ configure-options =
   --enable-unicode=ucs4
   --with-threads
 
+# the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
+# which would otherwise load the system libmagic.so with ctypes
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
 
 [bootstrap2.6]
 recipe = zc.recipe.egg

component/python-2.7/buildout.cfg

@@ -9,6 +9,7 @@ extends =
   ../readline/buildout.cfg
   ../sqlite3/buildout.cfg
   ../zlib/buildout.cfg
+  ../file/buildout.cfg
 
 parts =
     python2.7
@@ -25,8 +26,8 @@ python = python2.7
 [python2.7]
 recipe = hexagonit.recipe.cmmi
 package_version = 2.7.3
-package_version_suffix = rc2
-md5sum = 67059e1bcaf19e19394d16b80637f75f
+package_version_suffix =
+md5sum = c57477edd6d18bd9eeca2f21add73919
 
 depends =
   ${gdbm:version}
@@ -44,6 +45,8 @@ configure-options =
   --with-system-expat
   --with-threads
 
+# the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
+# which would otherwise load the system libmagic.so with ctypes
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib

component/slapos/buildout.cfg

@@ -123,14 +123,14 @@ hexagonit.recipe.cmmi = 1.5.0
 lxml = 2.3.4
 meld3 = 0.6.8
 netaddr = 0.7.6
-slapos.core = 0.24
+slapos.core = 0.25
 slapos.libnetworkcache = 0.12
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.24
+# slapos.core==0.25
 Flask = 0.8
 
 # Required by:
@@ -138,11 +138,11 @@ Flask = 0.8
 hexagonit.recipe.download = 1.5.0
 
 # Required by:
-# slapos.core==0.24
+# slapos.core==0.25
 netifaces = 0.8
 
 # Required by:
-# slapos.core==0.24
+# slapos.core==0.25
 # slapos.libnetworkcache==0.12
 # supervisor==3.0a12
 # zc.buildout==1.6.0-dev-SlapOS-004
@@ -150,9 +150,9 @@ netifaces = 0.8
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.24
+# slapos.core==0.25
 supervisor = 3.0a12
 
 # Required by:
-# slapos.core==0.24
+# slapos.core==0.25
 zope.interface = 3.8.0

component/sphinx/buildout.cfg

@@ -24,7 +24,7 @@ url = http://sphinxsearch.com/files/sphinx-2.0.2-beta.tar.gz
 md5sum = fafe0f1a71d0ded32404c067eba7d0b3
 configure-options =
   --with-mysql
-  --with-mysql-includes=${mariadb:location}/include
+  --with-mysql-includes=${mariadb:location}/include/mysql
   --with-mysql-libs=${mariadb:location}/lib
   --with-libstemmer
   --with-iconv

component/spidermonkey/buildout.cfg

+[buildout]
+
+parts = spidermonkey
+
+[spidermonkey-1.7]
+recipe = slapos.recipe.build
+url = ftp://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz
+md5sum = 5571134c3863686b623ebe4e6b1f6fe6
+slapos_promise =
+  directory:include/
+  directory:bin/
+  file:bin/js
+  statlib:lib/libjs.a
+  file:lib/libjs.so
+script =
+  url = self.download(self.options['url'], self.options['md5sum'])
+  extract_dir = self.extract(url)
+  workdir = os.path.join(guessworkdir(extract_dir), 'src')
+  env.update(JS_DIST=self.options['location'])
+  call(['make', '-f', 'Makefile.ref'], cwd=workdir, env=env)
+  call(['make', '-f', 'Makefile.ref', 'export'], cwd=workdir, env=env)
+
+[spidermonkey]
+<= spidermonkey-1.7

component/sqlite3/buildout.cfg

@@ -5,8 +5,8 @@ parts =
 
 [sqlite3]
 recipe = hexagonit.recipe.cmmi
-url = http://www.sqlite.org/sqlite-autoconf-3071100.tar.gz
-md5sum = 0552d71bda98ebdcaea305cd6058221b
+url = http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz
+md5sum = c97df403e8a3d5b67bb408fcd6aabd8e
 configure-options =
   --disable-static
   --enable-readline

component/tesseract/buildout.cfg

 [buildout]
 extends =
+  ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+  ../leptonica/buildout.cfg
   ../jbigkit/buildout.cfg
-  ../libjpeg/buildout.cfg
-  ../libpng/buildout.cfg
-  ../libtiff/buildout.cfg
-  ../zlib/buildout.cfg
 
 parts =
-  tesseract-eng-traineddata-unzip
   tesseract
 
-[tesseract-share]
-# XXX: tesseract seems not easy configurable on runtime about where to find
-# its trained data, so just move out its datadir to own controlled location
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = mkdir -p ${:location} && mkdir -p ${:location}/tessdata
-update-command = ${:command}
-stop-on-error = yes
-
-
 [tesseract-gcc-4.7-build-patch]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
@@ -27,32 +15,44 @@ download-only = true
 filename = tesseract-3.00-gcc-4.7-build.patch
 md5sum = ca80db3ec489c547b03f3ee48879c1b1
 
+[tesseract-3.01-remove-bom.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+filename = ${:_buildout_section_name_}
+md5sum = 2e691858cb492b7c17d23bf0912b3d24
+
 [tesseract]
 recipe = hexagonit.recipe.cmmi
-url = http://tesseract-ocr.googlecode.com/files/tesseract-3.00.tar.gz
-md5sum = cc812a261088ea0c3d2da735be35d09f
+url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz
+md5sum = 1ba496e51a42358fb9d3ffe781b2d20a
 patch-options =
   -p1
 patches =
   ${tesseract-gcc-4.7-build-patch:location}/${tesseract-gcc-4.7-build-patch:filename}
-depends =
-  ${libtiff:version}
-configure-options =
-  --disable-static
-  --datarootdir=${tesseract-share:location}
+  ${tesseract-3.01-remove-bom.patch:location}/${tesseract-3.01-remove-bom.patch:filename}
+configure-command =
+  aclocal -I ${libtool:location}/share/aclocal -I config
+  libtoolize -f -c
+  libtoolize --automake
+  autoheader -f
+  automake -c -a -f
+  autoconf -Wno-portability
+  ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static --datarootdir=${tesseract-eng-traineddata:location}
+# XXX: tesseract seems not easily configurable at runtime about where to find
+# its trained data, so we set its datarootdir above to a controlled location
+
+# tesseract has a non-standard way of testing for leptonica, hence the
+# LIBLEPT_HEADERSDIR entry below:
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include
-  LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib
+  PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:%(PATH)s
+  ACLOCAL_ARGS=-I${libtool:location}/share/aclocal
+  LIBLEPT_HEADERSDIR=${leptonica:location}/include
+  CPPFLAGS=-I${leptonica:location}/include
+  LDFLAGS =-L${leptonica:location}/lib -Wl,-rpath=${leptonica:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 
 [tesseract-eng-traineddata]
 recipe = hexagonit.recipe.download
-download-only = true
-url = http://tesseract-ocr.googlecode.com/files/eng.traineddata.gz
-md5sum = d91041ad156cf2db36664e91ef799451
-
-[tesseract-eng-traineddata-unzip]
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-recipe = plone.recipe.command
-command = gunzip ${tesseract-eng-traineddata:location}/eng.traineddata.gz -c > ${tesseract-share:location}/tessdata/eng.traineddata
-update-command = ${:command}
-stop-on-error = yes
+strip-top-level-dir = true
+url = http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.01.eng.tar.gz
+md5sum = 89c139a73e0e7b1225809fc7b226b6c9

component/tesseract/tesseract-3.01-remove-bom.patch

+The patch below removes a utf-8 BOM mark.
+
+Avoid touching it as the BOM is invisible, and copy/pasting might not work.
+
+It is needed because old compilers treat the BOM as garbage instead of
+whitespace.
+
+--- tesseract-3.01/ccutil/strngs.h.orig	2012-05-24 15:13:22.743808379 +0200
++++ tesseract-3.01/ccutil/strngs.h	2012-05-24 15:16:54.468858282 +0200
+@@ -1,4 +1,4 @@
+-/**********************************************************************
++/**********************************************************************
+  * File:        strngs.h  (Formerly strings.h)
+  * Description: STRING class definition.
+  * Author:					Ray Smith

component/varnish/buildout.cfg

@@ -5,7 +5,7 @@
 parts =
   varnish
   varnish-2.1
-
+  varnish-3.0
 extends =
   ../ncurses/buildout.cfg
   ../pcre/buildout.cfg
@@ -30,8 +30,15 @@ url = http://repo.varnish-cache.org/source/varnish-2.1.5.tar.gz
 md5sum = 2d2f227da36a2a240c475304c717b8e3
 configure-options =
   --disable-static
+  --without-rst2html
+  --without-rst2man
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig
   CPPFLAGS=-I${ncurses:location}/include
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+
+[varnish-3.0]
+<= varnish-2.1
+url = http://repo.varnish-cache.org/source/varnish-3.0.2.tar.gz
+md5sum = c8eae0aabbe66b6daabdf3a1f58cd47a

component/webp/buildout.cfg

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

component/xorg/tmp_env.patch

+--- xorg-server-1.9.3/os/utils.c.old	2012-03-29 18:20:02.000000000 +0200
++++ xorg-server-1.9.3/os/utils.c	2012-03-29 18:39:33.000000000 +0200
+@@ -226,7 +226,26 @@ OsSignal(int sig, OsSigHandlerPtr handle
+  * server at a time.  This keeps the servers from stomping on each other
+  * if the user forgets to give them different display numbers.
+  */
+-#define LOCK_DIR "/tmp"
++char *
++getcompatibleenv(const char *name, const char *compatible)
++{
++  static char path_list[1][PATH_MAX];
++  char *dir;
++
++  if (path_list[0][0]) {
++    return path_list[0];
++  }
++
++  dir = getenv(name);
++  if (dir == NULL) {
++    return strncpy(path_list[0], compatible, PATH_MAX);
++  } else {
++    return strncpy(path_list[0], dir, PATH_MAX);
++  }
++
++}
++
++#define LOCK_DIR getcompatibleenv("TMPDIR", "/tmp")
+ #define LOCK_TMP_PREFIX "/.tX"
+ #define LOCK_PREFIX "/.X"
+ #define LOCK_SUFFIX "-lock"

component/xorg/xcb_tmp_env.patch

+--- libxcb-1.7/src/xcb_util.c.back	2012-04-03 13:30:36.000000000 +0200
++++ libxcb-1.7/src/xcb_util.c	2012-04-03 14:47:00.000000000 +0200
+@@ -147,11 +147,31 @@
+ static int _xcb_open_abstract(char *protocol, const char *file, size_t filelen);
+ #endif
+ 
++char *
++_xcb_getandappendcompatibleenv(const char *name, const char *compatible, const char *suffix)
++{
++  static char path_list[1][PATH_MAX];
++  char *dir;
++
++  if (path_list[0][0])
++  {
++    return path_list[0];
++  }
++
++  dir = getenv(name);
++  if (dir == NULL) {
++    strncpy(path_list[0], compatible, PATH_MAX);
++  } else {
++    strncpy(path_list[0], dir, PATH_MAX);
++  }
++  return strncat(path_list[0], suffix, PATH_MAX);
++}
++
+ static int _xcb_open(const char *host, char *protocol, const int display)
+ {
+     int fd;
+-    static const char unix_base[] = "/tmp/.X11-unix/X";
+-    const char *base = unix_base;
++    char *base;
++    base = _xcb_getandappendcompatibleenv("TMPDIR", "/tmp", "/.X11-unix/X");
+     size_t filelen;
+     char *file = NULL;
+     int actual_filelen;

component/xorg/xtrans_tmp_env.patch

+--- xtrans-1.2.6/Xtranssock.c.old	2012-03-29 14:25:45.000000000 +0200
++++ xtrans-1.2.6/Xtranssock.c	2012-03-29 18:40:54.000000000 +0200
+@@ -207,29 +207,49 @@ static int TRANS(SocketINETClose) (Xtran
+ #ifdef UNIXCONN
+ 
+ 
++char *
++getandappendcompatibleenv(const int index, const char *name, const char *compatible, const char *suffix)
++{
++  static char path_list[2][PATH_MAX];
++  char *dir;
++
++  if (path_list[index][0])
++  {
++    return path_list[index];
++  }
++
++  dir = getenv(name);
++  if (dir == NULL) {
++    strncpy(path_list[index], compatible, PATH_MAX);
++  } else {
++    strncpy(path_list[index], dir, PATH_MAX);
++  }
++  return strncat(path_list[index], suffix, PATH_MAX);
++}
++
+ #if defined(X11_t)
+-#define UNIX_PATH "/tmp/.X11-unix/X"
+-#define UNIX_DIR "/tmp/.X11-unix"
++#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.X11-unix/X")
++#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.X11-unix")
+ #endif /* X11_t */
+ #if defined(XIM_t)
+-#define UNIX_PATH "/tmp/.XIM-unix/XIM"
+-#define UNIX_DIR "/tmp/.XIM-unix"
++#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.XIM-unix/XIM")
++#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.XIM-unix")
+ #endif /* XIM_t */
+ #if defined(FS_t) || defined(FONT_t)
+-#define UNIX_PATH "/tmp/.font-unix/fs"
+-#define UNIX_DIR "/tmp/.font-unix"
++#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.font-unix/fs")
++#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.font-unix")
+ #endif /* FS_t || FONT_t */
+ #if defined(ICE_t)
+-#define UNIX_PATH "/tmp/.ICE-unix/"
+-#define UNIX_DIR "/tmp/.ICE-unix"
++#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.ICE-unix/")
++#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.ICE-unix")
+ #endif /* ICE_t */
+ #if defined(TEST_t)
+-#define UNIX_PATH "/tmp/.Test-unix/test"
+-#define UNIX_DIR "/tmp/.Test-unix"
++#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.Test-unix/test")
++#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.Test-unix")
+ #endif
+ #if defined(LBXPROXY_t)
+-#define UNIX_PATH "/tmp/.X11-unix/X"
+-#define UNIX_DIR  "/tmp/.X11-unix"
++#define UNIX_PATH getandappendcompatibleenv(0, "TMPDIR", "/tmp", "/.X11-unix/X")
++#define UNIX_DIR getandappendcompatibleenv(1, "TMPDIR", "/tmp", "/.X11-unix")
+ #endif
+ 
+ 

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.46-dev'
+version = '0.58-dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
@@ -40,6 +40,7 @@ setup(name=name,
       zip_safe=True,
       entry_points={
         'zc.buildout': [
+          'agent = slapos.recipe.agent:Recipe',
           'apache.frontend = slapos.recipe.apache_frontend:Recipe',
           'apachephp = slapos.recipe.apachephp:Recipe',
           'apacheproxy = slapos.recipe.apacheproxy:Recipe',
@@ -47,6 +48,8 @@ setup(name=name,
           'certificate_authority = slapos.recipe.certificate_authority:Recipe',
           'certificate_authority.request = slapos.recipe.certificate_authority:Request',
           'check_port_listening = slapos.recipe.check_port_listening:Recipe',
+          'check_url_available = slapos.recipe.check_url_available:Recipe',
+          'cloud9 = slapos.recipe.cloud9:Recipe',
           'cron = slapos.recipe.dcron:Recipe',
           'cron.d = slapos.recipe.dcron:Part',
           'davstorage = slapos.recipe.davstorage:Recipe',
@@ -58,10 +61,13 @@ setup(name=name,
           'equeue = slapos.recipe.equeue:Recipe',
           'erp5testnode = slapos.recipe.erp5testnode:Recipe',
           'generate.mac = slapos.recipe.generatemac:Recipe',
+          'generate.password = slapos.recipe.generatepassword:Recipe',
           'nbdserver = slapos.recipe.nbdserver:Recipe',
-          'generic.onetimeupload = slapos.recipe.generic_onetimeupload: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',
           'java = slapos.recipe.java:Recipe',
           'kumofs = slapos.recipe.kumofs:Recipe',
@@ -100,11 +106,14 @@ setup(name=name,
           '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',
           'simplelogger = slapos.recipe.simplelogger:Recipe',
           'slaprunner = slapos.recipe.slaprunner: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',
           'sphinx= slapos.recipe.sphinx:Recipe',
@@ -113,6 +122,7 @@ setup(name=name,
           'urlparse = slapos.recipe._urlparse:Recipe',
           'vifib = slapos.recipe.vifib:Recipe',
           'waitfor = slapos.recipe.waitfor:Recipe',
+          'xvfb = slapos.recipe.xvfb:Recipe',
           'xwiki = slapos.recipe.xwiki:Recipe',
           'zabbixagent = slapos.recipe.zabbixagent:Recipe',
           'generic.zope = slapos.recipe.generic_zope:Recipe',
@@ -125,7 +135,7 @@ setup(name=name,
           'erp5.test = slapos.recipe.erp5_test:Recipe',
           'generic.varnish = slapos.recipe.generic_varnish:Recipe',
           'webchecker = slapos.recipe.web_checker:Recipe',
-          'slapparameters = slapos.recipe.slapparameters:Recipe',
+          'signalwrapper= slapos.recipe.signal_wrapper:Recipe',
         ],
         'slapos.recipe.nosqltestbed.plugin': [
           'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',

slapos/recipe/README.apache_frontend.txt

-apache_frontend
-==========
-
-Frontend using Apache, allowing to rewrite and proxy URLs like
-myinstance.myfrontenddomainname.com to real IP/URL of myinstance.
-
-apache_frontend works using the master instance / slave instance design.
-It means that a single main instance of Apache will be used to act as frontend
-for many slaves.
-
-
-How to use
-========
-First, you will need to request a "master" instance of Apache Frontend with
-"domain" parameter, like : 
-<?xml version='1.0' encoding='utf-8'?>
-<instance>
- <parameter id="domain">moulefrite.com</parameter>
- <parameter id="port">443</parameter>
-</instance>
-
-Then, it is possible to request many slave instances
-(currently only from slapconsole, UI doesn't work yet)
-of Apache Frontend, like : 
-instance = request(
-       software_release=apache_frontend,
-       partition_reference='frontend2',
-       shared=True,
-       partition_parameter_kw={"url":"https://[1:2:3:4]:1234/someresource"}
-     )
-Those slave instances will be redirected to the "master" instance,
-and you will see on the "master" instance the associated RewriteRules of
-all slave instances.
-
-Finally, the slave instance will be accessible from :
-https://someidentifier.moulefrite.com.

slapos/recipe/README.generic_varnish.txt

+generic_varnish
+===============
+
+This recipe creates a varnish instance dedicated for ERP5 with a web checker[1]
+set up.
+
+How to Use
+==========
+
+On slap console, you can instanciate varnish like this:
+
+instance = request(
+  software_type='varnish',
+  partition_parameter_kw={
+     'tidstorage-url':'http://[your tidstrage address]:your tid strage port',
+     'web-checker-frontend-url':'http://www.example.com',
+     'web-checker-mail-address':'web-checker-result@example.com',
+     'web-checker-smtp-host':'mail.example.com',
+  }
+)
+
+tidstrage-url is the backend url that varnish will cache. It is expected that
+the backend is created by tidstorage recipe.
+
+web-checker-frontend-url is the entry-point-url that web checker will check
+the HTTP headers of all the pages in the web site.
+
+web-checker-mail-address is the email address where web checker will send
+the HTTP Cache cheking result.
+
+web-checker-smtp-host is the smtp server to be used to send the web checker
+result.
+
+[Note]
+When web-checker-* parameters are not given, web_checker will be disabled.
+
+TODO
+====
+
+We need to merge this and apache_frontend recipe.
+
+References
+==========
+
+[1] web_checker (it is a part of erp5.util)
+http://pypi.python.org/pypi/erp5.util
+web_checker: Web site HTTP Cache header checking tool
+

slapos/recipe/agent/__init__.py

+##############################################################################
+#
+# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+#############################################################################
+
+import os
+import sys
+import zc.buildout
+import slapos.slap
+from slapos.recipe.librecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import GenericSlapRecipe
+import json
+import ConfigParser
+
+class Recipe(BaseSlapRecipe, GenericSlapRecipe):
+  def install(self):
+    self.path_list = []
+    self.crond = self.installCrond()
+
+    slap = slapos.slap.slap()
+    computer_id = self.computer_id
+    computer_partition_id = self.computer_partition_id
+    server_url = self.server_url
+    key_file = self.key_file
+    cert_file = self.cert_file
+    slap.initializeConnection(server_url, key_file, cert_file)
+    self.computer_partition = slap.registerComputerPartition(
+        computer_id, computer_partition_id)
+    self.parameter_dict = self.computer_partition.getInstanceParameterDict()
+
+    configuration_path = os.path.join(self.work_directory, "agent.cfg")
+    configuration = ConfigParser.SafeConfigParser()
+    configuration.add_section("agent")
+    configuration.set("agent", "portal_url", self.parameter_dict["portal_url"])
+    configuration.set("agent", "master_url", self.parameter_dict["master_url"])
+    configuration.set("agent", "report_url", self.parameter_dict["report_url"])
+    key_filepath = os.path.join(self.work_directory, "key")
+    key_file = open(key_filepath, "w")
+    key_file.write(self.parameter_dict["key"])
+    key_file.close()
+    configuration.set("agent", "key_file", key_filepath)
+    cert_filepath = os.path.join(self.work_directory, "cert")
+    cert_file = open(cert_filepath, "w")
+    cert_file.write(self.parameter_dict["cert"])
+    cert_file.close()
+    configuration.set("agent", "cert_file", cert_filepath)
+    configuration.set("agent", "maximum_software_installation_duration",
+        self.parameter_dict["maximum_software_installation_duration"])
+    configuration.set("agent", "software_live_duration",
+        self.parameter_dict["software_live_duration"])
+    configuration.set("agent", "computer_list",
+        self.parameter_dict["computer_list"])
+    configuration.set("agent", "software_list",
+        self.parameter_dict["software_list"])
+    configuration.set("agent", "log_directory", self.options["log_directory"])
+    configuration.set("agent", "state_file", self.options["state_file"])
+    state = open(self.options["state_file"], "w")
+    state.write('')
+    state.close()
+    configuration.add_section("software_uri")
+    software_list = json.loads(self.parameter_dict["software_list"])
+    for software in software_list:
+      configuration.set("software_uri", software, self.parameter_dict[software])
+
+    configuration.write(open(configuration_path, "w"))
+
+    agent_crond_path = os.path.join(self.crond, "agent")
+    agent_crond = open(agent_crond_path, "w")
+    agent_crond.write("*/3 * * * * %s -S %s" % \
+      (self.options["python_binary"],
+        "%s --pidfile=%s %s" % \
+          (self.options["agent_binary"], self.options["pidfile"],
+            configuration_path)))
+    agent_crond.close()
+
+    return self.path_list + [configuration_path, key_filepath, cert_filepath, agent_crond_path]
+
+  def installCrond(self):
+    _, self.ws = self.egg.working_set()
+    timestamps = self.createDataDirectory('cronstamps')
+    cron_output = os.path.join(self.log_directory, 'cron-output')
+    self._createDirectory(cron_output)
+    catcher = zc.buildout.easy_install.scripts([('catchcron',
+      __name__ + '.catdatefile', 'catdatefile')], self.ws, sys.executable,
+      self.bin_directory, arguments=[cron_output])[0]
+    self.path_list.append(catcher)
+    cron_d = os.path.join(self.etc_directory, 'cron.d')
+    crontabs = os.path.join(self.etc_directory, 'crontabs')
+    self._createDirectory(cron_d)
+    self._createDirectory(crontabs)
+    wrapper = zc.buildout.easy_install.scripts([('crond',
+      'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
+      self.wrapper_directory, arguments=[
+        self.options['dcrond_binary'].strip(), '-s', cron_d, '-c', crontabs,
+        '-t', timestamps, '-f', '-l', '5', '-M', catcher]
+      )[0]
+    self.path_list.append(wrapper)
+    return cron_d

slapos/recipe/agent/catdatefile.py

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

slapos/recipe/apache_frontend/template/apache.conf.in

@@ -3,7 +3,6 @@
 
 # Basic server configuration
 PidFile "%(pid_file)s"
-LockFile "%(lock_file)s"
 ServerName %(server_name)s
 DocumentRoot %(document_root)s
 
@@ -18,8 +17,7 @@ AddType application/x-gzip .gz .tgz
 # As backend is trusting REMOTE_USER header unset it always
 RequestHeader unset REMOTE_USER
 
-# SSL Configuration
-%(ssl_snippet)s
+ServerTokens Prod
 
 # Log configuration
 ErrorLog "%(error_log)s"
@@ -28,38 +26,15 @@ LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"
 LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common
 CustomLog "%(access_log)s" common
 
-# Directory protection
-<Directory />
-    Options FollowSymLinks
-    AllowOverride None
-    Order deny,allow
-    Deny from all
-</Directory>
-
 %(path_enable)s
 
-# Rewrite part
-RewriteEngine On
-
-# Define the two rewritemaps : one for zope, one generic
-RewriteMap apachemapzope txt:%(apachemapzope_path)s
-RewriteMap apachemapgeneric txt:%(apachemap_path)s
-
-# First, we check if we have a zope backend server
-# If so, let's use Virtual Host Daemon rewrite
-#RewriteCond ${apachemapzope:%%{SERVER_NAME}} >""
-#RewriteRule ^/(\w+)($|/.*) ${apachemapzope:$1}/VirtualHostBase/https/%(apache_domain)s:%(port)s/VirtualHostRoot/_vh_$1$2 [L,P]
-
-# If we have generic backend server, let's rewrite without virtual host daemon
-RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >""
-RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P]
-
-# If nothing exist : put a nice error
-ErrorDocument 404 /notfound.html
-
 # List of modules
+#LoadModule unixd_module modules/mod_unixd.so
+#LoadModule access_compat_module modules/mod_access_compat.so
+#LoadModule authz_core_module modules/mod_authz_core.so
 LoadModule authz_host_module modules/mod_authz_host.so
 LoadModule log_config_module modules/mod_log_config.so
+LoadModule deflate_module modules/mod_deflate.so
 LoadModule setenvif_module modules/mod_setenvif.so
 LoadModule version_module modules/mod_version.so
 LoadModule proxy_module modules/mod_proxy.so
@@ -71,4 +46,91 @@ LoadModule dav_fs_module modules/mod_dav_fs.so
 LoadModule negotiation_module modules/mod_negotiation.so
 LoadModule rewrite_module modules/mod_rewrite.so
 LoadModule headers_module modules/mod_headers.so
+LoadModule cache_module modules/mod_cache.so
+LoadModule mem_cache_module modules/mod_mem_cache.so
 LoadModule antiloris_module modules/mod_antiloris.so
+
+# The following directives modify normal HTTP response behavior to
+# handle known problems with browser implementations.
+BrowserMatch "Mozilla/2" nokeepalive
+BrowserMatch ".*MSIE.*" nokeepalive ssl-unclean-shutdown \
+                        downgrade-1.0 force-response-1.0
+BrowserMatch "RealPlayer 4\.0" force-response-1.0
+BrowserMatch "Java/1\.0" force-response-1.0
+BrowserMatch "JDK/1\.0" force-response-1.0
+# The following directive disables redirects on non-GET requests for
+# a directory that does not include the trailing slash.  This fixes a 
+# problem with Microsoft WebFolders which does not appropriately handle 
+# redirects for folders with DAV methods.
+# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
+BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
+BrowserMatch "MS FrontPage" redirect-carefully
+BrowserMatch "^WebDrive" redirect-carefully
+BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully
+BrowserMatch "^gnome-vfs" redirect-carefully
+BrowserMatch "^XML Spy" redirect-carefully
+BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
+
+# Cache directives
+CacheEnable mem /
+CacheDefaultExpire 3600
+MCacheSize 8192
+MCacheMaxObjectCount 1000
+MCacheMaxObjectSize 8192
+MCacheRemovalAlgorithm LRU
+
+# Deflate
+AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/x-javascript application/javascript
+BrowserMatch ^Mozilla/4 gzip-only-text/html
+BrowserMatch ^Mozilla/4\.0[678] no-gzip
+BrowserMatch \bMSIE !no-gzip !gzip-only-text/html 
+# Make sure proxies don't deliver the wrong content
+Header append Vary User-Agent
+
+# SSL Configuration
+%(ssl_snippet)s
+
+<VirtualHost *:%(https_port)s>
+  SSLEngine on
+  SSLProxyEngine on
+  # Rewrite part
+  ProxyVia On
+  ProxyPreserveHost On
+  ProxyTimeout 600
+  RewriteEngine On
+
+  # Define the two rewritemaps : one for zope, one generic
+  RewriteMap apachemapzope txt:%(apachemapzope_path)s
+  RewriteMap apachemapgeneric txt:%(apachemap_path)s
+
+  # First, we check if we have a zope backend server
+  # If so, let's use Virtual Host Daemon rewrite
+  RewriteCond ${apachemapzope:%%{SERVER_NAME}} >""
+  RewriteRule ^/(.*)$ ${apachemapzope:%%{SERVER_NAME}}/VirtualHostBase/https/%%{SERVER_NAME}:%%{SERVER_PORT}/VirtualHostRoot/$1 [L,P]
+
+  # If we have generic backend server, let's rewrite without virtual host daemon
+  RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >""
+  RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P]
+
+  # If nothing exist : put a nice error
+  ErrorDocument 404 /notfound.html
+</VirtualHost>
+
+<VirtualHost *:%(plain_http_port)s>
+  RewriteEngine On
+  ProxyPreserveHost On
+
+  # We accept generic (i.e not lamp) backends on http
+  RewriteMap apachemapgeneric txt:%(apachemap_path)s
+  RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >""
+  RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P]
+
+  # Not using HTTPS? Ask that guy over there.
+  # Dummy redirection to https. Note: will work only if https listens
+  # on standard port (443).
+  RewriteRule ^/(.*)$ https://%%{SERVER_NAME}%%{REQUEST_URI}
+</VirtualHost>
+
+# Include configuration file not operated by slapos. This file won't be erased
+# or changed when slapgrid is ran. It can be freely customized by node admin.
+Include %(custom_apache_conf)s

slapos/recipe/apache_frontend/template/apache.ssl-snippet.conf.in

-SSLEngine on
-SSLProxyEngine on
 SSLCertificateFile %(login_certificate)s
 SSLCertificateKeyFile %(login_key)s
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
+SSLSessionCache shmcb:/%(httpd_mod_ssl_cache_directory)s/ssl_scache(512000)
+SSLSessionCacheTimeout  300
+SSLRandomSeed startup /dev/urandom 256
+SSLRandomSeed connect builtin
+SSLProtocol -ALL +SSLv3 +TLSv1
+SSLHonorCipherOrder On
+SSLCipherSuite RC4-SHA:HIGH:!ADH
+<FilesMatch "\.(cgi|shtml|phtml|php)$">
+      SSLOptions +StdEnvVars
+</FilesMatch>
+# Accept proxy to sites using self-signed SSL certificates
+SSLProxyCheckPeerCN off
+SSLProxyCheckPeerExpire off

slapos/recipe/apache_zope_backend/__init__.py

@@ -70,7 +70,7 @@ class Recipe(GenericBaseRecipe):
     apache_conf['server_name'] = '%s' % apache_conf['ip']
     apache_conf['path'] = '/'
     apache_conf['access_control_string'] = access_control_string
-    apache_conf['rewrite_rule'] = "RewriteRule (.*) %s%s [L,P]" % (backend,
+    apache_conf['rewrite_rule'] = "RewriteRule (.*) %s%s$1 [L,P]" % (backend,
       self.options.get('backend-path', '/'))
     apache_conf_string = pkg_resources.resource_string(__name__,
           'template/apache.zope.conf.in') % apache_conf

slapos/recipe/apachephp/__init__.py

@@ -37,9 +37,9 @@ class Recipe(GenericBaseRecipe):
     path_list = []
 
     # Copy application
-    shutil.rmtree(self.options['htdocs'])
-    shutil.copytree(self.options['source'],
-                    self.options['htdocs'])
+    if not os.path.exists(self.options['htdocs']):
+      shutil.copytree(self.options['source'],
+                      self.options['htdocs'])
 
     # Install php.ini
     php_ini = self.createFile(os.path.join(self.options['php-ini-dir'],
@@ -85,33 +85,37 @@ class Recipe(GenericBaseRecipe):
       with open(secret_key_filename, 'r') as secret_key_file:
         secret_key = secret_key_file.read()
 
-    application_conf = dict(mysql_database=self.options['mysql-database'],
-                            mysql_user=self.options['mysql-username'],
-                            mysql_password=self.options['mysql-password'],
-                            mysql_host='%s:%s' % (self.options['mysql-host'],
-                                                  self.options['mysql-port']),
-                            secret_key=secret_key,
-                           )
+    # Generate application configuration file
+    if self.options.get('template'):
+      application_conf = dict(mysql_database=self.options['mysql-database'],
+                              mysql_user=self.options['mysql-username'],
+                              mysql_password=self.options['mysql-password'],
+                              mysql_host='%s:%s' % (self.options['mysql-host'],
+                                                    self.options['mysql-port']),
+                              secret_key=secret_key,
+                             )
 
-    directory, file_ = os.path.split(self.options['configuration'])
+      directory, file_ = os.path.split(self.options['configuration'])
 
-    path = self.options['htdocs']
-    if directory:
-      path = os.path.join(path, directory)
-      if not os.path.exists(path):
-        os.makedirs(path)
-      if not os.path.isdir(path):
-        raise OSError("Cannot create %r." % path)
+      path = self.options['htdocs']
+      if directory:
+        path = os.path.join(path, directory)
+        if not os.path.exists(path):
+          os.makedirs(path)
+        if not os.path.isdir(path):
+          raise OSError("Cannot create %r." % path)
 
-    destination = os.path.join(path, file_)
-    config = self.createFile(destination,
-      self.substituteTemplate(self.options['template'], application_conf))
-    path_list.append(config)
+      destination = os.path.join(path, file_)
+      config = self.createFile(destination,
+        self.substituteTemplate(self.options['template'], application_conf))
+      path_list.append(config)
 
     if os.path.exists(self.options['pid-file']):
       # Reload apache configuration
       with open(self.options['pid-file']) as pid_file:
         pid = int(pid_file.read().strip(), 10)
-      os.kill(pid, signal.SIGUSR1) # Graceful restart
-
+      try:
+        os.kill(pid, signal.SIGUSR1) # Graceful restart
+      except OSError:
+        pass
     return path_list

slapos/recipe/check_url_available/__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 "url" is available (e.g page answers 200 OK).
+  """
+
+  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_url.in'), config)
+    )
+
+    return [promise]

slapos/recipe/check_url_available/template/check_url.in

+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+
+URL="%(url)s"
+CODE=$(%(curl_path)s -k -sL $URL -w %%{http_code} -o /dev/null)
+
+if [ $CODE -eq 000 ]; then
+  echo "$URL is not available (server not reachable)" >&2
+  exit 1
+fi
+
+if ! [ $CODE -eq 200 ]; then
+  echo "$URL is not available (returned $CODE)" >&2
+  exit 2
+fi

slapos/recipe/cloud9/__init__.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+import os
+
+class Recipe(GenericBaseRecipe):
+  """Deploy a fully operational cloud9 service."""
+
+  def _options(self, options):
+    self.ip = options['ip'].strip()
+    self.port = options['port'].strip()
+    self.git = options['git-binary'].strip()
+    self.node_executable = options['node-binary'].strip()
+    self.cloud9 = options['cloud9'].strip()
+    self.workdir = options['working-directory'].strip()
+    self.wrapper = options['wrapper'].strip()
+    # Set cloud9 access URL
+    options['access-url'] = 'http://[%s]:%s' % (self.ip, self.port)
+
+  def install(self):
+    path_list = []
+
+    environment = {
+        'PATH': os.path.dirname(self.git) + ':' + os.environ['PATH'],
+    }
+
+    cloud9_args = [self.node_executable, self.cloud9, '-l', self.ip, '-p',
+        self.port, '-w', self.workdir]
+
+    wrapper = self.createPythonScript(self.wrapper,
+        'slapos.recipe.librecipe.execute.executee',
+        (cloud9_args, environment)
+    )
+    path_list.append(wrapper)
+
+    return path_list

slapos/recipe/cloudooo/__init__.py

-##############################################################################
-#
-# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
-import os
-import pkg_resources
-import sys
-import zc.buildout
-import zc.recipe.egg
-
-class Recipe(BaseSlapRecipe):
-  def getTemplateFilename(self, template_name):
-    return pkg_resources.resource_filename(__name__,
-        'template/%s' % template_name)
-
-  def _install(self):
-    self.path_list = []
-    self.requirements, self.ws = self.egg.working_set([__name__])
-    # Use killpidfromfile from ERP5.
-    self.killpidfromfile = zc.buildout.easy_install.scripts(
-        [('killpidfromfile', __name__ + 'slapos.recipe.erp5.killpidfromfile',
-          'killpidfromfile')], self.ws, sys.executable, self.bin_directory)[0]
-    self.path_list.append(self.killpidfromfile)
-    conversion_server_conf = self.installConversionServer(
-        self.getLocalIPv4Address(), 23000, 23060)
-
-    self.linkBinary()
-    self.setConnectionDict(dict(
-      site_url="http://%s:%s/" % (self.getLocalIPv4Address(), 23000),
-    ))
-    return self.path_list
-
-  def linkBinary(self):
-    """Links binaries to instance's bin directory for easier exposal"""
-    for linkline in self.options.get('link_binary_list', '').splitlines():
-      if not linkline:
-        continue
-      target = linkline.split()
-      if len(target) == 1:
-        target = target[0]
-        path, linkname = os.path.split(target)
-      else:
-        linkname = target[1]
-        target = target[0]
-      link = os.path.join(self.bin_directory, linkname)
-      if os.path.lexists(link):
-        if not os.path.islink(link):
-          raise zc.buildout.UserError(
-              'Target link already %r exists but it is not link' % link)
-        os.unlink(link)
-      os.symlink(target, link)
-      self.logger.debug('Created link %r -> %r' % (link, target))
-      self.path_list.append(link)
-
-  def installConversionServer(self, ip, port, openoffice_port):
-    name = 'conversion_server'
-    working_directory = self.createDataDirectory(name)
-    conversion_server_dict = dict(
-      working_path=working_directory,
-      uno_path=self.options['ooo_uno_path'],
-      office_binary_path=self.options['ooo_binary_path'],
-      ip=ip,
-      port=port,
-      openoffice_port=openoffice_port,
-    )
-    for env_line in self.options['environment'].splitlines():
-      env_line = env_line.strip()
-      if not env_line:
-        continue
-      if '=' in env_line:
-        env_key, env_value = env_line.split('=')
-        conversion_server_dict[env_key.strip()] = env_value.strip()
-      else:
-        raise zc.buildout.UserError('Line %r in environment parameter is '
-            'incorrect' % env_line)
-    config_file = self.createConfigurationFile(name + '.cfg',
-        self.substituteTemplate(self.getTemplateFilename('cloudooo.cfg.in'),
-          conversion_server_dict))
-    self.path_list.append(config_file)
-    # Use execute from erp5.
-    self.path_list.extend(zc.buildout.easy_install.scripts([(name,
-      __name__ + 'slapos.recipe.librecipe.execute',
-      'execute_with_signal_translation')], self.ws,
-      sys.executable, self.wrapper_directory,
-      arguments=[self.options['ooo_paster'].strip(), 'serve', config_file]))
-    return {
-      name + '_port': conversion_server_dict['port'],
-      name + '_ip': conversion_server_dict['ip']
-      }

slapos/recipe/cloudooo/template/cloudooo.cfg.in

-[app:main]
-use = egg:cloudooo
-#
-## System config
-#
-debug_mode = True
-# Folder where pid files, lock files and virtual frame buffer mappings
-# are stored. In this folder is necessary create a folder tmp, because this
-# folder is used to create all temporary documents.
-working_path = %(working_path)s
-# Folder where UNO library is installed
-uno_path = %(uno_path)s
-# Folder where soffice.bin is installed
-office_binary_path = %(office_binary_path)s
-#
-## Monitor Settings
-#
-# Limit to use the Openoffice Instance. if pass of the limit, the instance is
-# stopped and another is started.
-limit_number_request = 100
-# Interval to check the factory
-monitor_interval = 10
-timeout_response = 180
-enable_memory_monitor = True
-# Set the limit in MB
-# e.g 1000 = 1 GB, 100 = 100 MB
-limit_memory_used = 3000
-#
-## OOFactory Settings
-#
-# The pool consist of several OpenOffice.org instances
-application_hostname = %(ip)s
-# OpenOffice Port
-openoffice_port = %(openoffice_port)s
-# LD_LIBRARY_PATH passed to OpenOffice
-env-LD_LIBRARY_PATH = %(LD_LIBRARY_PATH)s
-
-#
-# Mimetype Registry
-# It is used to select the handler that will be used in conversion.
-# Priority matters, first match take precedence on next lines.
-mimetype_registry =
-  application/pdf * ooo
-  video/* * ffmpeg
-  audio/* * ffmpeg
-  application/x-shockwave-flash * ffmpeg
-  application/ogg * ffmpeg
-  application/ogv * ffmpeg
-  image/* * ooo
-  text/* * ooo
-  application/zip * ooo
-  application/msword * ooo
-  application/vnd* * ooo
-  application/x-vnd* * ooo
-  application/postscript * ooo
-  application/wmf * ooo
-  application/csv * ooo
-  application/x-openoffice-gdimetafile * ooo
-  application/x-emf * ooo
-  application/emf * ooo
-  application/octet* * ooo
-  * application/vnd.oasis.opendocument* ooo
-
-[server:main]
-use = egg:PasteScript#wsgiutils
-host = %(ip)s
-port = %(port)s

slapos/recipe/cloudooo_test/__init__.py

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

slapos/recipe/cloudooo_test/test.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+import sys
+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)
+

slapos/recipe/firefox/__init__.py

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

slapos/recipe/firefox/template/firefox_run.in

+#!%(python_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+#
+
+import os
+from subprocess import Popen, PIPE
+import tempfile
+import shutil
+import sys
+import signal
+import subprocess
+import time
+
+os.environ['MOZ_NO_REMOTE'] = '1'
+os.environ['LC_ALL'] = 'C'
+os.environ['MOZ_CRASHREPORTER_DISABLE'] = '1'
+os.environ['NO_EM_RESTART'] = '1'
+os.environ['TMPDIR'] = "%(tmp_path)s"
+os.environ['DISPLAY'] = ':0'
+# XXX .Xauthority
+
+profile_path = tempfile.mkdtemp()
+shutil.copyfile('%(pref_path)s', os.path.join(profile_path, 'pref.js'))
+# os.environ['HOME'] = profile_path
+child_pg = None
+
+def sig_handler(signal, frame):
+  if child_pg is not None:
+    os.killpg(child_pg, signal.SIGHUP)
+    os.killpg(child_pg, signal.SIGTERM)
+  sys.exit(0)
+
+signal.signal(signal.SIGINT, sig_handler)
+signal.signal(signal.SIGQUIT, sig_handler)
+signal.signal(signal.SIGTERM, sig_handler)
+
+def execute_with_signal_translation(args):
+  """Run process as children and translate from SIGTERM to another signal"""
+  child = subprocess.Popen(args, close_fds=True, preexec_fn=os.setsid)
+  child_pg = child.pid
+  try:
+    while True:
+      time.sleep(2)
+  finally:
+    os.killpg(child_pg, signal.SIGHUP)
+    os.killpg(child_pg, signal.SIGTERM)
+
+try:
+  execute_with_signal_translation(
+    ["%(firefox_binary)s", "-no-remote", "-profile", profile_path] + sys.argv[1:])
+
+finally:
+  shutil.rmtree(profile_path)
+  

slapos/recipe/firefox/template/prefs.js

+// Don't ask if we want to switch default browsers
+user_pref("browser.shell.checkDefaultBrowser", false);
+user_pref("browser.startup.homepage_override.mstone", "ignore");
+
+// disable application updates
+user_pref("app.update.enabled", false)
+
+// disables the 'know your rights' button from displaying on first run
+user_pref("browser.rights.3.shown", true);
+
+// Disable pop-up blocking
+user_pref("browser.allowpopups", true);
+user_pref("dom.disable_open_during_load", false);
+user_pref("browser.tabs.warnOnClose", false);
+
+// Configure us as the local proxy
+//user_pref("network.proxy.type", 2);
+
+// Disable security warnings
+user_pref("security.warn_submit_insecure", false);
+user_pref("security.warn_submit_insecure.show_once", false);
+user_pref("security.warn_entering_secure", false);
+user_pref("security.warn_entering_secure.show_once", false);
+user_pref("security.warn_entering_weak", false);
+user_pref("security.warn_entering_weak.show_once", false);
+user_pref("security.warn_leaving_secure", false);
+user_pref("security.warn_leaving_secure.show_once", false);
+user_pref("security.warn_viewing_mixed", false);
+user_pref("security.warn_viewing_mixed.show_once", false);
+
+// Disable "do you want to remember this password?"
+user_pref("signon.rememberSignons", false);
+
+// increase the timeout before warning of unresponsive script
+user_pref("dom.max_script_run_time", 120);
+
+// this is required to upload files
+// user_pref("capability.principal.codebase.p1.granted", "UniversalFileRead");
+// user_pref("signed.applets.codebase_principal_support", true);
+// user_pref("capability.principal.codebase.p1.id", "http://");
+// user_pref("capability.principal.codebase.p1.subjectName", "");
+
+user_pref("browser.link.open_external", 3);
+user_pref("browser.link.open_newwindow", 3);
+
+// disables the request to send performance data from displaying
+user_pref("toolkit.telemetry.prompted", 2);
+user_pref("toolkit.telemetry.rejected", true);
+
+user_pref("browser.migration.version", 5);
+user_pref("extensions.SelectionUI", true);
+user_pref("network.cookie.prefsMigrated", true);
+user_pref("browser.bookmarks.restore_default_bookmarks", false);
+user_pref("browser.places.smartBookmarksVersion", 2);
+user_pref("privacy.sanitize.migrateFx3Prefs", true);

slapos/recipe/generatemac.py

-
 ##############################################################################
 #
 # Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
@@ -26,15 +25,26 @@
 #
 ##############################################################################
 import random
+import os
 
 from slapos.recipe.librecipe import GenericBaseRecipe
 
 class Recipe(GenericBaseRecipe):
 
   def __init__(self, buildout, name, options):
-    # First octet has to represent a locally administered address
-    octet_list = [254] + [random.randint(0x00, 0xff) for x in range(5)]
-    options['mac-address'] = ':'.join(['%02x' % x for x in octet_list])
+    if os.path.exists(options['storage-path']):
+      open_file = open(options['storage-path'], 'r')
+      options['mac-address'] = open_file.read()
+      open_file.close()
+
+    if options.get('mac-address', '') == '':
+      # First octet has to represent a locally administered address
+      octet_list = [254] + [random.randint(0x00, 0xff) for x in range(5)]
+      options['mac-address'] = ':'.join(['%02x' % x for x in octet_list])
+    return GenericBaseRecipe.__init__(self, buildout, name, options)
 
   def install(self):
-    return []
+    open_file = open(self.options['storage-path'], 'w')
+    open_file.write(self.options['mac-address'])
+    open_file.close()
+    return [self.options['storage-path']]

slapos/recipe/generatepassword.py

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

slapos/recipe/generic_cloudooo/template/cloudooo.cfg.in

@@ -32,6 +32,7 @@ limit_memory_used = 3000
 application_hostname = %(ip)s
 # OpenOffice Port
 openoffice_port = %(openoffice_port)s
+
 # LD_LIBRARY_PATH passed to OpenOffice
 env-LD_LIBRARY_PATH = %(LD_LIBRARY_PATH)s
 env-FONTCONFIG_FILE = %(FONTCONFIG_FILE)s
@@ -41,12 +42,30 @@ env-FONTCONFIG_FILE = %(FONTCONFIG_FILE)s
 # It is used to select the handler that will be used in conversion.
 # Priority matters, first match take precedence on next lines.
 mimetype_registry =
-  application/pdf * pdf
   application/vnd.oasis.opendocument* * ooo
   application/vnd.sun.xml* * ooo
-  text/* * ooo
-  image/* image/* imagemagick
+  application/pdf text/* pdf
+  application/pdf * ooo
   video/* * ffmpeg
+  audio/* * ffmpeg
+  application/x-shockwave-flash * ffmpeg
+  application/ogg * ffmpeg
+  application/ogv * ffmpeg
+  image/png image/jpeg imagemagick
+  image/png * ooo
+  image/* image/* imagemagick
+  text/* * ooo
+  application/zip * ooo
+  application/msword * ooo
+  application/vnd* * ooo
+  application/x-vnd* * ooo
+  application/postscript * ooo
+  application/wmf * ooo
+  application/csv * ooo
+  application/x-openoffice-gdimetafile * ooo
+  application/x-emf * ooo
+  application/emf * ooo
+  application/octet* * ooo
   * application/vnd.oasis.opendocument* ooo
 
 [server:main]

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

@@ -8,6 +8,10 @@
 # Loud fail is really required in such case.
 sql-mode="NO_ENGINE_SUBSTITUTION"
 
+# Workaround for https://bugs.launchpad.net/maria/+bug/985828
+# that causes wrong result in Resource_zGetInventoryList etc.
+optimizer_switch = derived_merge=off
+
 skip-show-database
 %(networking)s
 socket = %(socket)s

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

@@ -2,4 +2,4 @@ USE mysql;
 DROP FUNCTION IF EXISTS last_insert_grn_id;
 CREATE FUNCTION last_insert_grn_id RETURNS INTEGER SONAME 'ha_mroonga.so';
 DROP FUNCTION IF EXISTS sphinx_snippets;
-#CREATE FUNCTION sphinx_snippets RETURNS STRING SONAME 'sphinx.so';
+#CREATE FUNCTION sphinx_snippets RETURNS STRING SONAME 'ha_sphinx.so';

slapos/recipe/generic_varnish/__init__.py

@@ -38,7 +38,7 @@ class Recipe(GenericSlapRecipe):
   def _install(self):
     ip = self.options['ip']
     backend_url = self.parameter_dict['tidstorage-url']
-    backend_ip, backend_port = self._getBackendServer(backend_url)
+    backend_server, backend_port = self._getBackendServer(backend_url)
     varnishd_manager_port = int(self.options['manager-port'])
     varnishd_server_port = int(self.options['server-port'])
     path_list = []
@@ -53,9 +53,8 @@ class Recipe(GenericSlapRecipe):
       varnish_data=self.options['varnish-data'],
       shell_path=self.options['shell-path'],
       vcl_file=self.options['vcl-file'],
-      backend_ip = backend_ip,
-      backend_port = backend_port,
-      backend_server = "[%s]" % backend_ip,
+      backend_port=backend_port,
+      backend_server=backend_server,
     )
 
     path_list.append(self.createExecutable(self.options['varnishd-wrapper'],
@@ -70,7 +69,7 @@ class Recipe(GenericSlapRecipe):
     return path_list
 
   def _getBackendServer(self, url):
-    r = re.compile('\/\/\[(.*)\]:(\d*)')
+    r = re.compile('\/\/(\[.+\]|[\d.]+):(\d*)')
     result = r.search(url)
     ip = result.groups()[0]
     port = result.groups()[1]

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

@@ -5,120 +5,181 @@
 #server.
 #
 backend default {
-  .host = "%(backend_ip)s";
-  .port = "%(backend_port)s";
-  .probe = {
-           .timeout = 30s;
-           .interval = 5s;
-           .window = 4;
-           .threshold = 3;
-           .request =
-             "OPTIONS /erp5/getId HTTP/1.1"
-             "Host: %(backend_server)s:%(backend_port)s"
-             "Accept-Encoding: identity"
-             "Connection: close"
-             "User-Agent: Varnish";
-  }
+    .host = "%(backend_server)s";
+    .port = "%(backend_port)s";
+    .probe = {
+        .timeout = 30s;
+        .interval = 5s;
+        .window = 4;
+        .threshold = 3;
+        .request =
+            "OPTIONS /erp5/getId HTTP/1.1"
+            "Host: %(backend_server)s:%(backend_port)s"
+            "Accept-Encoding: identity"
+            "Connection: close"
+            "User-Agent: Varnish";
+    }
 }
-#
-#Below is a commented-out copy of the default VCL logic.  If you
-#redefine any of these subroutines, the built-in logic will be
-#appended to your code.
-#
 
+# Called at the beginning of a request, after the complete request has been received and parsed
 sub vcl_recv {
-  if (req.request != "GET" &&
-    req.request != "HEAD" &&
-    req.request != "PUT" &&
-    req.request != "POST" &&
-    req.request != "TRACE" &&
-    req.request != "OPTIONS" &&
-    req.request != "PURGE" &&
-    req.request != "DELETE") {
-      /* Non-RFC2616 or CONNECT which is weird. */
-      pipe;
-  }
-  if (req.request != "GET" && req.request != "HEAD" && req.request != "PURGE") {
-      /* We only deal with GET and HEAD by default */
-      pass;
-  }
-  remove req.http.Cookie;
-  remove req.http.Set-Cookie;
-  if (req.http.Accept-Encoding) {
-    if (req.http.Accept-Encoding ~ "gzip") {
-      set req.http.Accept-Encoding = "gzip";
-    } elsif (req.http.Accept-Encoding ~ "deflate") {
-      set req.http.Accept-Encoding = "deflate";
+    # 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" &&
+        req.request != "PUT" &&
+        req.request != "POST" &&
+        req.request != "TRACE" &&
+        req.request != "OPTIONS" &&
+        req.request != "PURGE" &&
+        req.request != "DELETE") {
+        /* Non-RFC2616 or CONNECT which is weird. */
+        return(pipe);
+    }
+    # Pass anything other than GET and HEAD and PURGE directly.
+    if (req.request != "GET" && req.request != "HEAD" && req.request != "PURGE") {
+        /* We only deal with GET and HEAD by default */
+        return(pass);
+    }
+    if (req.http.Authorization) {
+        /* Not cacheable by default */
+        return (pass);
+    }
+
+    # no need to have cookies for the resources
+    if (req.url ~ "\.(css|js|ico)$") {
+        unset req.http.cookie;
+    }
+    # remove bogus cookies
+    if (req.http.Cookie) {
+        set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *__utm.=[^;]+;? *", "\1");
+        set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *__ac_name=\x22\x22;? *", "\1");
+        set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *__ac=\x22Og.3D.3D\x22;? *", "\1");
+    }
+    if (req.http.Cookie == "") {
+        remove req.http.Cookie;
+    }
+    if (req.http.Cookie && req.http.Cookie ~ "(^|; ) *__ac=") {
+        /* Not cacheable for authorised users,
+           but KM images are cacheable */
+        if (!(req.url ~ "/km_img/.*\.(png|gif)$")) {
+            return (pass);
+        }
+    }
+    # XXX Is it OK to remove this of all the case?
+    remove req.http.Set-Cookie;
+
+    if (req.http.Accept-Encoding) {
+        if (req.http.Accept-Encoding ~ "gzip") {
+            set req.http.Accept-Encoding = "gzip";
+        } elsif (req.http.Accept-Encoding ~ "deflate") {
+            set req.http.Accept-Encoding = "deflate";
+        } else {
+            # unkown algorithm
+            remove req.http.Accept-Encoding;
+        }
+    }
+    # We do not care about Accept-Language, this is url controlled
+    remove req.http.Accept-Language;
+
+    ## XXX login form can defer based on __ac_name cookie value
+    if (req.url ~ "/(login_form|WebSite_viewLoginDialog)($|\?)") {
+        return (pass);
+    }
+
+    if (req.backend.healthy) {
+        set req.grace = 1h;
     } else {
-      # unkown algorithm
-      remove req.http.Accept-Encoding;
-    }
-  }
-  # Force deflate
-  remove req.http.Accept-Encoding;
-  # We do not care about Accept-Language, this is url controlled
-  remove req.http.Accept-Language;
-  #if (req.request == "PURGE") {
-  #  if (!client.ip ~ purge) {
-  #    error 405 "Not allowed.";
-  #  }
-  #  purge_url(req.url);
-  #  error 200 "HASHPURGED";
-  #  unset req.http.x;
-  #}
-  set req.grace = 30d;
-  lookup;
+        set req.grace = 1w;
+    }
+    return(lookup);
 }
 
+# Creates the varnish cache key by the url
 sub vcl_hash {
-    set req.hash += req.url;
-    hash;
+    hash_data(req.url);
+    return(hash);
 }
 
+# Called after a cache lookup if the requested document was found in the cache
 sub vcl_hit {
-   #if (req.request == "PURGE" && client.ip ~ purge) {
-   #  set obj.ttl = 0s;
-   #  error 200 "Purged.";
-   #}
-
-   #if (client.ip ~ purge){
-   #  # Force refresh from localhost
-   #  set obj.ttl = 0s;
-   #  return (restart);
-   #}
-   # According Vary Header do not return those headers
-   remove req.http.Accept-Language;
-   remove req.http.Accept-Encoding;
-   remove req.http.Cookie;
-   deliver;
+    # According Vary Header do not return those headers
+    remove req.http.Accept-Language;
+    remove req.http.Accept-Encoding;
+    remove req.http.Cookie;
+    return(deliver);
 }
 
+# Called after a cache lookup if the requested document was not found in the cache
 sub vcl_miss {
-    fetch;
+    return(fetch);
 }
 
+# Called after a document has been successfully retrieved from the backend
 sub vcl_fetch {
+    # we only cache 200 (OK) and 304 (Not Modified) responses.
+    if (beresp.status != 200 && beresp.status != 304) {
+        set beresp.ttl = 0s;
+    }
+
+    if (beresp.http.cache-control ~ "no-cache") {
+        set beresp.ttl = 0s;
+    }
+
+    if (beresp.ttl == 0s) {
+        unset beresp.http.expires;
+        set beresp.http.cache-control = "no-cache";
+        return(hit_for_pass);
+    }
+
+    # we don't care haproxy's cookie.
+    if (beresp.http.Set-Cookie && beresp.http.Set-Cookie !~ "^SERVERID=[^;]+; path=/$") {
+        return(hit_for_pass);
+    }
+
+    if (req.url ~ "\.(css|js|ico)$") {
+        unset beresp.http.set-cookie;
+        set beresp.http.cache-control = regsub(beresp.http.cache-control, "^", "public,");
+        set beresp.http.cache-control = regsub(beresp.http.cache-control, ",$", "");
+    }
+
+    # remove some headers added by caching policy manager to avoid
+    # '304 Not Modified' in case of login <-> logout switching.
+    if (beresp.http.content-type ~ "^text/html") {
+       unset beresp.http.last-modified;
+    }
+
+    set beresp.grace = 1w;
     /* Never send request to backend even if client ask refreshed content */
-    if (obj.cacheable) {
-       /* Setup grace period for 30days for all cacheable contents */
-      #set req.grace = 30d;
-      set obj.grace = 30d;
-      }
-   deliver;
-   }
+    if (beresp.ttl > 0s) {
+        /* Setup grace period for 30days for all cacheable contents */
+        set beresp.grace = 30d;
+        # /* Set the clients TTL on this object */
+        # set beresp.http.cache-control = "max-age = 300";
+        /* Set how long Varnish will keep it */
+        set beresp.ttl = 1w;
+        /* marker for vcl_deliver to reset Age: */
+        set beresp.http.magicmarker = "1";
+    }
 
+    return(deliver);
+}
 
+# Called before a cached object is delivered to the client
 sub vcl_deliver {
-   if (obj.hits > 0) {
-     set resp.http.X-Cache = obj.hits;
-   } else {
-     set resp.http.X-Cache = "MISS";
-   }
-   #if (obj.hash) {
-   #  set resp.http.X-Hash = obj.hash;
-   #} else {
-   #  set resp.http.X-Hash = "No hash";
-   #}
-
-   deliver;
+    if (resp.http.magicmarker) {
+        /* Remove the magic marker */
+        unset resp.http.magicmarker;
+        /* By definition we have a fresh object */
+        set resp.http.age = "0";
+    }
+    if (obj.hits > 0) {
+        set resp.http.X-Cache = obj.hits;
+    } else {
+        set resp.http.X-Cache = "MISS";
+    }
+    return(deliver);
 }

slapos/recipe/generic_varnish/template/varnishlog.in

 #!%(shell_path)s
 
-DAEMON_OPTS="-a %(varnish_ip)s:%(varnishd_server_port)s \
-             -n %(varnish_instance_name)s"
+DAEMON_OPTS="-a -n %(varnish_instance_name)s"
 
 exec %(varnishlog_binary)s ${DAEMON_OPTS} "$@"

slapos/recipe/generic_zope/__init__.py

@@ -93,7 +93,6 @@ class Recipe(GenericBaseRecipe):
 
     # Create zope configuration file
     zope_config = dict(
-        products=self.options['products'],
         thread_amount=self.options['thread-amount'],
         zodb_root_path=self.options['zodb-path'],
         zodb_cache_size=int(self.options['zodb-cache-size']),
@@ -112,14 +111,7 @@ class Recipe(GenericBaseRecipe):
     zope_config['z2_log'] = self.options['z2-log']
     zope_config['pid-filename'] = self.options['pid-file']
     zope_config['lock-filename'] = self.options['lock-file']
-    prefixed_products = []
-    for product in reversed(zope_config['products'].split()):
-      product = product.strip()
-      if product:
-        prefixed_products.append('products %s' % product)
-    prefixed_products.insert(0, 'products %s' % self.options[
-      'instance-products'])
-    zope_config['products'] = '\n'.join(prefixed_products)
+    zope_config['products'] = 'products %s' % self.options['instance-products']
     zope_config['address'] = '%s:%s' % (self.options['ip'], self.options['port'])
     zope_config.update(dump_url=self.options['deadlock-path'],
       secret=self.options['deadlock-password'])

slapos/recipe/generic_zope_zeo_client/__init__.py

@@ -43,7 +43,6 @@ def Zope2InitUser(path, username, password):
 class Recipe(GenericBaseRecipe):
   def _options(self, options):
     options['password'] = self.generatePassword()
-    options['deadlock-password'] = self.generatePassword()
 
   def install(self):
     """
@@ -91,25 +90,6 @@ class Recipe(GenericBaseRecipe):
         # Always provide a URL-Type
         append("file://" + link)
 
-    # Generate Zeo connections
-    zeo_snippet_template = open(self.getTemplateFilename('zope.zeo.entry.conf.in'
-      )).read()
-    zeo_snippet_list = []
-    for zeo_line in self.options['zeo-connection-string'].splitlines():
-      zeo_line.strip()
-      if not zeo_line:
-        continue
-      d = dict()
-      for param in zeo_line.split():
-        k, v = param.split('=')
-        d[k.strip()] = v.strip()
-      zeo_snippet_list.append(zeo_snippet_template % d)
-    # Create zope configuration file
-    zope_config = dict(
-        products=self.options['products'],
-        thread_amount=self.options['thread-amount'],
-        zodb_configuration='\n'.join(zeo_snippet_list)
-    )
     zope_environment = dict(
       TMP=self.options['tmp-path'],
       TMPDIR=self.options['tmp-path'],
@@ -134,44 +114,7 @@ class Recipe(GenericBaseRecipe):
     # configure default Zope2 zcml
     open(self.options['site-zcml'], 'w').write(open(self.getTemplateFilename(
         'site.zcml')).read())
-    zope_config['instance'] = self.options['instance-path']
-    zope_config['event_log'] = self.options['event-log']
-    zope_config['z2_log'] = self.options['z2-log']
-    zope_config['pid-filename'] = self.options['pid-file']
-    zope_config['lock-filename'] = self.options['lock-file']
-    prefixed_products = []
-    for product in reversed(zope_config['products'].split()):
-      product = product.strip()
-      if product:
-        prefixed_products.append('products %s' % product)
-    prefixed_products.insert(0, 'products %s' % self.options[
-      'instance-products'])
-    zope_config['products'] = '\n'.join(prefixed_products)
-    zope_config['address'] = '%s:%s' % (self.options['ip'], self.options['port'])
-    zope_config.update(dump_url=self.options['deadlock-path'],
-      secret=self.options['deadlock-password'])
-
-    zope_wrapper_template_location = self.getTemplateFilename('zope.conf.in')
-    zope_conf_content = self.substituteTemplate(zope_wrapper_template_location,
-      zope_config)
-    if self.isTrueValue(self.options['timeserver']):
-      zope_conf_content += self.substituteTemplate(self.getTemplateFilename(
-          'zope.conf.timeserver.in'), {})
-    if 'tidstorage-ip' in self.options:
-      zope_conf_content += self.substituteTemplate(self.getTemplateFilename(
-          'zope.conf.tidstorage.in'), {
-            'tidstorage-ip': self.options['tidstorage-ip'],
-            'tidstorage-port': self.options['tidstorage-port'],
-            })
-    if ('promise-path' in self.options) and ('site-id' in self.options):
-      zope_conf_content += self.substituteTemplate(self.getTemplateFilename(
-          'zope.conf.promise.in'), {
-            'site-id': self.options['site-id'],
-            'promise-path': self.options['promise-path'],
-            })
 
-    zope_conf_path = self.createFile(self.options['configuration-file'], zope_conf_content)
-    path_list.append(zope_conf_path)
     # Create init script
-    path_list.append(self.createPythonScript(self.options['wrapper'], 'slapos.recipe.librecipe.execute.executee', [[self.options['runzope-binary'].strip(), '-C', zope_conf_path], zope_environment]))
+    path_list.append(self.createPythonScript(self.options['wrapper'], 'slapos.recipe.librecipe.execute.executee', [[self.options['runzope-binary'].strip(), '-C', self.options['configuration-file']], zope_environment]))
     return path_list

slapos/recipe/kvm/__init__.py

@@ -25,7 +25,6 @@
 #
 ##############################################################################
 from slapos.recipe.librecipe import GenericBaseRecipe
-import binascii
 import os
 import sys
 
@@ -33,11 +32,6 @@ class Recipe(GenericBaseRecipe):
   """
   kvm instance configuration.
   """
-
-  def __init__(self, buildout, name, options):
-    options['passwd'] = binascii.hexlify(os.urandom(4))
-    return GenericBaseRecipe.__init__(self, buildout, name, options)
-
   def install(self):
     config = dict(
       tap_interface=self.options['tap'],

slapos/recipe/kvm/template/kvm_run.in

@@ -32,7 +32,7 @@ if not os.path.exists(disk_path):
   subprocess.Popen(['%(qemu_img_path)s', 'create' ,'-f', 'qcow2',
       '%(disk_path)s', '%(disk_size)sG'])
 
-kvm_argument_list = ['kvm', '-net', 'nic,macaddr=%(mac_address)s',
+kvm_argument_list = ['%(qemu_path)s', '-enable-kvm', '-net', 'nic,macaddr=%(mac_address)s',
   '-net', 'tap,ifname=%(tap_interface)s,script=no,downscript=no',
   '-smp', '%(smp_count)s',
   '-m', '%(ram_size)s',

slapos/recipe/librecipe/__init__.py

@@ -236,6 +236,8 @@ class BaseSlapRecipe:
     return 'insecure'
 
   def install(self):
+    self.logger.warning("BaseSlapRecipe has been deprecated. Use " \
+        "GenericBaseRecipe or GenericSlapRecipe instead.")
     self.slap.initializeConnection(self.server_url, self.key_file,
         self.cert_file)
     self.computer_partition = self.slap.registerComputerPartition(

slapos/recipe/librecipe/generic.py

@@ -36,6 +36,10 @@ import pkg_resources
 import zc.buildout
 
 class GenericBaseRecipe(object):
+  """Boilerplate class for all Buildout recipes providing helpful methods like
+     creating configuration file, creating wrappers, generating passwords, etc.
+     Can be extended in SlapOS recipes to ease development.
+  """
 
   TRUE_VALUES = ['y', 'yes', '1', 'true']
   FALSE_VALUES = ['n', 'no', '0', 'false']
@@ -154,9 +158,6 @@ class GenericBaseRecipe(object):
     * if the host is an ipv6 address, brackets will be added to surround it.
 
     """
-    # XXX-Antoine: I didn't find any standard module to join an url with
-    # login, password, ipv6 host and port.
-    # So instead of copy and past in every recipe I factorized it right here.
     netloc = ''
     if auth is not None:
       auth = tuple(auth)

slapos/recipe/librecipe/genericslap.py

@@ -30,7 +30,10 @@ import time
 from generic import GenericBaseRecipe
 
 class GenericSlapRecipe(GenericBaseRecipe):
-  """Base class for all slap.recipe.*"""
+  """Base class for all slap.recipe.* needing SLAP informations like instance
+     parameters.
+     recipes that don't explicitely need to retrieve from server informations
+     should use GenericBaseRecipe."""
 
   def __init__(self, buildout, name, options):
     """Default initialisation"""

slapos/recipe/mysql/__init__.py

@@ -58,7 +58,7 @@ class Recipe(GenericBaseRecipe):
     post_rotate = self.createPythonScript(
       self.options['logrotate-post'],
       'slapos.recipe.librecipe.execute.execute',
-      [mysql_binary, '--no-defaults', '-B', '--socket=%s' % socket, '-e',
+      [mysql_binary, '--no-defaults', '-B', '-u', 'root', '--socket=%s' % socket, '-e',
        'FLUSH LOGS']
     )
     path_list.append(post_rotate)

slapos/recipe/generic_onetimeupload/__init__.py → slapos/recipe/onetimeupload/__init__.py

@@ -33,11 +33,6 @@ class Recipe(GenericBaseRecipe):
   """
   kvm instance configuration.
   """
-
-  def __init__(self, buildout, name, options):
-    options['key'] = binascii.hexlify(os.urandom(24))
-    return GenericBaseRecipe.__init__(self, buildout, name, options)
-
   def install(self):
     config = dict(
       ip=self.options['ip'],

slapos/recipe/request.py

@@ -29,37 +29,85 @@ import logging
 from slapos import slap as slapmodule
 
 class Recipe(object):
+  """
+  Request a partition to a slap master.
+  Can provide parameters to that partition and fetches its connection
+  parameters.
+
+  Input:
+    server-url
+    key-file (optional)
+    cert-file (optional)
+      Used to contact slap master.
+
+    computer-id
+    partition-id
+      Current partition's identifiers.
+      Must match key's credentials if given.
+
+    name (optional, defaults to section name)
+      Name (reference) of requested partition.
+
+    software-url
+      URL of a software definition to request an instance of.
+
+    software-type
+      Software type of requested instance, among those provided by the
+      definition from software-url.
+
+    slave (optional, defaults to false)
+      Set to "true" when requesting a slave instance, ie just setting a set of
+      parameters in an existing instance.
+
+    sla (optional)
+      Whitespace-separated list of Service Level Agreement names.
+      Each name must correspond to a "sla-<name>" option.
+      Used to specify what a suitable partition would be.
+      Possible names depend on master's capabilities.
+
+    config (optional)
+      Whitespace-separated list of partition parameter names.
+      Each name must correspond to a "config-<name>" option.
+      Possible names depend on requested partition's software type.
+
+    return (optional)
+      Whitespace-separated list of expected partition-published value names.
+      Options will be created from them, in the form of "connection-<name>"
+      As long as requested partition doesn't publish all those values,
+      installation of request section will fail.
+      Possible names depend on requested partition's software type.
+
+    Output:
+      See "return" input key.
+  """
+  failed = None
 
   def __init__(self, buildout, name, options):
-    self.logger = logging.getLogger(name)
+    logger = logging.getLogger(name)
 
     slap = slapmodule.slap()
 
-    self.software_release_url = options['software-url']
+    software_url = options['software-url']
+    name = options['name']
 
     slap.initializeConnection(options['server-url'],
                               options.get('key-file'),
                               options.get('cert-file'),
                              )
-    computer_partition = slap.registerComputerPartition(
-      options['computer-id'], options['partition-id'])
-    self.request = computer_partition.request
+    request = slap.registerComputerPartition(
+      options['computer-id'], options['partition-id']).request
 
-    self.isSlave = False
-    if 'slave' in options:
-      self.isSlave = options['slave'].lower() in ['y', 'yes', 'true', '1']
+    isSlave = options.get('slave', '').lower() in ['y', 'yes', 'true', '1']
 
-    self.return_parameters = []
+    return_parameters = []
     if 'return' in options:
-      self.return_parameters = [str(parameter).strip()
-                               for parameter in options['return'].split()]
+      return_parameters = [str(parameter).strip()
+        for parameter in options['return'].split()]
     else:
-      self.logger.debug("No parameter to return to main instance."
-                          "Be careful about that...")
+      logger.debug("No parameter to return to main instance."
+        "Be careful about that...")
 
-    software_type = 'RootInstanceSoftware'
-    if 'software-type' in options:
-      software_type = options['software-type']
+    software_type = options.get('software-type', 'RootInstanceSoftware')
 
     filter_kw = {}
     if 'sla' in options:
@@ -72,15 +120,14 @@ class Recipe(object):
         partition_parameter_kw[config_parameter] = \
             options['config-%s' % config_parameter]
 
-    self.instance = self.request(options['software-url'], software_type,
-      options.get('name', name), partition_parameter_kw=partition_parameter_kw,
-      filter_kw=filter_kw, shared=self.isSlave)
+    self.instance = instance = request(software_url, software_type,
+      name, partition_parameter_kw=partition_parameter_kw,
+      filter_kw=filter_kw, shared=isSlave)
 
-    self.failed = None
-    for param in self.return_parameters:
+    for param in return_parameters:
       try:
         options['connection-%s' % param] = str(
-            self.instance.getConnectionParameter(param))
+          instance.getConnectionParameter(param))
       except slapmodule.NotFoundError:
         options['connection-%s' % param] = ''
         if self.failed is None:
@@ -92,12 +139,14 @@ class Recipe(object):
       try:
         status = self.instance.getState()
       except slapmodule.NotFoundError:
-        status = "not ready yet, please try again"
-      # XXX-Cedric : currently raise an error. So swallow it...
+        status = 'not ready yet, please try again'
       except AttributeError:
-        status = "unknown"
-      raise KeyError("Connection parameter %s not found. "
-          "Status of requested instance is : %s." % (self.failed, status))
+        status = 'unknown'
+      error_message = 'Connection parameter %s not found. '\
+          'Requested instance is currently %s. If this error persists, '\
+          'check status of this instance.' % (self.failed, status)
+      self.logger.error(error_message)
+      raise KeyError(error_message)
     return []
 
   update = install

slapos/recipe/seleniumrunner/__init__.py

@@ -29,79 +29,19 @@ import os
 import sys
 import zc.buildout
 from slapos.recipe.librecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import GenericBaseRecipe
 
-class Recipe(BaseSlapRecipe):
-  def _install(self):
-    """Set the connection dictionnary for the computer partition and create a list
-    of paths to the different wrappers."""
-    self.path_list = []
-    self.requirements, self.ws = self.egg.working_set()
+class Recipe(GenericBaseRecipe):
+  def install(self):
 
-    self.installTestrunner(self.getDisplay())
-    self.linkBinary()
+    runner = self.createPythonScript(
+      self.options['runner-path'],
+      __name__+'.testrunner.run',
+      arguments=[self.options['suite-url'], 
+                 self.options['report-url'],
+                 self.options['report-project'],
+                 self.options['browser'],
+                 ])
 
-    return self.path_list
+    return [runner]
 
-  def getDisplay(self):
-    """Generate display id for the instance."""
-    display_list = [":%s" % i for i in range(123,144)]
-    for display_try in display_list:
-      lock_filepath = '/tmp/.X%s-lock' % display_try.replace(":", "")
-      if not os.path.exists(lock_filepath):
-        display = display_try
-        break
-    return display
-
-  def installTestrunner(self, display):
-    """Instanciate a wrapper for the browser and the test reports."""
-    arguments = dict(
-        xvfb_binary    = self.options['xvfb_binary'],
-        display        = display,
-        suite_name     = self.parameter_dict['suite_name'],
-        base_url       = self.parameter_dict['url'],
-        browser_argument_list = [],
-        user           = self.parameter_dict['user'],
-        password       = self.parameter_dict['password'],
-        project       = self.parameter_dict['project'],
-        test_report_instance_url = \
-            self.parameter_dict['test_report_instance_url'],
-        etc_directory  = self.etc_directory)
-
-    # Check wanted browser XXX-Cedric not yet used but can be useful
-    #if self.parameter_dict.get('browser', None) is None:
-    arguments['browser_binary'] = self.options['firefox_binary']
-    #elif self.parameter_dict['browser'].strip().lowercase() == 'chrome' or
-    #    self.parameter_dict['browser'].strip().lowercase() == 'chromium':
-    #  arguments['browser_binary'] = self.options['chromium_binary']
-    #  arguments['browser_argument_list'].extend['--ignore-certificate-errors',
-    #      option_translate = '--disable-translate',
-    #      option_security = '--disable-web-security']
-    #elif self.parameter_dict['browser'].strip().lowercase() == 'firefox':
-    #  arguments['browser_binary'] = self.options['firefox_binary']
-
-    self.path_list.extend(zc.buildout.easy_install.scripts([(
-        'testrunner',__name__+'.testrunner', 'run')], self.ws,
-        sys.executable, self.wrapper_directory,
-        arguments=[arguments]))
-
-  def linkBinary(self):
-    """Links binaries to instance's bin directory for easier exposal"""
-    for linkline in self.options.get('link_binary_list', '').splitlines():
-      if not linkline:
-        continue
-      target = linkline.split()
-      if len(target) == 1:
-        target = target[0]
-        path, linkname = os.path.split(target)
-      else:
-        linkname = target[1]
-        target = target[0]
-      link = os.path.join(self.bin_directory, linkname)
-      if os.path.lexists(link):
-        if not os.path.islink(link):
-          raise zc.buildout.UserError(
-            'Target link already %r exists but it is not link' % link)
-        os.unlink(link)
-      os.symlink(target, link)
-      self.logger.debug('Created link %r -> %r' % (link, target))
-      self.path_list.append(link)

slapos/recipe/seleniumrunner/testrunner.py

@@ -27,14 +27,30 @@
 
 from datetime import datetime
 from erp5functionaltestreporthandler import ERP5TestReportHandler
-from ERP5TypeFunctionalTestCase import Xvfb, Firefox, TimeoutError
+from ERP5TypeFunctionalTestCase import TimeoutError
 from time import sleep
 import time
 import os
 import urllib2
+import urlparse
+from subprocess import Popen, PIPE
+import signal
 
 def run(args):
-  config = args[0]
+  suite_url = args[0]
+  report_url = args[1]
+  project = args[2]
+  browser_binary = args[3]
+
+  suite_parsed = urlparse.urlparse(suite_url)
+
+  config = {
+    'suite_name': suite_parsed.path.split('/')[-1],
+    'base_url': "%s://%s%s" % (suite_parsed.scheme, suite_parsed.hostname,
+                               '/'.join(suite_parsed.path.split('/')[:-1])),
+    'user': suite_parsed.username,
+    'password': suite_parsed.password,
+    }
 
   test_url = assembleTestUrl(config['base_url'], config['suite_name'],
       config['user'], config['password'])
@@ -43,20 +59,17 @@ def run(args):
   timeout = 2.0 * 60 * 60
   
   while True:
-    erp5_report = ERP5TestReportHandler(config['test_report_instance_url'],
-        config['project'] + '@' + config['suite_name'])
+    erp5_report = ERP5TestReportHandler(report_url,
+        project + '@' + config['suite_name'])
     try:
-      os.environ['DISPLAY'] = config['display']
-      xvfb = Xvfb(config['etc_directory'], config['xvfb_binary'])
-      profile_dir = os.path.join(config['etc_directory'], 'profile')
-      # XXX-Cedric : change Firefox prefs.js generation so that it can take a
-      #              list of websites supposed to be reached instead of config['base_url']
-      browser = Firefox(profile_dir, config['base_url'], config['browser_binary'])
       try:
         start = time.time()
-        xvfb.run()
-        profile_dir = os.path.join(config['etc_directory'], 'profile')
-        browser.run(test_url , xvfb.display)
+        print("Running test on: %s" % test_url)
+        process = Popen('%s "%s"' % (browser_binary, test_url),
+                        stdout=PIPE,
+                        stderr=PIPE,
+                        shell=True,
+                        close_fds=True)
         erp5_report.reportStart()
         while not isTestFinished(config['base_url']):
           time.sleep(10)
@@ -66,8 +79,8 @@ def run(args):
       except TimeoutError:
         continue
       finally:
-        browser.quit()
-        xvfb.quit()
+        if process.pid:
+          os.kill(process.pid, signal.SIGTERM)
       print("Test has finished and Firefox has been killed.")
       
       erp5_report.reportFinished(getStatus(config['base_url']).encode("utf-8",
@@ -135,4 +148,4 @@ def assembleTestUrl(base_url, suite_name, user, password):
       test_url = "%s/%s/core/TestRunner.html?test=../test_suite_html&"\
           "resultsUrl=%s/postResults&auto=on&__ac_name=%s&__ac_password=%s" % (
           base_url, suite_name, base_url, user, password)
-      return test_url
+      return test_url
\ No newline at end of file

slapos/recipe/signal_wrapper.py

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

slapos/recipe/slapparameters.py → slapos/recipe/slapconfiguration.py

@@ -25,13 +25,8 @@
 #
 ##############################################################################
 import slapos.slap
-import json
 from ConfigParser import RawConfigParser
-
-cast_dict = {
-    'json': (True, json.dumps),
-    'str': (False, str),
-}
+from netaddr import valid_ipv4, valid_ipv6
 
 class Recipe(object):
   """
@@ -39,6 +34,8 @@ class Recipe(object):
   buildout section in various ways, and in various encodings.
   Populates the buildout section it is used in with all slap partition
   parameters.
+  Also provides access to partition properties: all IPv4, IPv6 and tap
+  interfaces it is allowed to use.
 
   Input:
     url
@@ -59,56 +56,65 @@ class Recipe(object):
       Partition identifier.
       Example:
         ${slap-connection:partition-id}
-    unsafe (optional, 0 by default)
-      Enables formats which are unsafe when represented back into a buildout
-      text file. Set to 0 to explicitly disable unsafe formats, any other
-      integer value to enable them.
 
   Output:
-    One key per supported serialisation format, with all partition parameters
-    serialised in that format as values and format's name.
-    Also, one key per partition parameter, prefixed with serialisation format
-    followed by a dot. Example:
-      json = {"foo": "bar"}
-      json.foo = "bar"
-
-  Supported serailisation formats:
-    json (safe)
-      JavaScript Object Notation
-    str (unsafe)
-      Python string representation.
+    slap-software-type
+      Current partition's software type.
+    ipv4
+      Set of IPv4 addresses.
+    ipv6
+      Set of IPv6 addresses.
+    tap
+      Set of TAP interfaces.
+    configuration
+      Dict of all parameters.
+    configuration.<key>
+      One key per partition parameter.
+      Partition parameter whose name cannot be represented unambiguously in
+      buildout syntax are ignored. They cannot be accessed from buildout syntax
+      anyway, and are available through "configuration" output key.
   """
 
   # XXX: used to detect if a configuration key is a valid section key. This
   # assumes buildout uses ConfigParser - which is currently the case.
-  OPTCRE = RawConfigParser.OPTCRE
+  OPTCRE_match = RawConfigParser.OPTCRE.match
 
   def __init__(self, buildout, name, options):
       slap = slapos.slap.slap()
       slap.initializeConnection(
-        options['url'],
-        options.get('key'),
-        options.get('cert'),
+          options['url'],
+          options.get('key'),
+          options.get('cert'),
       )
       parameter_dict = slap.registerComputerPartition(
-        options['computer'],
-        options['partition'],
+          options['computer'],
+          options['partition'],
       ).getInstanceParameterDict()
-      allow_unsafe = bool(int(options.get('unsafe', '0')))
-      match = self.OPTCRE.match
-      for name, (safe, cast) in cast_dict.iteritems():
-          if not safe and not allow_unsafe:
+      # XXX: those are not partition parameters, strictly speaking.
+      # Discard them, and make them available as separate section keys.
+      options['slap-software-type'] = parameter_dict.pop(
+          'slap_software_type')
+      ipv4_set = set()
+      v4_add = ipv4_set.add
+      ipv6_set = set()
+      v6_add = ipv6_set.add
+      tap_set = set()
+      tap_add = tap_set.add
+      for tap, ip in parameter_dict.pop('ip_list'):
+          tap_add(tap)
+          if valid_ipv4(ip):
+              v4_add(ip)
+          elif valid_ipv6(ip):
+              v6_add(ip)
+          # XXX: emit warning on unknown address type ?
+      options['ipv4'] = ipv4_set
+      options['ipv6'] = ipv6_set
+      options['tap'] = tap_set
+      options['configuration'] = parameter_dict
+      match = self.OPTCRE_match
+      for key, value in parameter_dict.iteritems():
+          if match(key) is not None:
               continue
-          options[name] = cast(parameter_dict)
-          for key, value in parameter_dict.iteritems():
-              if match(key) is not None:
-                  # It should be OK to skip silently and unconditionally: such
-                  # parameter cannot be accessed in a well-formed buildout
-                  # config.
-                  continue
-              options[name + '.' + key] = cast(value)
-
-  def install(self):
-      return []
+          options['configuration.' + key] = value
 
-  update = install
+  install = update = lambda self: []

slapos/recipe/slapmonitor/__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
+
+class Recipe(GenericBaseRecipe):
+  """
+  Slapmonitor instance configuration.
+  """
+
+  def __init__(self, buildout, name, options):
+    return GenericBaseRecipe.__init__(self, buildout, name, options)
+
+  def install(self):
+    config = dict(
+      pid_file_path=self.options['pid-file'],
+      database_path=self.options['database-path'],
+      slapmonitor_path = self.options['slapmonitor-path'],
+      shell_path=self.options['shell-path'],
+    )
+
+    # Runners
+    runner_path = self.createExecutable(
+      self.options['path'],
+      self.substituteTemplate(self.getTemplateFilename('slapmonitor_run.in'),
+                              config))
+
+    return [runner_path]
+
+  def update(self):
+    pass

slapos/recipe/slapmonitor/template/slapmonitor_run.in

+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+#
+exec %(slapmonitor_path)s %(pid_file_path)s %(database_path)s
+

slapos/recipe/slapreport/__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
+
+class Recipe(GenericBaseRecipe):
+  """
+  Slapmonitor instance configuration.
+  """
+
+  def __init__(self, buildout, name, options):
+    return GenericBaseRecipe.__init__(self, buildout, name, options)
+
+  def install(self):
+    config = dict(
+      pid_file_path=self.options['pid-file'],
+      consumption_log_path=self.options['consumption-log-path'],
+      database_path=self.options['database-path'],
+      slapreport_path = self.options['slapreport-path'],
+      logbox_ip = self.options['logbox-ip'],
+      logbox_port = self.options['logbox-port'],
+      logbox_user = self.options['logbox-user'],
+      logbox_passwd = self.options['logbox-passwd'],
+      shell_path=self.options['shell-path'],
+    )
+
+    # Runners
+    runner_path = self.createExecutable(
+      self.options['path'],
+      self.substituteTemplate(self.getTemplateFilename('slapreport_run.in'),
+                              config))
+
+    return [runner_path]
+
+  def update(self):
+    pass

slapos/recipe/slapreport/template/slapreport_run.in

+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+#
+exec %(slapreport_path)s %(pid_file_path)s %(consumption_log_path)s %(database_path)s %(logbox_ip)s %(logbox_port)s %(logbox_user)s %(logbox_passwd)s