Started a new development cycle (merged erp5 branch)

Conflicts:
	component/imagemagick/buildout.cfg

CHANGES.txt

 Changes
 =======
 
-0.43 (Unreleased)
+0.46 (Unreleased)
 -----------------
 
-  * No change yet
+  * No change yet.
+
+0.45 (2012-03-29)
+-----------------
+
+  * slaprunner: change number of available partitions to 7 [Alain Takoudjou]
+
+0.44 (2012-03-28)
+-----------------
+
+  * minor: apachephp: update apache configuration to work with Apache2.4
+
+0.43 (2012-03-28)
+-----------------
+
+  * minor: erp5: add missing .zcml files into egg. [Cedric de Saint Martin]
 
 0.42 (2012-03-26)
 -----------------

MANIFEST.in

 include CHANGES.txt
-include slapos/recipe/generic_zope/template/site.zcml
 include slapos/recipe/apache_frontend/template/notfound.html
 recursive-include slapos/recipe *.in
 recursive-include slapos/recipe *.bin
 recursive-include slapos/recipe README.*.txt
 recursive-include slapos/recipe *.js
+recursive-include slapos/recipe *.zcml

component/apache-php/buildout.cfg

@@ -3,6 +3,7 @@ parts = apache-php
 
 extends =
   ../apache/buildout.cfg
+  ../bzip2/buildout.cfg
   ../cclient/buildout.cfg
   ../curl/buildout.cfg
   ../freetype/buildout.cfg
@@ -19,13 +20,16 @@ extends =
 [apache-php]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = hexagonit.recipe.cmmi
+depends =
+  ${mariadb:version}
 url = http://fr2.php.net/distributions/php-5.3.10.tar.gz
-md5sum = 816259e5ca7d0a7e943e56a3bb32b17f
+md5sum = 2b3d2d0ff22175685978fb6a5cbcdc13
 configure-options =
   --with-apxs2=${apache:location}/bin/apxs
   --with-libxml-dir=${libxml2:location}
   --with-mysql=${mariadb:location}
   --with-zlib-dir=${zlib:location}
+  --with-bz2-dir=${bzip2:location}
   --with-mcrypt=${libmcrypt:location}
   --with-gd
   --with-jpeg-dir=${libjpeg:location}
@@ -48,12 +52,13 @@ configure-options =
   --enable-session
   --enable-exif
   --enable-zip
+  --enable-bz2
   --enable-ftp
 
 environment =
   PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
-  PATH=${pkgconfig:location}/bin:${libxml2:location}/bin:%(PATH)s
-  LDFLAGS =-L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid
+  PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
+  LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid
 
 
 [libmcrypt]

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

component/busybox/buildout.cfg

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

component/busybox/busybox-1.19.3.packed_hack.patch

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

component/cloud9/buildout.cfg

@@ -26,7 +26,7 @@ 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=/opt/slapgrid/c86b6d036d0004572b96e10de1a1b5e8/parts/nodejs-0.4/bin:$PATH LDFLAGS=-L${libxml2:location}/lib ${:npm-binary} install) || (rm -fr ${:location}; exit 1)
+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)
 update-command =
 
 [cloud9-npm]

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.6.tar.gz
-md5sum = 2147da452fd9212bb9b4542a9eee9d5b
+url = http://www.cmake.org/files/v2.8/cmake-2.8.7.tar.gz
+md5sum = e1b237aeaed880f65dec9c20602452f6

component/fontconfig/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 
 [fontconfig]
 recipe = hexagonit.recipe.cmmi
-url = http://fontconfig.org/release/fontconfig-2.8.0.tar.gz
-md5sum = 77e15a92006ddc2adbb06f840d591c0e
+url = http://fontconfig.org/release/fontconfig-2.9.0.tar.gz
+md5sum = 26c83855ed256b5c032baae032fadc4f
 # XXX-Cedric : should we use --with-add-fonts={somefont:location}/share,{someotherfont:location}/share?
 configure-options =
   --disable-static

component/git/buildout.cfg

@@ -13,8 +13,8 @@ parts =
 
 [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.tar.gz
+md5sum = ab2716db51580037c7ebda4c8e9d56eb
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/groonga/buildout.cfg

@@ -7,8 +7,8 @@ parts =
 
 [groonga]
 recipe = hexagonit.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-2.0.0.tar.gz
-md5sum = 09e6a34db15cf42b6a3aff07e0f841ff
+url = http://packages.groonga.org/source/groonga/groonga-2.0.1.tar.gz
+md5sum = 806daed3e0e5bb12d591dcf326e4ccd5
 configure-options =
   --disable-static
   --disable-glibtest

component/haproxy/buildout.cfg

+# HAProxy - The Reliable, High Performance TCP/HTTP Load Balancer
+# http://haproxy.1wt.eu/
+
 [buildout]
+extends =
+  ../pcre/buildout.cfg
+
 parts = haproxy
 
 [haproxy]
 recipe = hexagonit.recipe.cmmi
-url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.19.tar.gz
-md5sum = 41392d738460dbf99295fd928031c6a4
+url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.20.tar.gz
+md5sum = 0cd3b91812ff31ae09ec4ace6355e29e
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".
@@ -13,3 +19,7 @@ make-options =
   TARGET="$(uname -sr 2>/dev/null|grep -Eq '^Linux (2\.6|3)' && echo linux26 || echo generic)"
   ARCH="$(uname -m 2>/dev/null|grep -E '^(x86_64|i[3456]86)$')"
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+  USE_PCRE=1
+  ADDLIB=-Wl,-rpath=${pcre:location}/lib
+environment =
+  PATH=${pcre:location}/bin:%(PATH)s

component/imagemagick/buildout.cfg

@@ -27,8 +27,8 @@ filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
 
 [imagemagick]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.6-3.tar.bz2
-md5sum = 655ec08e52b7770f8d1e07f1da8fc61e
+url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.6-4.tar.bz2
+md5sum = 7551edb219459fcbc71abb8ce65b8952
 depends =
   ${libtiff:version}
 configure-options =

component/java/buildout.cfg

@@ -29,9 +29,11 @@ slapos_promisee =
   directory:javaws
   file:lib/rt.jar
   file:bin/java
-x86 = http://download.oracle.com/otn-pub/java/jdk/6u30-b12/jre-6u30-linux-i586.bin 3e80243483bc825c34ae01a4373cce5f
-x86-64 = http://download.oracle.com/otn-pub/java/jdk/6u30-b12/jre-6u30-linux-x64.bin a4d28c49251d6b9c2d300b3d61f1ce95
+# http://java.com/en/download/manual.jsp?locale=en
+x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=59621 7466b0b86bef21e3e31ae578b2b9f472
+x86-64 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=59623 c5cfb8393d257b51e7a70e56b7784ac9
 script =
+  import glob
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
   download_file = self.download(self.options['url'], self.options.get('md5sum'))
   extract_dir = tempfile.mkdtemp(self.name)
@@ -43,7 +45,7 @@ script =
   subprocess.call([auto_extract_bin])
   self.cleanup_dir_list.append(extract_dir)
   workdir = guessworkdir(extract_dir)
-  self.copyTree(os.path.join(workdir, "jre1.6.0_30"), "%(location)s")
+  self.copyTree(glob.glob(os.path.join(workdir, "jre1.6.0_*"))[0], "%(location)s")
 
 [java-sdk-1.6.0]
 recipe = slapos.recipe.build

component/libdmtx/buildout.cfg

+# libdmtx - open source software for reading and writing Data Matrix barcodes.
+# http://www.libdmtx.org/
+
+[buildout]
+extends =
+  ../imagemagick/buildout.cfg
+  ../jbigkit/buildout.cfg
+parts =
+  libdmtx
+  dmtx-utils
+
+[libdmtx]
+recipe = hexagonit.recipe.cmmi
+url = http://prdownloads.sourceforge.net/libdmtx/libdmtx-0.7.4.tar.bz2
+md5sum = d3a4c0becd92895eb606dbdb78b023e2
+configure-options =
+  --disable-static
+
+[dmtx-utils]
+recipe = hexagonit.recipe.cmmi
+url = http://prdownloads.sourceforge.net/libdmtx/dmtx-utils-0.7.4.tar.bz2
+md5sum = b132ab9fb1d289869469b8bb4959a08a
+configure-options =
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${imagemagick:location}/lib/pkgconfig:${libdmtx:location}/lib/pkgconfig
+  CPPFLAGS=-I${libdmtx:location}/include
+  LDFLAGS=-Wl,-rpath=${jbigkit:location}/lib

component/libpng/buildout.cfg

@@ -15,10 +15,10 @@ environment =
 
 [libpng12]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.2.47.tar.bz2
-md5sum = 4389dab9fcd2f9d57ac14701b9115f59
+url = http://download.sourceforge.net/libpng/libpng-1.2.49.tar.bz2
+md5sum = d5106b70b4f8b464a7da66bffe4565fb
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.9.tar.bz2
-md5sum = 684ba5f05da436a99c6303a83c7856d6
+url = http://download.sourceforge.net/libpng/libpng-1.5.10.tar.bz2
+md5sum = f4395eaf426bdd870446c246df307aae

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.2
 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 = 1c22c272fc779da584fbe1380442f71b
+md5sum_x86-64 = 8f1964c54fd4c768dbc6df42c87be528
 
 # where office code can be found?
 officedir = libreoffice3.5

component/mariadb/buildout.cfg

@@ -16,66 +16,6 @@ extends =
 parts =
   mariadb
 
-[mariadb-no_test-patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = d65f61829cfbcd5062f49db2b00bd6fe
-filename = mysql_create_system_tables__no_test.patch
-download-only = true
-
-[mariadb]
-recipe = hexagonit.recipe.cmmi
-version = 5.3.5-ga
-url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
-md5sum = 98ce0441b37c8d681855150495fdc03b
-# compile directory is required to build mysql plugins.
-keep-compile-dir = true
-# configure: how to avoid searching for my.cnf?
-#  - like in mysql part in http://svn.zope.org/zodbshootout/trunk/buildout.cfg?view=markup
-# we use embeded yassl instead of openssl to avoid compilation errors on sphinx search engine.
-configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-  --disable-static
-  --enable-thread-safe-client
-  --enable-local-infile
-  --enable-assembler
-  --with-pic
-  --with-fast-mutexes
-  --with-charset=utf8
-  --with-extra-charsets=complex
-  --with-collation=utf8_unicode_ci
-  --with-big-tables
-  --without-embedded-server
-  --with-plugins=max-no-ndb
-  --with-aria-tmp-tables
-  --without-plugin-oqgraph
-  --without-readline
-  --with-ssl
-  --with-libevent=${libevent:location}
-  --with-zlib-dir=${zlib:location}
-
-patch-options = -p0
-patches =
-  ${mariadb-no_test-patch:location}/${mariadb-no_test-patch:filename}
-environment =
-  CPPFLAGS=-I${ncurses:location}/include -I${readline5:location}/include
-  LDFLAGS=-Wl,-rpath=${libevent:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline5:location}/lib -Wl,-rpath=${readline5:location}/lib -Wl,-rpath=${zlib:location}/lib
-
-[mroonga-mariadb]
-recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-2.00.tar.gz
-md5sum = 49dab92863b5c3fa1d49344c73357ca2
-configure-options =
-  --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
-  --with-mysql-config=${mariadb:location}/bin/mysql_config
-depends =
-  ${mariadb:version}
-environment =
-  PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  CPPFLAGS=-I${groonga:location}/include/groonga
-  LDFLAGS=-L${groonga:location}/lib
-  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
-
 [mariadb-5.5-no_test-patch]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
@@ -83,11 +23,12 @@ md5sum = 14e6d713c16298a10f40d29f2b799aca
 filename = mariadb_5.5_create_system_tables__no_test.patch
 download-only = true
 
-[mariadb-5.5]
+[mariadb]
 recipe = hexagonit.recipe.cmmi
-version = 5.5.20
+version = 5.5.23
+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 = e618343b5039fa468c0e1e6098785e3c
+md5sum = 7074fa091b3c1489f45a5ddf12cd5e6f
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0
@@ -107,8 +48,8 @@ configure-options =
   -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
 environment =
   CMAKE_PROGRAM_PATH=${cmake:location}/bin
@@ -116,17 +57,30 @@ environment =
   CMAKE_LIBRARY_PATH=${libaio:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
   LDFLAGS=-L${libaio:location}/lib
 
-[mroonga-mariadb-5.5]
+[mroonga-2.01-mariadb-5.5.23.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 1ddf09d7abcb58e0a7c358f88e23415a
+filename = ${:_buildout_section_name_}
+download-only = true
+
+[mroonga-mariadb]
 recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-2.00.tar.gz
-md5sum = 49dab92863b5c3fa1d49344c73357ca2
+url = https://github.com/downloads/mroonga/mroonga/mroonga-2.01.tar.gz
+md5sum = e1c4ba8ac50aa3750b9acde147eeec4b
 configure-options =
-  --with-mysql-source=${mariadb-5.5:location}__compile__/mariadb-${mariadb-5.5:version}
-  --with-mysql-config=${mariadb-5.5:location}/bin/mysql_config
+  --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
+  --with-mysql-config=${mariadb:location}/bin/mysql_config
+patch-options = -p0
+patches =
+  ${mroonga-2.01-mariadb-5.5.23.patch:location}/${mroonga-2.01-mariadb-5.5.23.patch:filename}
 depends =
-  ${mariadb-5.5:version}
+  ${mariadb:version}
+  ${mariadb:revision}
 environment =
   PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga
   LDFLAGS=-L${groonga:location}/lib
   PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
+  CXXFLAGS=-Wno-deprecated
+# CXXFLAGS workaround: avoid depracation warning in order to compile on gcc 4.7+

component/mariadb/mariadb_5.5_create_system_tables__no_test.patch

+# 33_scripts__mysql_create_system_tables__no_test.dpatch by  <ch@debian.org>
+
+A user with no password prevents a normal user from login under certain
+circumstances as it is checked first.
+See http://bugs.debian.org/301741
+and http://bugs.mysql.com/bug.php?id=6901
+
+--- scripts/mysql_system_tables_data.sql	2008-12-04 22:59:44.000000000 +0100
++++ scripts/mysql_system_tables_data.sql	2008-12-04 23:00:07.000000000 +0100
+@@ -27,8 +27,6 @@
+ -- Fill "db" table with default grants for anyone to
+ -- access database 'test' and 'test_%' if "db" table didn't exist
+ CREATE TEMPORARY TABLE tmp_db LIKE db;
+-INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
+-INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
+ INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
+ DROP TABLE tmp_db;
+ 
+@@ -41,8 +39,6 @@
+ REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','' FROM dual WHERE LOWER( @current_hostname) != 'localhost';
+ REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
+ REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
+-INSERT INTO tmp_user (host,user) VALUES ('localhost','');
+-INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost';
+ INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
+ DROP TABLE tmp_user;
+ 

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/mydumper/buildout.cfg

@@ -13,6 +13,8 @@ parts = mydumper
 # mydumper that works
 [mydumper]
 recipe = slapos.recipe.build
+depends =
+  ${mariadb:version}
 url = http://launchpad.net/mydumper/0.2/0.2.3/+download/mydumper-0.2.3.tar.gz
 md5sum = 36e6a1c97a9634a6882ddaac5e2697d5
 buildout-bin-dir = ${buildout:bin-directory}
@@ -21,9 +23,9 @@ mysql-config = ${mariadb:location}/bin/mysql_config
 doc-dependency = ${mydumper-doc:eggs}
 mysqllib = ${mariadb:location}/lib
 pkg-config-path = ${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/
-libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/mysql/
-includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include/mysql/
-cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include/mysql/
+libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/
+includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include/mysql
+cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include/mysql
 mydumper-patches =
    ${:_profile_base_location_}/mydumper-remove-warnings-errors.patch 917fea16b5ddea195cfa33fbd9827f57 -p1
 slapos_promise =

component/mysql-python/buildout.cfg

@@ -13,8 +13,13 @@ PATH =${mariadb:location}/bin:%(PATH)s
 [mysql-python]
 recipe = zc.recipe.egg:custom
 egg = MySQL-python
+depends =
+  ${mariadb:version}
 environment = mysql-python-env
+library-dirs =
+  ${zlib:location}/lib/
+  ${openssl:location}/lib/
 rpath =
-  ${mariadb:location}/lib/mysql/
+  ${mariadb:location}/lib/
   ${zlib:location}/lib/
   ${openssl:location}/lib/

component/nodejs/buildout.cfg

@@ -46,6 +46,5 @@ commit = 3136abc5c6b3ed332c4700ece24450fada63639b
 origin = https://github.com/isaacs/npm.git
 git-bin = ${git:location}/bin/git
 node-bin = ${nodejs-0.4:location}/bin/node
-command = (GIT_SSL_NO_VERIFY=true ${:git-bin} clone --quiet ${:origin} ${:location} && cd ${:location} && ${:git-bin} reset --hard ${:commit} && ${:location}/configure --prefix=${:location} && GIT_SSL_NO_VERIFY=true ${:git-bin} submodule update --init --recursive && ${:node_bin} cli.js install npm@1.0.106 -g -f) || (rm -fr ${:location}; exit 1)
+command = (GIT_SSL_NO_VERIFY=true ${:git-bin} clone --quiet ${:origin} ${:location} && cd ${:location} && ${:git-bin} reset --hard ${:commit} && ${:location}/configure --prefix=${:location} && GIT_SSL_NO_VERIFY=true ${:git-bin} submodule update --init --recursive && ${:node-bin} cli.js install npm@1.0.106 -g -f) || (rm -fr ${:location}; exit 1)
 update-command =
-

component/perl-DBD-mariadb/buildout.cfg

@@ -10,6 +10,7 @@ parts =
 recipe = hexagonit.recipe.cmmi
 version = 4.019
 depends =
+  ${mariadb:version}
   ${perl:version}
   ${perl-DBI:version}
 url = http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.019.tar.gz
@@ -20,4 +21,4 @@ patch-options = -p1
 configure-command =
   ${perl:location}/bin/perl Makefile.PL --mysql_config=${mariadb:location}/bin/mysql_config
 environment =
-  OTHERLDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib/mysql -Wl,-rpath=${openssl:location}/lib
+  OTHERLDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib -Wl,-rpath=${openssl:location}/lib
\ No newline at end of file

component/pil-python/buildout.cfg

+[buildout]
+extends =
+  ../freetype/buildout.cfg
+  ../libjpeg/buildout.cfg
+  ../zlib/buildout.cfg
+
+parts =
+  pil-python
+
+[pil-python]
+recipe = zc.recipe.egg:custom
+egg = PIL
+include-dirs =
+  ${freetype:location}/include
+  ${libjpeg:location}/include
+  ${zlib:location}/include
+library-dirs =
+  ${freetype:location}/lib
+  ${libjpeg:location}/lib
+  ${zlib:location}/lib
+rpath =
+  ${freetype:location}/lib
+  ${libjpeg:location}/lib
+  ${zlib:location}/lib

component/python-2.6/buildout.cfg

@@ -31,12 +31,12 @@ depends =
 prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
 version = 2.6
 package_version = ${:version}.8
-package_version_suffix = rc1
+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 = df6ccdac7da3b7c7c79124b92110277e
+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}

component/python-2.7/buildout.cfg

@@ -25,8 +25,8 @@ python = python2.7
 [python2.7]
 recipe = hexagonit.recipe.cmmi
 package_version = 2.7.3
-package_version_suffix = rc1
-md5sum = 72aaa940dfa2777de161d7cb27c91df7
+package_version_suffix =
+md5sum = c57477edd6d18bd9eeca2f21add73919
 
 depends =
   ${gdbm:version}

component/rpm2cpio/buildout.cfg

@@ -5,4 +5,4 @@ parts =
 [rpm2cpio]
 recipe = slapos.recipe.build:download
 url = http://ruda.googlecode.com/hg/rpm/rpm2cpio.py
-md5sum = 06001f57616581312f9599e104f2473a
+md5sum = 751c68922e757964543e67a05fcfe11b

component/slapos/buildout.cfg

@@ -120,17 +120,17 @@ Werkzeug = 0.8.3
 buildout-versions = 1.7
 collective.recipe.template = 1.9
 hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3.3
+lxml = 2.3.4
 meld3 = 0.6.8
 netaddr = 0.7.6
-slapos.core = 0.23
+slapos.core = 0.24
 slapos.libnetworkcache = 0.12
 xml-marshaller = 0.9.7
-z3c.recipe.scripts = 1.0.1 
+z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.23
+# slapos.core==0.24
 Flask = 0.8
 
 # Required by:
@@ -138,11 +138,11 @@ Flask = 0.8
 hexagonit.recipe.download = 1.5.0
 
 # Required by:
-# slapos.core==0.23
+# slapos.core==0.24
 netifaces = 0.8
 
 # Required by:
-# slapos.core==0.23
+# slapos.core==0.24
 # 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.23
+# slapos.core==0.24
 supervisor = 3.0a12
 
 # Required by:
-# slapos.core==0.23
+# slapos.core==0.24
 zope.interface = 3.8.0

component/sphinx/buildout.cfg

@@ -18,10 +18,14 @@ filename = sphinx-1.10-beta-snowball.patch
 
 [sphinx]
 recipe = hexagonit.recipe.cmmi
+depends =
+  ${mariadb:version}
 url = http://sphinxsearch.com/files/sphinx-2.0.2-beta.tar.gz
 md5sum = fafe0f1a71d0ded32404c067eba7d0b3
 configure-options =
-  --with-mysql=${mariadb:location}
+  --with-mysql
+  --with-mysql-includes=${mariadb:location}/include/mysql
+  --with-mysql-libs=${mariadb:location}/lib
   --with-libstemmer
   --with-iconv
   --without-pgsql
@@ -30,5 +34,6 @@ patch-options = -p1
 patches =
   ${sphinx-1.10-beta-snowball.patch:location}/${sphinx-1.10-beta-snowball.patch:filename}
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${libexpat:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib/mysql -L${libexpat:location}/lib -Wl,-rpath=${libexpat:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${libexpat:location}/include -fpermissive
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib -L${libexpat:location}/lib -Wl,-rpath=${libexpat:location}/lib
+# Note: -fpermissive added to allow compilation on recent gcc 4.7+

component/sqlite3/buildout.cfg

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

component/tesseract/buildout.cfg

@@ -19,10 +19,22 @@ 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}
+download-only = true
+filename = tesseract-3.00-gcc-4.7-build.patch
+md5sum = ca80db3ec489c547b03f3ee48879c1b1
+
 [tesseract]
 recipe = hexagonit.recipe.cmmi
 url = http://tesseract-ocr.googlecode.com/files/tesseract-3.00.tar.gz
 md5sum = cc812a261088ea0c3d2da735be35d09f
+patch-options =
+  -p1
+patches =
+  ${tesseract-gcc-4.7-build-patch:location}/${tesseract-gcc-4.7-build-patch:filename}
 depends =
   ${libtiff:version}
 configure-options =

component/tesseract/tesseract-3.00-gcc-4.7-build.patch

+--- tesseract-3.00/viewer/svutil.cpp.old	2012-04-11 09:34:26.168608940 +0200
++++ tesseract-3.00/viewer/svutil.cpp	2012-04-11 09:34:46.108565692 +0200
+@@ -21,6 +21,7 @@
+ // thread/process creation & synchronization and network connection.
+ 
+ #include <stdio.h>
++#include <unistd.h>
+ #ifdef WIN32
+ #include <windows.h>
+ #include <winsock.h>

component/varnish/buildout.cfg

@@ -5,7 +5,7 @@
 parts =
   varnish
   varnish-2.1
-
+  varnish-3.0
 extends =
   ../ncurses/buildout.cfg
   ../pcre/buildout.cfg
@@ -35,3 +35,8 @@ environment =
   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

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.43-dev'
+version = '0.46-dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
@@ -93,6 +93,7 @@ setup(name=name,
           'publish = slapos.recipe.publish:Recipe',
           'publishurl = slapos.recipe.publishurl:Recipe',
           'pwgen = slapos.recipe.pwgen:Recipe',
+          'pwgen.stable = slapos.recipe.pwgen:StablePasswordGeneratorRecipe',
           'proactive = slapos.recipe.proactive:Recipe',
           'request = slapos.recipe.request:Recipe',
           'seleniumrunner = slapos.recipe.seleniumrunner:Recipe',
@@ -118,8 +119,6 @@ setup(name=name,
           'zabbixagent = slapos.recipe.zabbixagent:Recipe',
           'generic.zope = slapos.recipe.generic_zope:Recipe',
           'generic.zope.zeo.client = slapos.recipe.generic_zope_zeo_client:Recipe',
-          'generate.erp5.tidstorage = slapos.recipe.generate_erp5_tidstorage:Recipe',
-          'generate.cloudooo = slapos.recipe.generate_cloudooo:Recipe',
           'zeo = slapos.recipe.zeo:Recipe',
           'tidstorage = slapos.recipe.tidstorage:Recipe',
           'erp5.bootstrap = slapos.recipe.erp5_bootstrap:Recipe',
@@ -128,6 +127,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',
         ],
         'slapos.recipe.nosqltestbed.plugin': [
           'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',

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.
+
+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/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/template/apache.in

@@ -3,7 +3,6 @@
 
 # Basic server configuration
 PidFile "%(pid_file)s"
-LockFile "%(lock_file)s"
 Listen %(ip)s:%(port)s
 PHPINIDir %(php_ini_dir)s
 ServerAdmin someone@email
@@ -25,20 +24,21 @@ CustomLog "%(access_log)s" common
 <Directory />
     Options FollowSymLinks
     AllowOverride None
-    Order deny,allow
-    Deny from all
+    Require all denied
 </Directory>
 
 <Directory %(document_root)s>
   Options FollowSymLinks
   AllowOverride All
-  Order allow,deny
-  Allow from all
+  Require all granted
 </Directory>
 DocumentRoot %(document_root)s
 DirectoryIndex index.html index.php
 
 # List of modules
+LoadModule unixd_module modules/mod_unixd.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule authz_core_module modules/mod_authz_core.so
 LoadModule authz_host_module modules/mod_authz_host.so
 LoadModule log_config_module modules/mod_log_config.so
 LoadModule setenvif_module modules/mod_setenvif.so

slapos/recipe/generic_mysql/__init__.py

@@ -31,8 +31,10 @@ class Recipe(GenericBaseRecipe):
 
   def _options(self, options):
     options['password'] = self.generatePassword()
-    options['test-password'] = self.generatePassword()
-    for x in xrange(0, int(options['parallel-test-database-amount'])):
+    if 'test-database' in options:
+      options['test-password'] = self.generatePassword()
+    options.setdefault('parallel-test-database-amount', '0')
+    for x in xrange(int(options['parallel-test-database-amount'])):
       options['test-password-%s' % x] = self.generatePassword()
 
   def install(self):
@@ -40,28 +42,27 @@ class Recipe(GenericBaseRecipe):
 
     template_filename = self.getTemplateFilename('my.cnf.in')
 
-    mysql_conf = dict(
-        ip=self.options['ip'],
-        data_directory=self.options['data-directory'],
-        tcp_port=self.options['port'],
-        pid_file=self.options['pid-file'],
-        socket=self.options['socket'],
-        error_log=self.options['error-log'],
-        slow_query_log=self.options['slow-query-log'],
-        mysql_database=self.options['database'],
-        mysql_user=self.options['user'],
-        mysql_password=self.options['password'],
-        mysql_test_database=self.options['test-database'],
-        mysql_test_user=self.options['test-user'],
-        mysql_test_password=self.options['test-password'],
-    )
-
     mysql_binary = self.options['mysql-binary']
-    socket = self.options['socket'],
+    socket = self.options['socket']
+
+    if 'ip' in self.options:
+      networking = 'port = %s\nbind-address = %s' % (
+        self.options['port'],
+        self.options['ip'],
+      )
+    else:
+      networking = 'skip-networking'
 
     mysql_conf_file = self.createFile(
       self.options['conf-file'],
-      self.substituteTemplate(template_filename, mysql_conf)
+      self.substituteTemplate(template_filename, {
+        'networking': networking,
+        'data_directory': self.options['data-directory'],
+        'pid_file': self.options['pid-file'],
+        'socket': self.options['socket'],
+        'error_log': self.options['error-log'],
+        'slow_query_log': self.options['slow-query-log'],
+      })
     )
     path_list.append(mysql_conf_file)
 
@@ -77,22 +78,23 @@ class Recipe(GenericBaseRecipe):
     mysql_script_list.append(self.substituteTemplate(
       self.getTemplateFilename('initmysql.sql.in'),
       {
-        'mysql_database': mysql_conf['mysql_database'],
-        'mysql_user': mysql_conf['mysql_user'],
-        'mysql_password': mysql_conf['mysql_password']
+        'mysql_database': self.options['database'],
+        'mysql_user': self.options['user'],
+        'mysql_password': self.options['password']
       }
     ))
     # default test database
-    mysql_script_list.append(self.substituteTemplate(
-      self.getTemplateFilename('initmysql.sql.in'),
-      {
-        'mysql_database': mysql_conf['mysql_test_database'],
-        'mysql_user': mysql_conf['mysql_test_user'],
-        'mysql_password': mysql_conf['mysql_test_password']
-      }
-    ))
+    if 'test-database' in self.options:
+      mysql_script_list.append(self.substituteTemplate(
+        self.getTemplateFilename('initmysql.sql.in'),
+        {
+          'mysql_database': self.options['test-database'],
+          'mysql_user': self.options['test-user'],
+          'mysql_password': self.options['test-password']
+        }
+      ))
     # parallel test databases
-    for x in xrange(0, int(self.options['parallel-test-database-amount'])):
+    for x in xrange(int(self.options['parallel-test-database-amount'])):
       mysql_script_list.append(self.substituteTemplate(
         self.getTemplateFilename('initmysql.sql.in'),
         {
@@ -122,31 +124,35 @@ class Recipe(GenericBaseRecipe):
       self.options['wrapper'],
       '%s.mysql.runMysql' % __name__,
       [dict(
+        mysql_base_directory=self.options['mysql-base-directory'],
         mysql_install_binary=self.options['mysql-install-binary'],
         mysqld_binary=mysqld_binary,
-        data_directory=mysql_conf['data_directory'],
+        data_directory=self.options['data-directory'],
         mysql_binary=mysql_binary,
         socket=socket,
         configuration_file=mysql_conf_file,
        )]
     )
     path_list.append(mysqld)
-    # backup configuration
-    full_backup = self.options['full-backup-directory']
-    incremental_backup = self.options['incremental-backup-directory']
-    innobackupex_argument_list = [self.options['perl-binary'],
-        self.options['innobackupex-binary'],
-        '--defaults-file=%s' % mysql_conf_file,
-        '--socket=%s' %mysql_conf['socket'].strip(), '--user=root',
-        '--ibbackup=%s'% self.options['xtrabackup-binary']]
-    environment = dict(PATH='%s' % self.options['bin-directory'])
-    innobackupex_incremental = self.createPythonScript(self.options['innobackupex-incremental'], 'slapos.recipe.librecipe.execute.executee', [innobackupex_argument_list + ['--incremental'], environment])
-    path_list.append(innobackupex_incremental)
-    innobackupex_full = self.createPythonScript(self.options['innobackupex-full'], 'slapos.recipe.librecipe.execute.executee', [innobackupex_argument_list, environment])
-    path_list.append(innobackupex_full)
-    backup_controller = self.createPythonScript(self.options['backup-script'], __name__ + '.innobackupex.controller', [innobackupex_incremental, innobackupex_full, full_backup, incremental_backup])
-    path_list.append(backup_controller)
-    # maatkit installation
+    # TODO: move to a separate recipe (ack'ed by Cedric)
+    if 'backup-script' in self.options:
+      # backup configuration
+      full_backup = self.options['full-backup-directory']
+      incremental_backup = self.options['incremental-backup-directory']
+      innobackupex_argument_list = [self.options['perl-binary'],
+          self.options['innobackupex-binary'],
+          '--defaults-file=%s' % mysql_conf_file,
+          '--socket=%s' % socket.strip(), '--user=root',
+          '--ibbackup=%s'% self.options['xtrabackup-binary']]
+      environment = dict(PATH='%s' % self.options['bin-directory'])
+      innobackupex_incremental = self.createPythonScript(self.options['innobackupex-incremental'], 'slapos.recipe.librecipe.execute.executee', [innobackupex_argument_list + ['--incremental'], environment])
+      path_list.append(innobackupex_incremental)
+      innobackupex_full = self.createPythonScript(self.options['innobackupex-full'], 'slapos.recipe.librecipe.execute.executee', [innobackupex_argument_list, environment])
+      path_list.append(innobackupex_full)
+      backup_controller = self.createPythonScript(self.options['backup-script'], __name__ + '.innobackupex.controller', [innobackupex_incremental, innobackupex_full, full_backup, incremental_backup])
+      path_list.append(backup_controller)
+    # TODO: move to a separate recipe (ack'ed by Cedric)
+    # percona toolkit (formerly known as maatkit) installation
     for pt_script_name in (
         'pt-archiver',
         'pt-config-diff',
@@ -174,10 +180,13 @@ class Recipe(GenericBaseRecipe):
         'pt-variable-advisor',
         'pt-visual-explain',
         ):
+      option_name = pt_script_name + '-binary'
+      if option_name not in self.options:
+        continue
       pt_argument_list = [self.options['perl-binary'],
-          self.options['%s-binary' % pt_script_name],
+          self.options[option_name],
           '--defaults-file=%s' % mysql_conf_file,
-          '--socket=%s' %mysql_conf['socket'].strip(), '--user=root',
+          '--socket=%s' % socket.strip(), '--user=root',
           ]
       pt_exe = self.createPythonScript(os.path.join(self.options['bin-directory'], pt_script_name), 'slapos.recipe.librecipe.execute.executee', [pt_argument_list, environment])
       path_list.append(pt_exe)

slapos/recipe/generic_mysql/mysql.py

@@ -16,8 +16,9 @@ def runMysql(args):
       # XXX: Protect with proper root password
       # XXX: Follow http://dev.mysql.com/doc/refman/5.0/en/default-privileges.html
       popen = subprocess.Popen([conf['mysql_install_binary'],
-        '--skip-name-resolve', '--no-defaults', '--datadir=%s' %
-        conf['data_directory']],
+        '--skip-name-resolve', '--no-defaults',
+        '--datadir=%s' % conf['data_directory'],
+        '--basedir=%s' % conf['mysql_base_directory']],
         stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
       result = popen.communicate()[0]
       if popen.returncode is None or popen.returncode != 0:

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

@@ -8,9 +8,12 @@
 # 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
-port = %(tcp_port)s
-bind-address = %(ip)s
+%(networking)s
 socket = %(socket)s
 datadir = %(data_directory)s
 pid-file = %(pid_file)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,183 @@
 #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;
+        /* Remove Expires from backend, it's not long enough */
+        unset beresp.http.expires;
+        # /* Set the clients TTL on this object */
+        # set beresp.http.cache-control = "max-age = 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/lamp/__init__.py

@@ -33,6 +33,8 @@ import sys
 import zc.recipe.egg
 import urlparse
 
+# Warning : this recipe is deprecated and has been replaced by apachephp.
+
 class BaseRecipe(BaseSlapRecipe):
   def getTemplateFilename(self, template_name):
     return pkg_resources.resource_filename(__name__,

slapos/recipe/librecipe/generic.py

@@ -125,6 +125,15 @@ class GenericBaseRecipe(object):
         'template/%s' % template_name)
 
   def generatePassword(self, len_=32):
+    """
+    The purpose of this method is to generate a password which doesn't change
+    from one execution to the next, so the generated password doesn't change
+    on each slapgrid-cp execution.
+
+    Currently, it returns a hardcoded password because no decision has been
+    taken on where a generated password should be kept (so it is generated
+    once only).
+    """
     # TODO: implement a real password generator which remember the last
     # call.
     return "insecure"

slapos/recipe/pwgen.py

@@ -41,5 +41,18 @@ class Recipe(GenericBaseRecipe):
         password = password_file.read()
     options['password'] = password
 
-  def install(self):
-    return []
+  update = install = lambda self: []
+
+class StablePasswordGeneratorRecipe(GenericBaseRecipe):
+  """
+  The purpose of this class is to generate a password which doesn't change
+  from one execution to the next (hence "stable"), so the generated password
+  doesn't change on each slapgrid-cp execution.
+
+  See GenericBaseRecipe.generatePassword .
+  """
+
+  def _options(self, options):
+    options['password'] = self.generatePassword()
+
+  update = install = lambda self: []

slapos/recipe/generate_cloudooo.py → slapos/recipe/slapparameters.py

 ##############################################################################
 #
-# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+# 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
@@ -24,37 +24,91 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.recipe.librecipe import GenericSlapRecipe
-import os
+import slapos.slap
 import json
-import traceback
-
-
-class Recipe(GenericSlapRecipe):
-  def _options(self, options):
-    self.dirname = os.path.join(self.buildout['buildout']['parts-directory'],
-                                self.name)
-    options['output'] = os.path.join(self.dirname, self.name + '.cfg')
-
-  def _generateRealTemplate(self):
-    # TODO check json against schema
-    json_data = {}
-    if self.parameter_dict.get('cloudooo-json', None):
-      json_data = json.loads(self.parameter_dict['cloudooo-json'])
-    # dymanic fonts
-    font_url_list = json_data.get('font_url_list', [])
-    fontconfig_template = open(self.options['template']).read()
-    fontconfig = open(self.options['snippet-fontconfig']).read()
-    fontconfig_extension = fontconfig % dict(font_url_list=' '.join(font_url_list))
-    with open(self.options['output'], 'w') as f:
-      f.write(fontconfig_template + fontconfig_extension)
-
-  def _install(self):
-    if not os.path.exists(self.dirname):
-      os.mkdir(self.dirname)
-    try:
-      self._generateRealTemplate()
-    except Exception:
-      print 'Ignored issue during template generation:\n%s' % \
-        traceback.format_exc()
-    return [self.dirname]
+from ConfigParser import RawConfigParser
+
+cast_dict = {
+    'json': (True, json.dumps),
+    'str': (False, str),
+}
+
+class Recipe(object):
+  """
+  Retrieves slap partition parameters, and makes them available to other
+  buildout section in various ways, and in various encodings.
+  Populates the buildout section it is used in with all slap partition
+  parameters.
+
+  Input:
+    url
+      Slap server url.
+      Example:
+        ${slap-connection:server-url}
+    key & cert (optional)
+      Path of files containing key and certificate for secure connection to
+      slap server.
+      Example:
+        ${slap-connection:key-file}
+        ${slap-connection:cert-file}
+    computer
+      Computer identifier.
+      Example:
+        ${slap-connection:computer-id}
+    partition
+      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.
+  """
+
+  # 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
+
+  def __init__(self, buildout, name, options):
+      slap = slapos.slap.slap()
+      slap.initializeConnection(
+        options['url'],
+        options.get('key'),
+        options.get('cert'),
+      )
+      parameter_dict = slap.registerComputerPartition(
+        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:
+              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 []
+
+  update = install

slapos/recipe/slaprunner/__init__.py

@@ -40,6 +40,7 @@ class Recipe(BaseSlapRecipe):
     ipv6 = self.getGlobalIPv6Address()
     proxy_port = '50000'
     runner_port = '50000'
+    cloud9_port = '30000'
     workdir = self.createDataDirectory('runner')
     software_root = os.path.join(workdir, 'software')
     instance_root = os.path.join(workdir, 'instance')
@@ -48,7 +49,7 @@ class Recipe(BaseSlapRecipe):
         instance_root=instance_root,
         master_url='http://%s:%s/' % (ipv4, proxy_port),
         computer_id='slaprunner',
-        partition_amount=2,
+        partition_amount=7,
         slapgrid_sr=self.options['slapgrid_sr'],
         slapgrid_cp=self.options['slapgrid_cp'],
         slapproxy=self.options['slapproxy'],
@@ -64,22 +65,33 @@ class Recipe(BaseSlapRecipe):
         proxy_port=proxy_port,
         proxy_database=os.path.join(workdir, 'proxy.db'),
 	git=self.options['git'],
+	cloud9_url='http://[%s]:%s' % (ipv6, cloud9_port),
 	ssh_client=self.options['ssh_client'],
 	public_key=self.options['public_key'],
-	private_key=self.options['private_key']
+	private_key=self.options['private_key'],
+
     )
     config_file = self.createConfigurationFile('slapos.cfg',
         self.substituteTemplate(pkg_resources.resource_filename(__name__,
           'template/slapos.cfg.in'), configuration))
     self.path_list.append(config_file)
-    
+
     environment = dict(
         PATH=os.path.dirname(self.options['git']) + ':' + os.environ['PATH'],
         GIT_SSH=self.options['ssh_client']
     )
+    workdir = os.path.join(workdir, 'project')
+    if not os.path.exists(workdir):
+      os.mkdir(workdir)
     launch_args = [self.options['slaprunner'].strip(), config_file, '--debug']
+    cloud9_args = [self.options['node-bin'].strip(), self.options['cloud9'].strip(),
+                   '-l', ipv6, '-p', cloud9_port, '-w', workdir]
     self.path_list.extend(zc.buildout.easy_install.scripts([('slaprunner',
       'slapos.recipe.librecipe.execute', 'executee')], self.ws, sys.executable,
       self.wrapper_directory, arguments=[launch_args, environment]))
-    self.setConnectionDict(dict(url='http://[%s]:%s' % (ipv6, runner_port)))
+    self.path_list.extend(zc.buildout.easy_install.scripts([('cloud9IDE',
+      'slapos.recipe.librecipe.execute', 'executee')], self.ws, sys.executable,
+      self.wrapper_directory, arguments=[cloud9_args, environment]))
+    self.setConnectionDict(dict(slaprunner_url='http://[%s]:%s' % (ipv6, runner_port),
+                            cloud9_url='http://[%s]:%s' % (ipv6, cloud9_port)))
     return self.path_list

slapos/recipe/slaprunner/template/slapos.cfg.in

@@ -31,3 +31,6 @@ private_key = %(private_key)s
 
 [gitclient]
 git = %(git)s
+
+[cloud9_IDE]
+cloud9 = %(cloud9_url)s
\ No newline at end of file

slapos/recipe/web_checker/__init__.py

@@ -36,13 +36,16 @@ class Recipe(GenericSlapRecipe):
     path_list = []
     web_checker_mail_address = self.parameter_dict['web-checker-mail-address']
     web_checker_smtp_host = self.parameter_dict['web-checker-smtp-host']
+    web_checker_frontend_url = self.parameter_dict.get(
+                                 'web-checker-frontend-url',
+                                 self.options['frontend-url'])
     web_checker_working_directory = \
       self.options['web-checker-working-directory']
     config = dict(
       web_checker_mail_address = web_checker_mail_address,
       web_checker_smtp_host = web_checker_smtp_host,
       web_checker_working_directory = web_checker_working_directory,
-      frontend_url = self.options['frontend-url'],
+      frontend_url = web_checker_frontend_url,
       wget_binary_path = self.options['wget-binary-path'],
       varnishlog_binary_path = self.options['varnishlog-binary-path'],
       web_checker_log = self.options['web-checker-log'],

slapos/recipe/zeo/template/zeo-filestorage-snippet.conf.in

 <filestorage %(storage_name)s>
   path %(path)s
+  # pack-gc false
 </filestorage>
 

software/MediaWiki/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/SilverStripe/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/b2evolution/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/cmsmadesimple/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/coppermine/instance.cfg

@@ -11,7 +11,8 @@ template = ${application-template:location}/${application-template:filename}
 configuration = ${application-configuration:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/dotclear/instance.cfg

@@ -11,7 +11,8 @@ template = ${application-template:location}/${application-template:filename}
 configuration = ${application-configuration:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/dotproject/instance.cfg

@@ -11,7 +11,8 @@ template = ${application-template:location}/${application-template:filename}
 configuration = ${application-configuration:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/drupal/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/eSKUeL/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/erp5/configuration.json

-{
-  "name":"Parameter",
-  "title": "Default parameter schema for ERP5 Software Release.",
-  "type": "object",
-  "additionalProperties": false,
-  "properties": {
-    "flavour" : {
-        "type" : "string",
-        "title" : "Sofware Release Flavour",
-        "optional": true,
-        "default" : "default",
-        "enum" : ["default", "configurator"]
-      },
-
-    "bt5_list": {
-       "type":"array",
-       "title" : "Business Template List",
-       "items" : {"type": "string"},
-       "optional" : true
-      },
-
-    "bt5_repository_list": {
-       "type" : "array",
-       "title" : "Business Template Repository List",
-       "items" : {"type": "string"},
-       "optional" : true
-     }
-  }
-}

software/erp5/instance-cloudoo.cfg.in

+{% if software_type == slapparameter_dict['slap_software_type'] -%}
+{% set json = json_module.loads(parameter_dict.get('cloudooo-json', '{}')) -%}
+{% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
+[buildout]
+parts =
+  publish-cloudooo-connection-information
+  cloudooo-instance
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[publish-cloudooo-connection-information]
+recipe = slapos.cookbook:publishurl
+url = cloudooo://${cloudooo-instance:ip}:${cloudooo-instance:port}/
+
+[cloudooo-instance]
+recipe = slapos.cookbook:generic.cloudooo
+
+# Network options
+ip = ${slap-network-information:local-ipv4}
+port = 23000
+openoffice-port = 23060
+
+# Paths
+configuration-file = ${rootdirectory:etc}/cloudooo.cfg
+wrapper = ${basedirectory:services}/cloudooo
+
+# Paths: Data
+data-directory = ${directory:cloudooo-data}
+
+environment =
+  LD_LIBRARY_PATH = {{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['zlib'] }}/lib
+  FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
+
+# Binary information
+# cloudooo specific configuration
+ooo-binary-path = {{ parameter_dict['libreoffice-bin'] }}/program
+ooo-paster = {{ bin_directory }}/cloudooo_paster
+ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program
+
+[fontconfig-instance]
+recipe = slapos.cookbook:fontconfig
+conf-path = ${rootdirectory:etc}/font.conf
+font-system-folder = {{ parameter_dict['fonts'] }}
+font-folder = ${directory:font}
+url-list = {{ json.get('font_url_list', []) | join(' ') }}
+service-folder = ${basedirectory:services}
+onetimedownload_path = {{ bin_directory }}/onetimedownload
+
+# rest of parts are candidates for some generic stuff
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+services = ${rootdirectory:etc}/run
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+cloudooo-data = ${rootdirectory:srv}/cloudooo
+font = ${rootdirectory:srv}/font
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+srv = ${buildout:directory}/srv
+{% endif %}

software/erp5/instance-cloudooo.cfg

-[buildout]
-parts =
-  publish-cloudooo-connection-information
-  cloudooo-instance
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[publish-cloudooo-connection-information]
-recipe = slapos.cookbook:publishurl
-url = cloudooo://$${cloudooo-instance:ip}:$${cloudooo-instance:port}/
-
-[cloudooo-instance]
-recipe = slapos.cookbook:generic.cloudooo
-
-# Network options
-ip = $${slap-network-information:local-ipv4}
-port = 23000
-openoffice-port = 23060
-
-# Paths
-configuration-file = $${rootdirectory:etc}/cloudooo.cfg
-wrapper = $${basedirectory:services}/cloudooo
-
-# Paths: Data
-data-directory = $${directory:cloudooo-data}
-
-environment =
-  LD_LIBRARY_PATH = ${file:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libICE:location}/lib:${libpng12:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib:${libXext:location}/lib:${libxcb:location}/lib:${libXrender:location}/lib:${zlib:location}/lib
-  FONTCONFIG_FILE = $${fontconfig-instance:conf-path}
-
-# Binary information
-# cloudooo specific configuration
-ooo-binary-path = ${libreoffice-bin:location}/program
-ooo-paster = ${buildout:bin-directory}/cloudooo_paster
-ooo-uno-path = ${libreoffice-bin:location}/basis-link/program
-
-[fontconfig-instance]
-recipe = slapos.cookbook:fontconfig
-conf-path = $${rootdirectory:etc}/font.conf
-font-system-folder = ${fonts:location}
-font-folder = $${directory:font}
-url-list = $${dynamic-fontconfig-instance:url-list}
-service-folder = $${basedirectory:services}
-onetimedownload_path = ${buildout:bin-directory}/onetimedownload
-
-# rest of parts are candidates for some generic stuff
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-cloudooo-data = $${rootdirectory:srv}/cloudooo
-font = $${rootdirectory:srv}/font
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-srv = $${buildout:directory}/srv

software/erp5/instance-erp5-development.cfg → software/erp5/instance-erp5-development.cfg.in

@@ -5,7 +5,7 @@
 #############################
 [buildout]
 
-extends = ${template-zope:output}
+extends = {{ template_zope }}
 parts +=
   request-mariadb
   request-cloudooo
@@ -15,8 +15,8 @@ parts +=
   erp5-update
   test-runner
 
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [slap-parameter]
@@ -26,71 +26,71 @@ cloudooo-json =
 
 [test-runner]
 recipe = slapos.cookbook:erp5.test
-certificate-authority-path = $${test-certificate-authority:ca-dir}
-mysql-url = $${request-mariadb:connection-url}
-kumofs-url = $${request-kumofs:connection-url}
-memcached-url = $${request-memcached:connection-url}
-cloudooo-url = $${request-cloudooo:connection-url}
-test-instance-path = $${directory:unit-test-path}
+certificate-authority-path = ${test-certificate-authority:ca-dir}
+mysql-url = ${request-mariadb:connection-url}
+kumofs-url = ${request-kumofs:connection-url}
+memcached-url = ${request-memcached:connection-url}
+cloudooo-url = ${request-cloudooo:connection-url}
+test-instance-path = ${directory:unit-test-path}
 
-prepend-path = $${buildout:bin-directory}
-run-unit-test = $${buildout:bin-directory}/runUnitTest
-run-test-suite = $${buildout:bin-directory}/runTestSuite
+prepend-path = ${buildout:bin-directory}
+run-unit-test = ${buildout:bin-directory}/runUnitTest
+run-test-suite = ${buildout:bin-directory}/runTestSuite
 
-openssl-binary = $${test-certificate-authority:openssl-binary}
-run-unit-test-binary = ${buildout:bin-directory}/runUnitTest
-run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
+openssl-binary = ${test-certificate-authority:openssl-binary}
+run-unit-test-binary = {{ bin_directory }}/runUnitTest
+run-test-suite-binary = {{ bin_directory }}/runTestSuite
 
 [test-certificate-authority]
 recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
-ca-dir = $${directory:test-ca-dir}
-requests-directory = $${test-cadirectory:requests}
-wrapper = $${basedirectory:services}/test-ca
-ca-private = $${test-cadirectory:private}
-ca-certs = $${test-cadirectory:certs}
-ca-newcerts = $${test-cadirectory:newcerts}
-ca-crl = $${test-cadirectory:crl}
+openssl-binary = {{ openssl_location }}/bin/openssl
+ca-dir = ${directory:test-ca-dir}
+requests-directory = ${test-cadirectory:requests}
+wrapper = ${basedirectory:services}/test-ca
+ca-private = ${test-cadirectory:private}
+ca-certs = ${test-cadirectory:certs}
+ca-newcerts = ${test-cadirectory:newcerts}
+ca-crl = ${test-cadirectory:crl}
 
 [test-cadirectory]
 recipe = slapos.cookbook:mkdirectory
-requests = $${directory:test-ca-dir}/requests
-private = $${directory:test-ca-dir}/private
-certs = $${directory:test-ca-dir}/certs
-newcerts = $${directory:test-ca-dir}/newcerts
-crl = $${directory:test-ca-dir}/crl
+requests = ${directory:test-ca-dir}/requests
+private = ${directory:test-ca-dir}/private
+certs = ${directory:test-ca-dir}/certs
+newcerts = ${directory:test-ca-dir}/newcerts
+crl = ${directory:test-ca-dir}/crl
 
 [erp5-update]
 recipe = slapos.cookbook:erp5.update
 
 # Configuration
-url = http://$${zope-instance:user}:$${zope-instance:password}@$${zope-instance:ip}:$${zope-instance:port}/
-mysql-url = $${request-mariadb:connection-url}
-kumofs-url = $${request-kumofs:connection-url}
-memcached-url = $${request-memcached:connection-url}
-cloudooo-url = $${request-cloudooo:connection-url}
-site-id = $${slap-parameter:site-id}
-openssl-binary = ${openssl:location}/bin/openssl
-cadir-path = $${erp5-certificate-authority:ca-dir}
+url = http://${zope-instance:user}:${zope-instance:password}@${zope-instance:ip}:${zope-instance:port}/
+mysql-url = ${request-mariadb:connection-url}
+kumofs-url = ${request-kumofs:connection-url}
+memcached-url = ${request-memcached:connection-url}
+cloudooo-url = ${request-cloudooo:connection-url}
+site-id = ${slap-parameter:site-id}
+openssl-binary = {{ openssl_location }}/bin/openssl
+cadir-path = ${erp5-certificate-authority:ca-dir}
 
 # Paths
-update-wrapper = $${basedirectory:services}/erp5-update
+update-wrapper = ${basedirectory:services}/erp5-update
 
 # Defaults
 configurator-bt5-list = erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_ung erp5_configurator_run_my_doc
-bt5-repository-list = $${zope-instance:bt5-repository-list}
+bt5-repository-list = ${zope-instance:bt5-repository-list}
 
 [request-common]
 recipe = slapos.cookbook:request
-software-url = $${slap-connection:software-release-url}
+software-url = ${slap-connection:software-release-url}
 sla = computer_guid
-sla-computer_guid = $${slap-connection:computer-id}
+sla-computer_guid = ${slap-connection:computer-id}
 return = url
-server-url = $${slap-connection:server-url}
-key-file = $${slap-connection:key-file}
-cert-file = $${slap-connection:cert-file}
-computer-id = $${slap-connection:computer-id}
-partition-id = $${slap-connection:partition-id}
+server-url = ${slap-connection:server-url}
+key-file = ${slap-connection:key-file}
+cert-file = ${slap-connection:cert-file}
+computer-id = ${slap-connection:computer-id}
+partition-id = ${slap-connection:partition-id}
 
 [request-mariadb]
 <=request-common
@@ -101,7 +101,7 @@ software-type = mariadb
 <=request-common
 name = Cloudooo
 config = cloudooo-json
-config-cloudooo-json = $${slap-parameter:cloudooo-json}
+config-cloudooo-json = ${slap-parameter:cloudooo-json}
 software-type = cloudooo
 
 [request-memcached]
@@ -117,13 +117,13 @@ software-type = kumofs
 # rest of parts are candidates for some generic stuff
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run
+services = ${rootdirectory:etc}/run
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
+etc = ${buildout:directory}/etc
 
 [directory]
-test-ca-dir = $${rootdirectory:srv}/test-ca
-test-instance-path = $${rootdirectory:srv}/test-instance
-unit-test-path = $${:test-instance-path}/unit_test
+test-ca-dir = ${rootdirectory:srv}/test-ca
+test-instance-path = ${rootdirectory:srv}/test-instance
+unit-test-path = ${:test-instance-path}/unit_test

software/erp5/instance-erp5-production.cfg → software/erp5/instance-erp5-production.cfg.in

@@ -14,105 +14,105 @@ parts =
   request-tidstorage
   basedirectory
 
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [request-common]
 recipe = slapos.cookbook:request
-software-url = $${slap-connection:software-release-url}
+software-url = ${slap-connection:software-release-url}
 sla = computer_guid
 return = url
-server-url = $${slap-connection:server-url}
-key-file = $${slap-connection:key-file}
-cert-file = $${slap-connection:cert-file}
-computer-id = $${slap-connection:computer-id}
-partition-id = $${slap-connection:partition-id}
+server-url = ${slap-connection:server-url}
+key-file = ${slap-connection:key-file}
+cert-file = ${slap-connection:cert-file}
+computer-id = ${slap-connection:computer-id}
+partition-id = ${slap-connection:partition-id}
 
 [request-sphinx]
 <=request-common
 name = Sphinx Search Engine
 software-type = sphinx
-sla-computer_guid = $${slap-parameter:sphinx-computer-guid}
+sla-computer_guid = ${slap-parameter:sphinx-computer-guid}
 return = url-sphinx url-sphinx-sql
 
 [request-mariadb]
 <=request-common
 name = MariaDB DataBase
 software-type = mariadb
-sla-computer_guid = $${slap-parameter:mariadb-computer-guid}
+sla-computer_guid = ${slap-parameter:mariadb-computer-guid}
 
 [request-cloudooo]
 <=request-common
 name = Cloudooo
 config = cloudooo-json
-config-cloudooo-json = $${slap-parameter:cloudooo-json}
+config-cloudooo-json = ${slap-parameter:cloudooo-json}
 software-type = cloudooo
-sla-computer_guid = $${slap-parameter:cloudooo-computer-guid}
+sla-computer_guid = ${slap-parameter:cloudooo-computer-guid}
 
 [request-memcached]
 <=request-common
 name = Memcached
 software-type = memcached
-sla-computer_guid = $${slap-parameter:memcached-computer-guid}
+sla-computer_guid = ${slap-parameter:memcached-computer-guid}
 
 [request-kumofs]
 <=request-common
 name = KumoFS
 software-type = kumofs
-sla-computer_guid = $${slap-parameter:kumofs-computer-guid}
+sla-computer_guid = ${slap-parameter:kumofs-computer-guid}
 
 [request-tidstorage]
 <=request-common
 name = TidStorage
 return = url-login
 config = json mysql-url memcached-url cloudooo-url kumofs-url sphinx-url-sphinx sphinx-url-sphinx-sql smtp-url bt5 bt5-repository-url
-config-json = $${slap-parameter:json}
-config-mysql-url = $${request-mariadb:connection-url}
-config-memcached-url = $${request-memcached:connection-url}
-config-cloudooo-url = $${request-cloudooo:connection-url}
-config-kumofs-url = $${request-kumofs:connection-url}
-config-sphinx-url-sphinx = $${request-sphinx:connection-url-sphinx}
-config-sphinx-url-sphinx-sql = $${request-sphinx:connection-url-sphinx-sql}
-config-bt5 = $${slap-parameter:bt5}
-config-bt5-repository-url = $${slap-parameter:bt5-repository-url}
-config-smtp-url = $${slap-parameter:smtp-url}
+config-json = ${slap-parameter:json}
+config-mysql-url = ${request-mariadb:connection-url}
+config-memcached-url = ${request-memcached:connection-url}
+config-cloudooo-url = ${request-cloudooo:connection-url}
+config-kumofs-url = ${request-kumofs:connection-url}
+config-sphinx-url-sphinx = ${request-sphinx:connection-url-sphinx}
+config-sphinx-url-sphinx-sql = ${request-sphinx:connection-url-sphinx-sql}
+config-bt5 = ${slap-parameter:bt5}
+config-bt5-repository-url = ${slap-parameter:bt5-repository-url}
+config-smtp-url = ${slap-parameter:smtp-url}
 software-type = tidstorage
-sla-computer_guid = $${slap-parameter:tidstorage-computer-guid}
+sla-computer_guid = ${slap-parameter:tidstorage-computer-guid}
 
 [request-varnish]
 <=request-common
 name = Varnish
 config = tidstorage-url
-config-tidstorage-url = $${request-tidstorage:connection-url-login}
-config-web-checker-mail-address = $${slap-parameter:web-checker-mail-address}
-config-web-checker-smtp-host = $${slap-parameter:web-checker-smtp-host}
+config-tidstorage-url = ${request-tidstorage:connection-url-login}
+config-web-checker-mail-address = ${slap-parameter:web-checker-mail-address}
+config-web-checker-smtp-host = ${slap-parameter:web-checker-smtp-host}
 software-type = varnish
-sla-computer_guid = $${slap-parameter:varnish-computer-guid}
+sla-computer_guid = ${slap-parameter:varnish-computer-guid}
 
 [slap-parameter]
 # Default value if no computer_guid is specified for each type
-sphinx-computer-guid = $${slap-connection:computer-id}
-mariadb-computer-guid = $${slap-connection:computer-id}
-cloudooo-computer-guid = $${slap-connection:computer-id}
-memcached-computer-guid = $${slap-connection:computer-id}
-kumofs-computer-guid = $${slap-connection:computer-id}
-tidstorage-computer-guid = $${slap-connection:computer-id}
-varnish-computer-guid = $${slap-connection:computer-id}
+sphinx-computer-guid = ${slap-connection:computer-id}
+mariadb-computer-guid = ${slap-connection:computer-id}
+cloudooo-computer-guid = ${slap-connection:computer-id}
+memcached-computer-guid = ${slap-connection:computer-id}
+kumofs-computer-guid = ${slap-connection:computer-id}
+tidstorage-computer-guid = ${slap-connection:computer-id}
+varnish-computer-guid = ${slap-connection:computer-id}
 cloudooo-json =
 bt5 = erp5_full_text_myisam_catalog
   erp5_configurator_standard
   erp5_configurator_maxma_demo
   erp5_configurator_ung
   erp5_configurator_run_my_doc
-bt5-repository-url = ${local-bt5-repository:list}
+bt5-repository-url = {{ local_bt5_repository }}
 smtp-url = smtp://localhost:25/
 
 # rest of parts are candidates for some generic stuff
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run
+services = ${rootdirectory:etc}/run
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
+etc = ${buildout:directory}/etc

software/erp5/instance-kumofs.cfg → software/erp5/instance-kumofs.cfg.in

@@ -7,105 +7,105 @@ parts =
   cron
   cron-entry-logrotate
 
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [publish-kumofs-connection-information]
 recipe = slapos.cookbook:publishurl
-url = memcached://$${kumofs-instance:ip}:$${kumofs-instance:gateway-port}/
+url = memcached://${kumofs-instance:ip}:${kumofs-instance:gateway-port}/
 
 [kumofs-instance]
 recipe = slapos.cookbook:generic.kumofs
 
 # Network options
-ip = $${slap-network-information:local-ipv4}
+ip = ${slap-network-information:local-ipv4}
 manager-port = 13101
 server-port = 13201
 server-listen-port = 13202
 gateway-port = 13301
 
 # Paths: Running wrappers
-gateway-wrapper = $${basedirectory:services}/kumofs_gateway
-manager-wrapper = $${basedirectory:services}/kumofs_manager
-server-wrapper = $${basedirectory:services}/kumofs_server
+gateway-wrapper = ${basedirectory:services}/kumofs_gateway
+manager-wrapper = ${basedirectory:services}/kumofs_manager
+server-wrapper = ${basedirectory:services}/kumofs_server
 
 # Paths: Data
-data-directory = $${directory:kumofs-data}
+data-directory = ${directory:kumofs-data}
 
 # Paths: Logs
-kumo-gateway-log = $${basedirectory:log}/kumo-gateway.log
-kumo-manager-log = $${basedirectory:log}/kumo-manager.log
-kumo-server-log = $${basedirectory:log}/kumo-server.log
+kumo-gateway-log = ${basedirectory:log}/kumo-gateway.log
+kumo-manager-log = ${basedirectory:log}/kumo-manager.log
+kumo-server-log = ${basedirectory:log}/kumo-server.log
 
 # Binary information
-kumo-gateway-binary = ${kumo:location}/bin/kumo-gateway
-kumo-manager-binary = ${kumo:location}/bin/kumo-manager
-kumo-server-binary = ${kumo:location}/bin/kumo-server
-shell-path = ${dash:location}/bin/dash
+kumo-gateway-binary = {{ kumo_location }}/bin/kumo-gateway
+kumo-manager-binary = {{ kumo_location }}/bin/kumo-manager
+kumo-server-binary = {{ kumo_location }}/bin/kumo-server
+shell-path = {{ dash_location }}/bin/dash
 
 [logrotate-entry-kumofs]
 <= logrotate
 recipe = slapos.cookbook:logrotate.d
 name = kumofs
-log = $${kumofs-instance:kumo-gateway-log} $${kumofs-instance:kumo-manager-log}
-  $${kumofs-instance:kumo-server-log}
+log = ${kumofs-instance:kumo-gateway-log} ${kumofs-instance:kumo-manager-log}
+  ${kumofs-instance:kumo-server-log}
 
 # rest of parts are candidates for some generic stuff
 
 [logrotate]
 recipe = slapos.cookbook:logrotate
 # Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = ${gzip:location}/bin/gzip
-gunzip-binary = ${gzip:location}/bin/gunzip
+logrotate-binary = {{ logrotate_location }}/usr/sbin/logrotate
+gzip-binary = {{ gzip_location }}/bin/gzip
+gunzip-binary = {{ gzip_location }}/bin/gunzip
 # Directories
-wrapper = $${rootdirectory:bin}/logrotate
-conf = $${rootdirectory:etc}/logrotate.conf
-logrotate-entries = $${directory:logrotate-entries}
-backup = $${directory:logrotate-backup}
-state-file = $${rootdirectory:srv}/logrotate.status
+wrapper = ${rootdirectory:bin}/logrotate
+conf = ${rootdirectory:etc}/logrotate.conf
+logrotate-entries = ${directory:logrotate-entries}
+backup = ${directory:logrotate-backup}
+state-file = ${rootdirectory:srv}/logrotate.status
 
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log
-services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-backup = $${rootdirectory:srv}/backup
+log = ${rootdirectory:var}/log
+services = ${rootdirectory:etc}/run
+run = ${rootdirectory:var}/run
+backup = ${rootdirectory:srv}/backup
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
-cronstamps = $${rootdirectory:etc}/cronstamps
-logrotate-backup = $${basedirectory:backup}/logrotate
-logrotate-entries = $${rootdirectory:etc}/logrotate.d
-kumofs-data = $${rootdirectory:srv}/kumofs
+cron-entries = ${rootdirectory:etc}/cron.d
+crontabs = ${rootdirectory:etc}/crontabs
+cronstamps = ${rootdirectory:etc}/cronstamps
+logrotate-backup = ${basedirectory:backup}/logrotate
+logrotate-entries = ${rootdirectory:etc}/logrotate.d
+kumofs-data = ${rootdirectory:srv}/kumofs
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
+etc = ${buildout:directory}/etc
+var = ${buildout:directory}/var
+srv = ${buildout:directory}/srv
+bin = ${buildout:directory}/bin
 
 [cron]
 recipe = slapos.cookbook:cron
-dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${directory:cron-entries}
-crontabs = $${directory:crontabs}
-cronstamps = $${directory:cronstamps}
-catcher = $${cron-simplelogger:wrapper}
-binary = $${basedirectory:services}/crond
+dcrond-binary = {{ dcron_location }}/sbin/crond
+cron-entries = ${directory:cron-entries}
+crontabs = ${directory:crontabs}
+cronstamps = ${directory:cronstamps}
+catcher = ${cron-simplelogger:wrapper}
+binary = ${basedirectory:services}/crond
 
 [cron-simplelogger]
 recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/cron.log
+wrapper = ${rootdirectory:bin}/cron_simplelogger
+log = ${basedirectory:log}/cron.log
 
 [cron-entry-logrotate]
 <= cron
 recipe = slapos.cookbook:cron.d
 name = logrotate
 frequency = 0 0 * * *
-command = $${logrotate:wrapper}
+command = ${logrotate:wrapper}

software/erp5/instance-mariadb.cfg

-[buildout]
-parts =
-  publish-mariadb-url
-  mariadb-instance
-  logrotate
-  logrotate-entry-mariadb
-  cron
-  cron-entry-logrotate
-  cron-entry-mariadb-backup
-  binary-link
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[publish-mariadb-url]
-recipe = slapos.cookbook:publishurl
-url = mysql://$${mariadb-instance:user}:$${mariadb-instance:password}@$${mariadb-instance:ip}:$${mariadb-instance:port}/$${mariadb-instance:database}
-
-[cron-entry-mariadb-backup]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = mariadb-backup
-frequency = 0 0 * * *
-command = $${mariadb-instance:backup-script}
-
-[mariadb-instance]
-recipe = slapos.cookbook:generic.mysql
-
-# Options
-user = user
-parallel-test-database-amount = 100
-port = 45678
-ip = $${slap-network-information:local-ipv4}
-database = erp5
-test-user = erp5_test
-test-database = erp5_test
-mysql-test-database-base = testdb
-mysql-test-user-base = testuser
-
-# Paths
-wrapper = $${basedirectory:services}/mariadb
-update-wrapper = $${basedirectory:services}/mariadb_update
-backup-script = $${rootdirectory:bin}/innobackupex-controller
-full-backup-directory = $${directory:mariadb-backup-full}
-incremental-backup-directory = $${directory:mariadb-backup-incremental}
-data-directory = $${directory:mariadb-data}
-pid-file = $${basedirectory:run}/mariadb.pid
-socket = $${basedirectory:run}/mariadb.sock
-error-log = $${basedirectory:log}/mariadb_error.log
-slow-query-log = $${basedirectory:log}/mariadb_slowquery.log
-conf-file = $${rootdirectory:etc}/mariadb.cnf
-dumpname = dump.sql.gz
-bin-directory = $${rootdirectory:bin}
-innobackupex-incremental = $${rootdirectory:bin}/innobackupex-incremental
-innobackupex-full = $${rootdirectory:bin}/innobackupex-full
-
-# Binary information
-innobackupex-binary = ${xtrabackup:location}/bin/innobackupex
-mysql-binary = ${mariadb:location}/bin/mysql
-mysql-install-binary = ${mariadb:location}/bin/mysql_install_db
-mysql-upgrade-binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld-binary = ${mariadb:location}/libexec/mysqld
-pt-archiver-binary = ${perl:siteprefix}/bin/pt-archiver
-pt-config-diff-binary = ${perl:siteprefix}/bin/pt-config-diff
-pt-deadlock-logger-binary = ${perl:siteprefix}/bin/pt-deadlock-logger
-pt-duplicate-key-checker-binary = ${perl:siteprefix}/bin/pt-duplicate-key-checker
-pt-fifo-split-binary = ${perl:siteprefix}/bin/pt-fifo-split
-pt-find-binary = ${perl:siteprefix}/bin/pt-find
-pt-fk-error-logger-binary = ${perl:siteprefix}/bin/pt-fk-error-logger
-pt-heartbeat-binary = ${perl:siteprefix}/bin/pt-heartbeat
-pt-index-usage-binary = ${perl:siteprefix}/bin/pt-index-usage
-pt-kill-binary = ${perl:siteprefix}/bin/pt-kill
-pt-log-player-binary = ${perl:siteprefix}/bin/pt-log-player
-pt-online-schema-change-binary = ${perl:siteprefix}/bin/pt-online-schema-change
-pt-query-advisor-binary = ${perl:siteprefix}/bin/pt-query-advisor
-pt-query-digest-binary = ${perl:siteprefix}/bin/pt-query-digest
-pt-show-grants-binary = ${perl:siteprefix}/bin/pt-show-grants
-pt-slave-delay-binary = ${perl:siteprefix}/bin/pt-slave-delay
-pt-slave-find-binary = ${perl:siteprefix}/bin/pt-slave-find
-pt-slave-restart-binary = ${perl:siteprefix}/bin/pt-slave-restart
-pt-table-checksum-binary = ${perl:siteprefix}/bin/pt-table-checksum
-pt-table-sync-binary = ${perl:siteprefix}/bin/pt-table-sync
-pt-tcp-model-binary = ${perl:siteprefix}/bin/pt-tcp-model
-pt-trend-binary = ${perl:siteprefix}/bin/pt-trend
-pt-upgrade-binary = ${perl:siteprefix}/bin/pt-upgrade
-pt-variable-advisor-binary = ${perl:siteprefix}/bin/pt-variable-advisor
-pt-visual-explain-binary = ${perl:siteprefix}/bin/pt-visual-explain
-xtrabackup-binary = ${xtrabackup:location}/bin/xtrabackup_51
-perl-binary = ${perl:location}/bin/perl
-
-[logrotate]
-recipe = slapos.cookbook:logrotate
-# Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = ${gzip:location}/bin/gzip
-gunzip-binary = ${gzip:location}/bin/gunzip
-# Directories
-wrapper = $${rootdirectory:bin}/logrotate
-conf = $${rootdirectory:etc}/logrotate.conf
-logrotate-entries = $${directory:logrotate-entries}
-backup = $${directory:logrotate-backup}
-state-file = $${rootdirectory:srv}/logrotate.status
-
-[logrotate-entry-mariadb]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = mariadb
-log = $${mariadb-instance:error-log} $${mariadb-instance:slow-query-log}
-post = $${mariadb-instance:mysql-binary} --no-defaults -B --socket=$${mariadb-instance:socket} -e "FLUSH LOGS"
-
-[cron]
-recipe = slapos.cookbook:cron
-dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${directory:cron-entries}
-crontabs = $${directory:crontabs}
-cronstamps = $${directory:cronstamps}
-catcher = $${cron-simplelogger:wrapper}
-binary = $${basedirectory:services}/crond
-
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/cron.log
-
-[cron-entry-logrotate]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = logrotate
-frequency = 0 0 * * *
-command = $${logrotate:wrapper}
-
-[binary-link]
-recipe = slapos.cookbook:symbolic.link
-target-directory = $${rootdirectory:bin}
-link-binary = 
-  ${coreutils:location}/bin/basename
-  ${coreutils:location}/bin/cat
-  ${coreutils:location}/bin/cp
-  ${coreutils:location}/bin/ls
-  ${coreutils:location}/bin/tr
-  ${coreutils:location}/bin/uname
-  ${gettext:location}/lib/gettext/hostname
-  ${grep:location}/bin/grep
-  ${sed:location}/bin/sed
-  ${mariadb:location}/bin/mysql
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log
-services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-backup = $${rootdirectory:srv}/backup
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
-cronstamps = $${rootdirectory:etc}/cronstamps
-ca-dir = $${rootdirectory:srv}/ssl
-mariadb-backup-full = $${basedirectory:backup}/mariadb-full
-mariadb-backup-incremental = $${basedirectory:backup}/mariadb-incremental
-mariadb-data = $${rootdirectory:srv}/mariadb
-logrotate-backup = $${basedirectory:backup}/logrotate
-logrotate-entries = $${rootdirectory:etc}/logrotate.d
-

software/erp5/instance-mariadb.cfg.in

+[buildout]
+parts =
+  publish-mariadb-url
+  mariadb-instance
+  logrotate
+  logrotate-entry-mariadb
+  cron
+  cron-entry-logrotate
+  cron-entry-mariadb-backup
+  binary-link
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[publish-mariadb-url]
+recipe = slapos.cookbook:publishurl
+url = mysql://${mariadb-instance:user}:${mariadb-instance:password}@${mariadb-instance:ip}:${mariadb-instance:port}/${mariadb-instance:database}
+
+[cron-entry-mariadb-backup]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = mariadb-backup
+frequency = 0 0 * * *
+command = ${mariadb-instance:backup-script}
+
+[mariadb-instance]
+recipe = slapos.cookbook:generic.mysql
+
+# Options
+user = user
+parallel-test-database-amount = 100
+port = 45678
+ip = ${slap-network-information:local-ipv4}
+database = erp5
+test-user = erp5_test
+test-database = erp5_test
+mysql-test-database-base = testdb
+mysql-test-user-base = testuser
+
+# Paths
+wrapper = ${basedirectory:services}/mariadb
+update-wrapper = ${basedirectory:services}/mariadb_update
+backup-script = ${rootdirectory:bin}/innobackupex-controller
+full-backup-directory = ${directory:mariadb-backup-full}
+incremental-backup-directory = ${directory:mariadb-backup-incremental}
+data-directory = ${directory:mariadb-data}
+pid-file = ${basedirectory:run}/mariadb.pid
+socket = ${basedirectory:run}/mariadb.sock
+error-log = ${basedirectory:log}/mariadb_error.log
+slow-query-log = ${basedirectory:log}/mariadb_slowquery.log
+conf-file = ${rootdirectory:etc}/mariadb.cnf
+bin-directory = ${rootdirectory:bin}
+innobackupex-incremental = ${rootdirectory:bin}/innobackupex-incremental
+innobackupex-full = ${rootdirectory:bin}/innobackupex-full
+
+# Binary information
+innobackupex-binary = {{ xtrabackup_location }}/bin/innobackupex
+mysql-base-directory = {{ mariadb_location }}
+mysql-binary = {{ mariadb_location }}/bin/mysql
+mysql-install-binary = {{ mariadb_location }}/scripts/mysql_install_db
+mysql-upgrade-binary = {{ mariadb_location }}/bin/mysql_upgrade
+mysqld-binary = {{ mariadb_location }}/bin/mysqld
+pt-archiver-binary = {{ perl_siteprefix }}/bin/pt-archiver
+pt-config-diff-binary = {{ perl_siteprefix }}/bin/pt-config-diff
+pt-deadlock-logger-binary = {{ perl_siteprefix }}/bin/pt-deadlock-logger
+pt-duplicate-key-checker-binary = {{ perl_siteprefix }}/bin/pt-duplicate-key-checker
+pt-fifo-split-binary = {{ perl_siteprefix }}/bin/pt-fifo-split
+pt-find-binary = {{ perl_siteprefix }}/bin/pt-find
+pt-fk-error-logger-binary = {{ perl_siteprefix }}/bin/pt-fk-error-logger
+pt-heartbeat-binary = {{ perl_siteprefix }}/bin/pt-heartbeat
+pt-index-usage-binary = {{ perl_siteprefix }}/bin/pt-index-usage
+pt-kill-binary = {{ perl_siteprefix }}/bin/pt-kill
+pt-log-player-binary = {{ perl_siteprefix }}/bin/pt-log-player
+pt-online-schema-change-binary = {{ perl_siteprefix }}/bin/pt-online-schema-change
+pt-query-advisor-binary = {{ perl_siteprefix }}/bin/pt-query-advisor
+pt-query-digest-binary = {{ perl_siteprefix }}/bin/pt-query-digest
+pt-show-grants-binary = {{ perl_siteprefix }}/bin/pt-show-grants
+pt-slave-delay-binary = {{ perl_siteprefix }}/bin/pt-slave-delay
+pt-slave-find-binary = {{ perl_siteprefix }}/bin/pt-slave-find
+pt-slave-restart-binary = {{ perl_siteprefix }}/bin/pt-slave-restart
+pt-table-checksum-binary = {{ perl_siteprefix }}/bin/pt-table-checksum
+pt-table-sync-binary = {{ perl_siteprefix }}/bin/pt-table-sync
+pt-tcp-model-binary = {{ perl_siteprefix }}/bin/pt-tcp-model
+pt-trend-binary = {{ perl_siteprefix }}/bin/pt-trend
+pt-upgrade-binary = {{ perl_siteprefix }}/bin/pt-upgrade
+pt-variable-advisor-binary = {{ perl_siteprefix }}/bin/pt-variable-advisor
+pt-visual-explain-binary = {{ perl_siteprefix }}/bin/pt-visual-explain
+xtrabackup-binary = {{ xtrabackup_location }}/bin/xtrabackup_51
+perl-binary = {{ perl_location }}/bin/perl
+
+[logrotate]
+recipe = slapos.cookbook:logrotate
+# Binaries
+logrotate-binary = {{ logrotate_location }}/usr/sbin/logrotate
+gzip-binary = {{ gzip_location }}/bin/gzip
+gunzip-binary = {{ gzip_location }}/bin/gunzip
+# Directories
+wrapper = ${rootdirectory:bin}/logrotate
+conf = ${rootdirectory:etc}/logrotate.conf
+logrotate-entries = ${directory:logrotate-entries}
+backup = ${directory:logrotate-backup}
+state-file = ${rootdirectory:srv}/logrotate.status
+
+[logrotate-entry-mariadb]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = mariadb
+log = ${mariadb-instance:error-log} ${mariadb-instance:slow-query-log}
+post = ${mariadb-instance:mysql-binary} --no-defaults -B --socket=${mariadb-instance:socket} -e "FLUSH LOGS"
+
+[cron]
+recipe = slapos.cookbook:cron
+dcrond-binary = {{ dcron_location }}/sbin/crond
+cron-entries = ${directory:cron-entries}
+crontabs = ${directory:crontabs}
+cronstamps = ${directory:cronstamps}
+catcher = ${cron-simplelogger:wrapper}
+binary = ${basedirectory:services}/crond
+
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = ${rootdirectory:bin}/cron_simplelogger
+log = ${basedirectory:log}/cron.log
+
+[cron-entry-logrotate]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+command = ${logrotate:wrapper}
+
+[binary-link]
+recipe = slapos.cookbook:symbolic.link
+target-directory = ${rootdirectory:bin}
+link-binary =
+  {{ coreutils_location }}/bin/basename
+  {{ coreutils_location }}/bin/cat
+  {{ coreutils_location }}/bin/cp
+  {{ coreutils_location }}/bin/ls
+  {{ coreutils_location }}/bin/tr
+  {{ coreutils_location }}/bin/uname
+  {{ gettext_location }}/lib/gettext/hostname
+  {{ grep_location }}/bin/grep
+  {{ sed_location }}/bin/sed
+  {{ mariadb_location }}/bin/mysql
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+var = ${buildout:directory}/var
+srv = ${buildout:directory}/srv
+bin = ${buildout:directory}/bin
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = ${rootdirectory:var}/log
+services = ${rootdirectory:etc}/run
+run = ${rootdirectory:var}/run
+backup = ${rootdirectory:srv}/backup
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+cron-entries = ${rootdirectory:etc}/cron.d
+crontabs = ${rootdirectory:etc}/crontabs
+cronstamps = ${rootdirectory:etc}/cronstamps
+ca-dir = ${rootdirectory:srv}/ssl
+mariadb-backup-full = ${basedirectory:backup}/mariadb-full
+mariadb-backup-incremental = ${basedirectory:backup}/mariadb-incremental
+mariadb-data = ${rootdirectory:srv}/mariadb
+logrotate-backup = ${basedirectory:backup}/logrotate
+logrotate-entries = ${rootdirectory:etc}/logrotate.d
+

software/erp5/instance-memcached.cfg → software/erp5/instance-memcached.cfg.in

@@ -10,27 +10,27 @@ parts =
   memcached-instance
   publish-memcached-connection-information
 
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-bin = $${buildout:directory}/bin
+etc = ${buildout:directory}/etc
+bin = ${buildout:directory}/bin
 
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run
+services = ${rootdirectory:etc}/run
 
 [memcached-instance]
 recipe = slapos.cookbook:generic.memcached
-wrapper_path = $${basedirectory:services}/memcached
-binary_path = ${memcached:location}/bin/memcached
-shell-path = ${dash:location}/bin/dash
-ip = $${slap-network-information:local-ipv4}
+wrapper_path = ${basedirectory:services}/memcached
+binary_path = {{ memcached_location }}/bin/memcached
+shell-path = {{ dash_location }}/bin/dash
+ip = ${slap-network-information:local-ipv4}
 port = 11000
 
 [publish-memcached-connection-information]
 recipe = slapos.cookbook:publishurl
-url = memcached://$${memcached-instance:ip}:$${memcached-instance:port}/
+url = memcached://${memcached-instance:ip}:${memcached-instance:port}/

software/erp5/instance-sphinx.cfg

-[buildout]
-parts =
-  publish-sphinx-url
-  sphinxd-instance
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[publish-sphinx-url]
-recipe = slapos.cookbook:publish
-url-sphinx = sphinx://$${sphinxd-instance:ip}:$${sphinxd-instance:sphinx-port}
-url-sphinx-sql = mysql://$${sphinxd-instance:ip}:$${sphinxd-instance:sql-port}
-
-[sphinxd-instance]
-recipe = slapos.cookbook:sphinx
-data-directory = $${directory:sphinx-data}
-configuration-file = $${rootdirectory:etc}/sphinx.conf
-searchd-log = $${basedirectory:log}/sphinx-searchd.log
-query-log = $${basedirectory:log}/sphinx-query.log
-pid = $${basedirectory:run}/sphinx-searchd.pid
-ip = $${slap-network-information:local-ipv4}
-sphinx-port = 9312
-sql-port = 9306
-wrapper = $${basedirectory:services}/sphinxd
-sphinx-searchd-binary = ${sphinx:location}/bin/searchd
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log
-services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-sphinx-data = $${rootdirectory:srv}/sphinx

software/erp5/instance-sphinx.cfg.in

+[buildout]
+parts =
+  publish-sphinx-url
+  sphinxd-instance
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[publish-sphinx-url]
+recipe = slapos.cookbook:publish
+url-sphinx = sphinx://${sphinxd-instance:ip}:${sphinxd-instance:sphinx-port}
+url-sphinx-sql = mysql://${sphinxd-instance:ip}:${sphinxd-instance:sql-port}
+
+[sphinxd-instance]
+recipe = slapos.cookbook:sphinx
+data-directory = ${directory:sphinx-data}
+configuration-file = ${rootdirectory:etc}/sphinx.conf
+searchd-log = ${basedirectory:log}/sphinx-searchd.log
+query-log = ${basedirectory:log}/sphinx-query.log
+pid = ${basedirectory:run}/sphinx-searchd.pid
+ip = ${slap-network-information:local-ipv4}
+sphinx-port = 9312
+sql-port = 9306
+wrapper = ${basedirectory:services}/sphinxd
+sphinx-searchd-binary = {{ sphinx_location }}/bin/searchd
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+var = ${buildout:directory}/var
+srv = ${buildout:directory}/srv
+bin = ${buildout:directory}/bin
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = ${rootdirectory:var}/log
+services = ${rootdirectory:etc}/run
+run = ${rootdirectory:var}/run
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+sphinx-data = ${rootdirectory:srv}/sphinx

software/erp5/instance-varnish.cfg → software/erp5/instance-varnish.cfg.in

@@ -7,112 +7,112 @@ parts =
   cron-entry-logrotate
   cron-entry-web-checker
 
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [publish-varnish-connection-information]
 recipe = slapos.cookbook:publishurl
-url = http://$${varnish-instance:ip}:$${varnish-instance:server-port}/
+url = http://${varnish-instance:ip}:${varnish-instance:server-port}/
 
 [varnish-instance]
 recipe = slapos.cookbook:generic.varnish
 
 # Network options
-ip = $${slap-network-information:local-ipv4}
+ip = ${slap-network-information:local-ipv4}
 server-port = 6001
 manager-port = 6002
 
 # Paths: Running wrappers
-varnishd-wrapper = $${basedirectory:services}/varnishd
-varnishlog-wrapper = $${rootdirectory:bin}/varnishlog
+varnishd-wrapper = ${basedirectory:services}/varnishd
+varnishlog-wrapper = ${rootdirectory:bin}/varnishlog
 
 # Binary information
-varnishd-binary = ${varnish:location}/sbin/varnishd
-varnishlog-binary = ${varnish:location}/bin/varnishlog
-shell-path = ${dash:location}/bin/dash
+varnishd-binary = {{ varnish_location }}/sbin/varnishd
+varnishlog-binary = {{ varnish_location }}/bin/varnishlog
+shell-path = {{ dash_location }}/bin/dash
 # Configuration by VCL
-vcl-file = $${rootdirectory:etc}/default.vcl
-pid-file = $${basedirectory:run}/varnishd.pid
-varnish-data = $${directory:varnish-data}
+vcl-file = ${rootdirectory:etc}/default.vcl
+pid-file = ${basedirectory:run}/varnishd.pid
+varnish-data = ${directory:varnish-data}
 # this will pass at -n option
-varnish-instance-name = $${directory:varnish-instance}
-web-checker = ${buildout:bin-directory}/web_checker_utility
+varnish-instance-name = ${directory:varnish-instance}
+web-checker = {{ bin_directory }}/web_checker_utility
 
 [cron-entry-web-checker]
 <= cron
 recipe = slapos.cookbook:cron.d
 name = web-checker
 frequency = 0 0 * * *
-command = $${varnish-instance:web-checker} $${web-checker:web-checker-config}
+command = ${varnish-instance:web-checker} ${web-checker:web-checker-config}
 
 [web-checker]
 recipe = slapos.cookbook:webchecker
-web-checker-config = $${rootdirectory:etc}/web_checker.cfg
-web-checker-working-directory = $${directory:web-checker}
+web-checker-config = ${rootdirectory:etc}/web_checker.cfg
+web-checker-working-directory = ${directory:web-checker}
 # for now frontend-url is varnish, it will replace with the real front-end one.
-frontend-url = $${varnish-instance:ip}:$${varnish-instance:server-port}
-wget-binary-path = ${wget:location}/bin/wget
-varnishlog-binary-path = $${varnish-instance:varnishlog-wrapper}
-web-checker-log = $${basedirectory:log}/web-checker.log
+frontend-url = ${varnish-instance:ip}:${varnish-instance:server-port}
+wget-binary-path = {{ wget_location }}/bin/wget
+varnishlog-binary-path = ${varnish-instance:varnishlog-wrapper}
+web-checker-log = ${basedirectory:log}/web-checker.log
 
 [cron]
 recipe = slapos.cookbook:cron
-dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${directory:cron-entries}
-crontabs = $${directory:crontabs}
-cronstamps = $${directory:cronstamps}
-binary = $${basedirectory:services}/crond
-catcher = $${cron-simplelogger:wrapper}
+dcrond-binary = {{ dcron_location }}/sbin/crond
+cron-entries = ${directory:cron-entries}
+crontabs = ${directory:crontabs}
+cronstamps = ${directory:cronstamps}
+binary = ${basedirectory:services}/crond
+catcher = ${cron-simplelogger:wrapper}
 
 [cron-simplelogger]
 recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/cron.log
+wrapper = ${rootdirectory:bin}/cron_simplelogger
+log = ${basedirectory:log}/cron.log
 
 [cron-entry-logrotate]
 <= cron
 recipe = slapos.cookbook:cron.d
 name = logrotate
 frequency = 0 0 * * *
-command = $${logrotate:wrapper}
+command = ${logrotate:wrapper}
 
 [logrotate]
 recipe = slapos.cookbook:logrotate
 # Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = ${gzip:location}/bin/gzip
-gunzip-binary = ${gzip:location}/bin/gunzip
+logrotate-binary = {{ logrotate_location }}/usr/sbin/logrotate
+gzip-binary = {{ gzip_location }}/bin/gzip
+gunzip-binary = {{ gzip_location }}/bin/gunzip
 # Directories
-wrapper = $${rootdirectory:bin}/logrotate
-conf = $${rootdirectory:etc}/logrotate.conf
-logrotate-entries = $${directory:logrotate-entries}
-backup = $${directory:logrotate-backup}
-state-file = $${rootdirectory:srv}/logrotate.status
+wrapper = ${rootdirectory:bin}/logrotate
+conf = ${rootdirectory:etc}/logrotate.conf
+logrotate-entries = ${directory:logrotate-entries}
+backup = ${directory:logrotate-backup}
+state-file = ${rootdirectory:srv}/logrotate.status
 
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-backup = $${rootdirectory:srv}/backup
-log = $${rootdirectory:var}/log
-backup = $${rootdirectory:srv}/backup
+services = ${rootdirectory:etc}/run
+run = ${rootdirectory:var}/run
+backup = ${rootdirectory:srv}/backup
+log = ${rootdirectory:var}/log
+backup = ${rootdirectory:srv}/backup
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
-varnish-data = $${rootdirectory:srv}/varnish
-varnish-instance = $${directory:varnish-data}/instance
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
-cronstamps = $${rootdirectory:etc}/cronstamps
-logrotate-backup = $${basedirectory:backup}/logrotate
-logrotate-entries = $${rootdirectory:etc}/logrotate.d
-web-checker = $${rootdirectory:srv}/web-checker
+varnish-data = ${rootdirectory:srv}/varnish
+varnish-instance = ${directory:varnish-data}/instance
+cron-entries = ${rootdirectory:etc}/cron.d
+crontabs = ${rootdirectory:etc}/crontabs
+cronstamps = ${rootdirectory:etc}/cronstamps
+logrotate-backup = ${basedirectory:backup}/logrotate
+logrotate-entries = ${rootdirectory:etc}/logrotate.d
+web-checker = ${rootdirectory:srv}/web-checker
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
+etc = ${buildout:directory}/etc
+var = ${buildout:directory}/var
+srv = ${buildout:directory}/srv
+bin = ${buildout:directory}/bin
 

software/erp5/instance-zope.cfg

-[buildout]
-parts =
-  certificate-authority
-  publish-apache-zope-backend-connection-string
-  zope-instance
-  apache-zope-backend-instance
-  ca-apache-zope-backend
-  logrotate
-  erp5-certificate-authority
-  logrotate-entry-zope
-  cron
-  cron-entry-logrotate
-  binary-link
-  bt5-erp5-link
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[slap-parameter]
-# By default, if no white list is specified, backend allows access to everyone
-access-control-string = all
-
-[publish-apache-zope-backend-connection-string]
-recipe = slapos.cookbook:publish
-url = https://$${zope-instance:user}:$${zope-instance:password}@[$${apache-zope-backend-instance:ip}]:$${apache-zope-backend-instance:port}
-url-deadlock = $${:url}/$${zope-instance:deadlock-path}?$${zope-instance:deadlock-password}
-
-[apache-zope-backend-instance]
-recipe = slapos.cookbook:apache.zope.backend
-backend = http://$${zope-instance:ip}:$${zope-instance:port}/
-ip = $${slap-network-information:global-ipv6}
-port = 16001
-wrapper = $${rootdirectory:bin}/apache
-key-file = $${directory:apache-conf}/apache.key
-cert-file = $${directory:apache-conf}/apache.crt
-configuration-file = $${directory:apache-conf}/apache.conf
-access-control-string = $${slap-parameter:access-control-string}
-pid-file = $${basedirectory:run}/apache.pid
-lock-file = $${basedirectory:run}/apache.lock
-ssl-session-cache = $${basedirectory:log}/apache-ssl-session-cache
-error-log = $${basedirectory:log}/apache-error.log
-access-log = $${basedirectory:log}/apache-access.log
-apache-binary = ${apache:location}/bin/httpd
-scheme = https
-
-[ca-apache-zope-backend]
-<= certificate-authority
-recipe = slapos.cookbook:certificate_authority.request
-key-file = $${apache-zope-backend-instance:key-file}
-cert-file = $${apache-zope-backend-instance:cert-file}
-executable = $${apache-zope-backend-instance:wrapper}
-wrapper = $${basedirectory:services}/apache
-
-[zope-instance]
-recipe = slapos.cookbook:generic.zope
-
-# XXX: products won't be needed as soon as all ERP5 (and products-deps)
-# products will be eggified so then it will be possible to use them thanks to
-# availability in software's eggs
-products = ${products:list}
-
-# Options
-user = zope
-port = 12001
-ip = $${slap-network-information:local-ipv4}
-zodb-cache-size = 5000
-thread-amount = 4
-zodb-path = $${directory:zodb}/main.fs
-deadlock-path = /manage_debug_threads
-
-# Paths
-wrapper = $${basedirectory:services}/zope-development
-instance-path = $${directory:instance}
-instance-etc = $${directory:instance-etc}
-instance-products = $${directory:instance-products}
-bt5-repository = $${rootdirectory:var}/bt5_repository
-tmp-path = $${rootdirectory:tmp}
-bin-path = $${rootdirectory:bin}
-site-zcml = $${:instance-etc}/site.zcml
-logrotate-post = $${rootdirectory:bin}/zope-post-logrotate
-pid-file = $${basedirectory:run}/zope.pid
-lock-file = $${basedirectory:run}/zope.lock
-event-log = $${basedirectory:log}/zope-event.log
-z2-log = $${basedirectory:log}/zope-Z2.log
-configuration-file = $${rootdirectory:etc}/zope.conf
-inituser = $${:instance-path}/inituser
-# Binary information
-runzope-binary = ${buildout:bin-directory}/runzope
-
-# Defaults
-bt5-repository-list =
-
-[logrotate]
-recipe = slapos.cookbook:logrotate
-# Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = ${gzip:location}/bin/gzip
-gunzip-binary = ${gzip:location}/bin/gunzip
-# Directories
-wrapper = $${rootdirectory:bin}/logrotate
-conf = $${rootdirectory:etc}/logrotate.conf
-logrotate-entries = $${directory:logrotate-entries}
-backup = $${directory:logrotate-backup}
-state-file = $${rootdirectory:srv}/logrotate.status
-
-[logrotate-entry-zope]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = zope
-log = $${zope-instance:event-log} $${zope-instance:z2-log}
-frequency = daily
-rotate-num = 30
-post = ${buildout:bin-directory}/killpidfromfile $${zope-instance:pid-file} SIGUSR2
-sharedscripts = true
-notifempty = true
-create = true
-
-[logrotate-entry-apache-zope-backend]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = zope
-log = $${apache-zope-backend-instance:error-log} $${apache-zope-backend-instance:access-log}
-frequency = daily
-rotate-num = 30
-post = ${buildout:bin-directory}/killpidfromfile $${apache-zope-backend-instance:pid-file} SIGUSR1
-sharedscripts = true
-notifempty = true
-create = true
-
-[cron]
-recipe = slapos.cookbook:cron
-dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${directory:cron-entries}
-crontabs = $${directory:crontabs}
-cronstamps = $${directory:cronstamps}
-catcher = $${cron-simplelogger:wrapper}
-binary = $${basedirectory:services}/crond
-
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/cron.log
-
-[cron-entry-logrotate]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = logrotate
-frequency = 0 0 * * *
-command = $${logrotate:wrapper}
-
-[binary-link]
-recipe = slapos.cookbook:symbolic.link
-target-directory = $${rootdirectory:bin}
-link-binary = 
-  ${coreutils:location}/bin/basename
-  ${coreutils:location}/bin/cat
-  ${coreutils:location}/bin/cp
-  ${coreutils:location}/bin/ls
-  ${coreutils:location}/bin/tr
-  ${coreutils:location}/bin/uname
-  ${git:location}/bin/git
-  ${graphviz:location}/bin/dot
-  ${grep:location}/bin/grep
-  ${imagemagick:location}/bin/convert
-  ${imagemagick:location}/bin/identify
-  ${mariadb:location}/bin/mysql
-  ${mariadb:location}/bin/mysqldump
-  ${pdftk:location}/bin/pdftk
-  ${sed:location}/bin/sed
-  ${tesseract:location}/bin/tesseract
-  ${w3m:location}/bin/w3m
-  ${poppler:location}/bin/pdfinfo
-  ${poppler:location}/bin/pdftotext
-  ${poppler:location}/bin/pdftohtml
-[certificate-authority]
-recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
-ca-dir = $${directory:ca-dir}
-requests-directory = $${cadirectory:requests}
-wrapper = $${basedirectory:services}/ca
-ca-private = $${cadirectory:private}
-ca-certs = $${cadirectory:certs}
-ca-newcerts = $${cadirectory:newcerts}
-ca-crl = $${cadirectory:crl}
-
-[bt5-erp5-link]
-recipe = slapos.cookbook:symbolic.link
-target-directory = $${basedirectory:bt5-erp5}
-link-binary =
-  ${erp5:location}/product/ERP5/bootstrap
-  ${erp5:location}/bt5
-
-[cadirectory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:ca-dir}/requests
-private = $${directory:ca-dir}/private
-certs = $${directory:ca-dir}/certs
-newcerts = $${directory:ca-dir}/newcerts
-crl = $${directory:ca-dir}/crl
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
-tmp = $${buildout:directory}/tmp
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log
-services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-backup = $${rootdirectory:srv}/backup
-bt5-erp5 = $${rootdirectory:var}/bt5_erp5
-
-[erp5-certificate-authority]
-recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
-ca-dir = $${directory:erp5-ca-dir}
-requests-directory = $${erp5-cadirectory:requests}
-wrapper = $${basedirectory:services}/erp5-ca
-ca-private = $${erp5-cadirectory:private}
-ca-certs = $${erp5-cadirectory:certs}
-ca-newcerts = $${erp5-cadirectory:newcerts}
-ca-crl = $${erp5-cadirectory:crl}
-
-[erp5-cadirectory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:erp5-ca-dir}/requests
-private = $${directory:erp5-ca-dir}/private
-certs = $${directory:erp5-ca-dir}/certs
-newcerts = $${directory:erp5-ca-dir}/newcerts
-crl = $${directory:erp5-ca-dir}/crl
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-zodb = $${rootdirectory:srv}/zodb
-instance = $${rootdirectory:srv}/erp5shared
-instance-etc = $${:instance}/etc
-apache-conf = $${rootdirectory:etc}/apache
-instance-etc-package-include = $${:instance}/etc/package-include
-# because of bug in slapos.recipe.template keys are lowercased
-instance-document = $${:instance}/Document
-instance-propertysheet = $${:instance}/PropertySheet
-instance-products = $${:instance}/Products
-instance-extensions = $${:instance}/Extensions
-instance-constraint = $${:instance}/Constraint
-instance-import = $${:instance}/import
-instance-lib = $${:instance}/lib
-instance-tests = $${:instance}/tests
-erp5-ca-dir = $${rootdirectory:srv}/erp5-ca
-ca-dir = $${rootdirectory:srv}/ssl
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
-cronstamps = $${rootdirectory:etc}/cronstamps
-logrotate-backup = $${basedirectory:backup}/logrotate
-logrotate-entries = $${rootdirectory:etc}/logrotate.d

software/erp5/instance-zope.cfg.in

+[buildout]
+parts =
+  certificate-authority
+  publish-apache-zope-backend-connection-string
+  zope-instance
+  apache-zope-backend-instance
+  ca-apache-zope-backend
+  logrotate
+  erp5-certificate-authority
+  logrotate-entry-zope
+  cron
+  cron-entry-logrotate
+  binary-link
+  bt5-erp5-link
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[slap-parameter]
+# By default, if no white list is specified, backend allows access to everyone
+access-control-string = all
+
+[publish-apache-zope-backend-connection-string]
+recipe = slapos.cookbook:publish
+url = https://${zope-instance:user}:${zope-instance:password}@[${apache-zope-backend-instance:ip}]:${apache-zope-backend-instance:port}
+url-deadlock = ${:url}/${zope-instance:deadlock-path}?${zope-instance:deadlock-password}
+
+[apache-zope-backend-instance]
+recipe = slapos.cookbook:apache.zope.backend
+backend = http://${zope-instance:ip}:${zope-instance:port}/
+ip = ${slap-network-information:global-ipv6}
+port = 16001
+wrapper = ${rootdirectory:bin}/apache
+key-file = ${directory:apache-conf}/apache.key
+cert-file = ${directory:apache-conf}/apache.crt
+configuration-file = ${directory:apache-conf}/apache.conf
+access-control-string = ${slap-parameter:access-control-string}
+pid-file = ${basedirectory:run}/apache.pid
+lock-file = ${basedirectory:run}/apache.lock
+ssl-session-cache = ${basedirectory:log}/apache-ssl-session-cache
+error-log = ${basedirectory:log}/apache-error.log
+access-log = ${basedirectory:log}/apache-access.log
+apache-binary = {{ apache_location }}/bin/httpd
+scheme = https
+
+[ca-apache-zope-backend]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+key-file = ${apache-zope-backend-instance:key-file}
+cert-file = ${apache-zope-backend-instance:cert-file}
+executable = ${apache-zope-backend-instance:wrapper}
+wrapper = ${basedirectory:services}/apache
+
+[zope-instance]
+recipe = slapos.cookbook:generic.zope
+
+# XXX: products won't be needed as soon as all ERP5 (and products-deps)
+# products will be eggified so then it will be possible to use them thanks to
+# availability in software's eggs
+products = {{ products_list }}
+
+# Options
+user = zope
+port = 12001
+ip = ${slap-network-information:local-ipv4}
+zodb-cache-size = 5000
+thread-amount = 4
+zodb-path = ${directory:zodb}/main.fs
+deadlock-path = /manage_debug_threads
+
+# Paths
+wrapper = ${basedirectory:services}/zope-development
+instance-path = ${directory:instance}
+instance-etc = ${directory:instance-etc}
+instance-products = ${directory:instance-products}
+bt5-repository = ${rootdirectory:var}/bt5_repository
+tmp-path = ${rootdirectory:tmp}
+bin-path = ${rootdirectory:bin}
+site-zcml = ${:instance-etc}/site.zcml
+logrotate-post = ${rootdirectory:bin}/zope-post-logrotate
+pid-file = ${basedirectory:run}/zope.pid
+lock-file = ${basedirectory:run}/zope.lock
+event-log = ${basedirectory:log}/zope-event.log
+z2-log = ${basedirectory:log}/zope-Z2.log
+configuration-file = ${rootdirectory:etc}/zope.conf
+inituser = ${:instance-path}/inituser
+# Binary information
+runzope-binary = {{ bin_directory }}/runzope
+
+# Defaults
+bt5-repository-list =
+
+[logrotate]
+recipe = slapos.cookbook:logrotate
+# Binaries
+logrotate-binary = {{ logrotate_location }}/usr/sbin/logrotate
+gzip-binary = {{ gzip_location }}/bin/gzip
+gunzip-binary = {{ gzip_location }}/bin/gunzip
+# Directories
+wrapper = ${rootdirectory:bin}/logrotate
+conf = ${rootdirectory:etc}/logrotate.conf
+logrotate-entries = ${directory:logrotate-entries}
+backup = ${directory:logrotate-backup}
+state-file = ${rootdirectory:srv}/logrotate.status
+
+[logrotate-entry-zope]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = zope
+log = ${zope-instance:event-log} ${zope-instance:z2-log}
+frequency = daily
+rotate-num = 30
+post = {{ bin_directory }}/killpidfromfile ${zope-instance:pid-file} SIGUSR2
+sharedscripts = true
+notifempty = true
+create = true
+
+[logrotate-entry-apache-zope-backend]
+<= logrotate
+recipe = slapos.cookbook:logrotate.d
+name = zope
+log = ${apache-zope-backend-instance:error-log} ${apache-zope-backend-instance:access-log}
+frequency = daily
+rotate-num = 30
+post = {{ bin_directory }}/killpidfromfile ${apache-zope-backend-instance:pid-file} SIGUSR1
+sharedscripts = true
+notifempty = true
+create = true
+
+[cron]
+recipe = slapos.cookbook:cron
+dcrond-binary = {{ dcron_location }}/sbin/crond
+cron-entries = ${directory:cron-entries}
+crontabs = ${directory:crontabs}
+cronstamps = ${directory:cronstamps}
+catcher = ${cron-simplelogger:wrapper}
+binary = ${basedirectory:services}/crond
+
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+wrapper = ${rootdirectory:bin}/cron_simplelogger
+log = ${basedirectory:log}/cron.log
+
+[cron-entry-logrotate]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+command = ${logrotate:wrapper}
+
+[binary-link]
+recipe = slapos.cookbook:symbolic.link
+target-directory = ${rootdirectory:bin}
+link-binary =
+  {{ coreutils_location }}/bin/basename
+  {{ coreutils_location }}/bin/cat
+  {{ coreutils_location }}/bin/cp
+  {{ coreutils_location }}/bin/ls
+  {{ coreutils_location }}/bin/tr
+  {{ coreutils_location }}/bin/uname
+  {{ git_location }}/bin/git
+  {{ graphviz_location }}/bin/dot
+  {{ grep_location }}/bin/grep
+  {{ imagemagick_location }}/bin/convert
+  {{ imagemagick_location }}/bin/identify
+  {{ mariadb_location }}/bin/mysql
+  {{ mariadb_location }}/bin/mysqldump
+  {{ pdftk_location }}/bin/pdftk
+  {{ sed_location }}/bin/sed
+  {{ tesseract_location }}/bin/tesseract
+  {{ w3m_location }}/bin/w3m
+  {{ poppler_location }}/bin/pdfinfo
+  {{ poppler_location }}/bin/pdftotext
+  {{ poppler_location }}/bin/pdftohtml
+  {{ dmtx_utils_location }}/bin/dmtxwrite
+[certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = {{ openssl_location }}/bin/openssl
+ca-dir = ${directory:ca-dir}
+requests-directory = ${cadirectory:requests}
+wrapper = ${basedirectory:services}/ca
+ca-private = ${cadirectory:private}
+ca-certs = ${cadirectory:certs}
+ca-newcerts = ${cadirectory:newcerts}
+ca-crl = ${cadirectory:crl}
+
+[bt5-erp5-link]
+recipe = slapos.cookbook:symbolic.link
+target-directory = ${basedirectory:bt5-erp5}
+link-binary =
+  {{ erp5_location }}/product/ERP5/bootstrap
+  {{ erp5_location }}/bt5
+
+[cadirectory]
+recipe = slapos.cookbook:mkdirectory
+requests = ${directory:ca-dir}/requests
+private = ${directory:ca-dir}/private
+certs = ${directory:ca-dir}/certs
+newcerts = ${directory:ca-dir}/newcerts
+crl = ${directory:ca-dir}/crl
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = ${buildout:directory}/etc
+var = ${buildout:directory}/var
+srv = ${buildout:directory}/srv
+bin = ${buildout:directory}/bin
+tmp = ${buildout:directory}/tmp
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = ${rootdirectory:var}/log
+services = ${rootdirectory:etc}/run
+run = ${rootdirectory:var}/run
+backup = ${rootdirectory:srv}/backup
+bt5-erp5 = ${rootdirectory:var}/bt5_erp5
+
+[erp5-certificate-authority]
+recipe = slapos.cookbook:certificate_authority
+openssl-binary = {{ openssl_location }}/bin/openssl
+ca-dir = ${directory:erp5-ca-dir}
+requests-directory = ${erp5-cadirectory:requests}
+wrapper = ${basedirectory:services}/erp5-ca
+ca-private = ${erp5-cadirectory:private}
+ca-certs = ${erp5-cadirectory:certs}
+ca-newcerts = ${erp5-cadirectory:newcerts}
+ca-crl = ${erp5-cadirectory:crl}
+
+[erp5-cadirectory]
+recipe = slapos.cookbook:mkdirectory
+requests = ${directory:erp5-ca-dir}/requests
+private = ${directory:erp5-ca-dir}/private
+certs = ${directory:erp5-ca-dir}/certs
+newcerts = ${directory:erp5-ca-dir}/newcerts
+crl = ${directory:erp5-ca-dir}/crl
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+zodb = ${rootdirectory:srv}/zodb
+instance = ${rootdirectory:srv}/erp5shared
+instance-etc = ${:instance}/etc
+apache-conf = ${rootdirectory:etc}/apache
+instance-etc-package-include = ${:instance}/etc/package-include
+# because of bug in slapos.recipe.template keys are lowercased
+instance-document = ${:instance}/Document
+instance-propertysheet = ${:instance}/PropertySheet
+instance-products = ${:instance}/Products
+instance-extensions = ${:instance}/Extensions
+instance-constraint = ${:instance}/Constraint
+instance-import = ${:instance}/import
+instance-lib = ${:instance}/lib
+instance-tests = ${:instance}/tests
+erp5-ca-dir = ${rootdirectory:srv}/erp5-ca
+ca-dir = ${rootdirectory:srv}/ssl
+cron-entries = ${rootdirectory:etc}/cron.d
+crontabs = ${rootdirectory:etc}/crontabs
+cronstamps = ${rootdirectory:etc}/cronstamps
+logrotate-backup = ${basedirectory:backup}/logrotate
+logrotate-entries = ${rootdirectory:etc}/logrotate.d

software/erp5/instance.cfg

-[instance]
-rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
-
-[buildout]
-
-parts =
-  switch-softwaretype
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[dynamic-template-tidstorage]
-recipe = slapos.cookbook:generate.erp5.tidstorage
-snippet-zeo = ${template-snippet-zeo:output}
-snippet-zope = ${template-snippet-zope:output}
-snippet-master = ${template-snippet-master:output}
-snippet-backend = ${template-snippet-backend:output}
-
-[dynamic-template-cloudooo]
-recipe = slapos.cookbook:generate.cloudooo
-template = ${template-cloudooo:output}
-snippet-fontconfig = ${template-snippet-fontconfig:output}
-
-[switch-softwaretype]
-recipe = slapos.cookbook:softwaretype
-default = ${template-erp5-development:output}
-production = ${template-erp5-production:output}
-kumofs = ${template-kumofs:output}
-memcached = ${template-memcached:output}
-cloudooo = $${dynamic-template-cloudooo:output}
-zope = ${template-zope:output}
-mariadb = ${template-mariadb:output}
-sphinx = ${template-sphinx:output}
-tidstorage = $${dynamic-template-tidstorage:output}
-varnish = ${template-varnish:output}
-
-[slap-connection]
-# part to migrate to new - separated words
-computer-id = $${slap_connection:computer_id}
-partition-id = $${slap_connection:partition_id}
-server-url = $${slap_connection:server_url}
-software-release-url = $${slap_connection:software_release_url}
-key-file = $${slap_connection:key_file}
-cert-file = $${slap_connection:cert_file}

software/erp5/instance.cfg.in

+[buildout]
+parts =
+  switch-softwaretype
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[slap-parameters]
+recipe = slapos.cookbook:slapparameters
+computer = ${slap-connection:computer-id}
+partition = ${slap-connection:partition-id}
+url = ${slap-connection:server-url}
+key = ${slap-connection:key-file}
+cert = ${slap-connection:cert-file}
+
+[jinja2-template-base]
+recipe = slapos.recipe.template:jinja2
+rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
+extra-context =
+context =
+    key eggs_directory buildout:eggs-directory
+    key develop_eggs_directory buildout:develop-eggs-directory
+    jsonkey slapparameter_dict slap-parameters:json
+    ${:extra-context}
+
+[dynamic-template-tidstorage-parameters]
+products = {{ product_list }}
+apache = {{ apache_location }}
+haproxy = {{ haproxy_location }}
+dcron = {{ dcron_location }}
+logrotate = {{ logrotate_location }}
+gzip = {{ gzip_location }}
+openssl = {{ openssl_location }}
+coreutils = {{ coreutils_location }}
+git = {{ git_location }}
+graphviz = {{ graphviz_location }}
+grep = {{ grep_location }}
+imagemagick = {{ imagemagick_location }}
+mariadb = {{ mariadb_location }}
+pdftk = {{ pdftk_location }}
+sed = {{ sed_location }}
+tesseract = {{ tesseract_location }}
+w3m = {{ w3m_location }}
+poppler = {{ poppler_location }}
+dmtx-utils = {{ dmtx_utils_location }}
+buildout-bin-directory = {{ buildout_bin_directory }}
+
+[dynamic-template-tidstorage]
+< = jinja2-template-base
+template = {{ template_tidstorage }}
+filename = instance-tidstorage.cfg
+extensions = jinja2.ext.do
+extra-context =
+    section parameter_dict dynamic-template-tidstorage-parameters
+    import json_module json
+    raw zope_port_base 12000
+    raw zeo_port_base 15000
+    raw haproxy_port_base 11000
+    raw apache_port_base 10000
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type tidstorage
+
+[dynamic-template-cloudooo-parameters]
+file = {{ file_location }}
+fontconfig = {{ fontconfig_location }}
+freetype = {{ freetype_location }}
+libICE = {{ libICE_location }}
+libpng12 = {{ libpng12_location }}
+libSM = {{ libSM_location }}
+libX11 = {{ libX11_location }}
+libXau = {{ libXau_location }}
+libXdmcp = {{ libXdmcp_location }}
+libXext = {{ libXext_location }}
+libxcb = {{ libxcb_location }}
+libXrender = {{ libXrender_location }}
+zlib = {{ zlib_location }}
+libreoffice-bin = {{ libreoffice_bin_location }}
+fonts = {{ fonts_location }}
+buildout-bin-directory = {{ buildout_bin_directory }}
+
+[dynamic-template-cloudooo]
+< = jinja2-template-base
+template = {{ template_cloudooo }}
+filename = instance-cloudoo.cfg
+extra-context =
+    section parameter_dict dynamic-template-cloudooo-parameters
+    import json_module json
+# Must match the key id in [switch-softwaretype] which uses this section.
+    raw software_type cloudooo
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = {{ template_erp5_development }}
+production = {{ template_erp5_production }}
+kumofs = {{ template_kumofs }}
+memcached = {{ template_memcached }}
+cloudooo = ${dynamic-template-cloudooo:rendered}
+zope = {{ template_zope }}
+mariadb = {{ template_mariadb }}
+sphinx = {{ template_sphinx }}
+tidstorage = ${dynamic-template-tidstorage:rendered}
+varnish = {{ template_varnish }}
+
+[slap-connection]
+# part to migrate to new - separated words
+computer-id = ${slap_connection:computer_id}
+partition-id = ${slap_connection:partition_id}
+server-url = ${slap_connection:server_url}
+software-release-url = ${slap_connection:software_release_url}
+key-file = ${slap_connection:key_file}
+cert-file = ${slap_connection:cert_file}

software/erp5/snippet-backend.cfg

-[apache-public-%(backend_name)s]
-recipe = slapos.cookbook:apache.zope.backend
-backend = http://$${haproxy-%(backend_name)s:ip}:$${haproxy-%(backend_name)s:port}/
-ip = $${slap-network-information:global-ipv6}
-port = %(apache_public_port)s
-scheme = http
-wrapper = $${basedirectory:services}/apache-public-%(backend_name)s
-configuration-file = $${directory:apache-conf}/apache-public-%(backend_name)s.conf
-access-control-string = %(access_control_string)s
-pid-file = $${basedirectory:run}/apache-public-%(backend_name)s.pid
-lock-file = $${basedirectory:run}/apache-public-%(backend_name)s.lock
-error-log = $${basedirectory:log}/apache-public-%(backend_name)s-error.log
-access-log = $${basedirectory:log}/apache-public-%(backend_name)s-access.log
-apache-binary = ${apache:location}/bin/httpd
-
-[apache-%(backend_name)s]
-recipe = slapos.cookbook:apache.zope.backend
-backend = http://$${haproxy-%(backend_name)s:ip}:$${haproxy-%(backend_name)s:port}
-ip = $${slap-network-information:global-ipv6}
-port = %(apache_port)s
-wrapper = $${rootdirectory:bin}/apache-%(backend_name)s
-scheme = https
-key-file = $${directory:apache-conf}/apache-%(backend_name)s.key
-cert-file = $${directory:apache-conf}/apache-%(backend_name)s.crt
-configuration-file = $${directory:apache-conf}/apache-%(backend_name)s.conf
-access-control-string = %(access_control_string)s
-pid-file = $${basedirectory:run}/apache-%(backend_name)s.pid
-lock-file = $${basedirectory:run}/apache-%(backend_name)s.lock
-ssl-session-cache = $${basedirectory:log}/apache-ssl-session-cache
-error-log = $${basedirectory:log}/apache-%(backend_name)s-error.log
-access-log = $${basedirectory:log}/apache-%(backend_name)s-access.log
-apache-binary = ${apache:location}/bin/httpd
-ssl-authentication = %(ssl_authentication)s
-backend-path = %(backend_path)s
-# Note: Without erp5-certificate-authority main certificate have to be hardcoded
-ssl-authentication-certificate = $${erp5-certificate-authority:ca-dir}/cacert.pem
-ssl-authentication-crl = $${erp5-certificate-authority:ca-crl}
-
-[ca-apache-%(backend_name)s]
-<= certificate-authority
-recipe = slapos.cookbook:certificate_authority.request
-key-file = $${apache-%(backend_name)s:key-file}
-cert-file = $${apache-%(backend_name)s:cert-file}
-executable = $${apache-%(backend_name)s:wrapper}
-wrapper = $${basedirectory:services}/apache-%(backend_name)s
-
-[logrotate-entry-apache-public-%(backend_name)s]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = apache-public-%(backend_name)s
-log = $${apache-public-%(backend_name)s:error-log} $${apache-public-%(backend_name)s:access-log}
-post = ${buildout:bin-directory}/killpidfromfile $${apache-public-%(backend_name)s:pid-file} SIGUSR1
-
-[logrotate-entry-apache-%(backend_name)s]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = apache-%(backend_name)s
-log = $${apache-%(backend_name)s:error-log} $${apache-%(backend_name)s:access-log}
-post = ${buildout:bin-directory}/killpidfromfile $${apache-%(backend_name)s:pid-file} SIGUSR1
-
-[haproxy-%(backend_name)s]
-recipe = slapos.cookbook:haproxy
-name = %(backend_name)s
-conf-path = $${rootdirectory:etc}/haproxy-%(backend_name)s.cfg
-ip = $${slap-network-information:local-ipv4}
-port = %(haproxy_port)s
-maxconn = %(maxconn)s
-server-check-path = %(server_check_path)s
-wrapper-path = $${basedirectory:services}/haproxy-%(backend_name)s
-binary-path = ${haproxy:location}/sbin/haproxy
-backend-list = %(haproxy_backend_list)s

software/erp5/snippet-fontconfig.cfg

-[dynamic-fontconfig-instance]
-url-list = %(font_url_list)s

software/erp5/snippet-master.cfg

-[buildout]
-parts =
-  logrotate
-  cron
-  cron-entry-logrotate
-  certificate-authority
-  erp5-certificate-authority
-  tidstorage
-  cron-entry-tidstorage-backup
-  logrotate-entry-tidstorage
-  binary-link
-  erp5-promise
-  erp5-bootstrap
-  %(part_list)s
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[tidstorage]
-recipe = slapos.cookbook:tidstorage
-known-tid-storage-identifier-dict = %(known_tid_storage_identifier_dict)s
-base-url = http://$${%(haproxy_section)s:ip}:$${%(haproxy_section)s:port}/%%s/serialize
-configuration-path = $${rootdirectory:etc}/tidstorage.py
-ip = $${slap-network-information:local-ipv4}
-port = 6001
-timestamp-file-path = $${directory:tidstorage}/repozo_tidstorage_timestamp.log
-logfile-name = $${basedirectory:log}/tidstorage.log
-pidfile-name = $${basedirectory:run}/tidstorage.pid
-status-file = $${directory:tidstorage}/tidstorage.tid
-tidstorage-repozo-binary = ${buildout:bin-directory}/tidstorage_repozo
-tidstoraged-binary = ${buildout:bin-directory}/tidstoraged
-repozo-binary = ${buildout:bin-directory}/repozo
-tidstorage-wrapper = $${basedirectory:services}/tidstoraged
-repozo-wrapper = $${buildout:bin-directory}/tidstorage-repozo
-
-[cron-entry-tidstorage-backup]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = tidstorage
-frequency = 0 0 * * *
-command = $${tidstorage:repozo-wrapper}
-
-[logrotate-entry-tidstorage]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = tidstorage
-log = $${tidstorage:logfile-name}
-post = ${buildout:bin-directory}/killpidfromfile $${tidstorage:pidfile-name} SIGHUP
-
-[cron]
-recipe = slapos.cookbook:cron
-dcrond-binary = ${dcron:location}/sbin/crond
-cron-entries = $${directory:cron-entries}
-crontabs = $${directory:crontabs}
-cronstamps = $${directory:cronstamps}
-catcher = $${cron-simplelogger:wrapper}
-binary = $${basedirectory:services}/crond
-
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = $${rootdirectory:bin}/cron_simplelogger
-log = $${basedirectory:log}/cron.log
-
-[cron-entry-logrotate]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = logrotate
-frequency = 0 0 * * *
-command = $${logrotate:wrapper}
-
-[logrotate]
-recipe = slapos.cookbook:logrotate
-# Binaries
-logrotate-binary = ${logrotate:location}/usr/sbin/logrotate
-gzip-binary = ${gzip:location}/bin/gzip
-gunzip-binary = ${gzip:location}/bin/gunzip
-# Directories
-wrapper = $${rootdirectory:bin}/logrotate
-conf = $${rootdirectory:etc}/logrotate.conf
-logrotate-entries = $${directory:logrotate-entries}
-backup = $${directory:logrotate-backup}
-state-file = $${rootdirectory:srv}/logrotate.status
-
-[zeo-instance-entry-common]
-recipe = slapos.cookbook:zeo
-ip = $${slap-network-information:local-ipv4}
-binary-path = ${buildout:bin-directory}/runzeo
-
-[erp5-certificate-authority]
-recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
-ca-dir = $${directory:erp5-ca-dir}
-requests-directory = $${erp5-cadirectory:requests}
-wrapper = $${basedirectory:services}/erp5-ca
-ca-private = $${erp5-cadirectory:private}
-ca-certs = $${erp5-cadirectory:certs}
-ca-newcerts = $${erp5-cadirectory:newcerts}
-ca-crl = $${erp5-cadirectory:crl}
-country-code = %(erp5_ca_country_code)s
-email = %(erp5_ca_email)s
-state = %(erp5_ca_state)s
-city = %(erp5_ca_city)s
-company = %(erp5_ca_company)s
-
-[erp5-cadirectory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:erp5-ca-dir}/requests
-private = $${directory:erp5-ca-dir}/private
-certs = $${directory:erp5-ca-dir}/certs
-newcerts = $${directory:erp5-ca-dir}/newcerts
-crl = $${directory:erp5-ca-dir}/crl
-
-[certificate-authority]
-recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
-ca-dir = $${directory:ca-dir}
-requests-directory = $${cadirectory:requests}
-wrapper = $${basedirectory:services}/ca
-ca-private = $${cadirectory:private}
-ca-certs = $${cadirectory:certs}
-ca-newcerts = $${cadirectory:newcerts}
-ca-crl = $${cadirectory:crl}
-
-[cadirectory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${directory:ca-dir}/requests
-private = $${directory:ca-dir}/private
-certs = $${directory:ca-dir}/certs
-newcerts = $${directory:ca-dir}/newcerts
-crl = $${directory:ca-dir}/crl
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
-tmp = $${buildout:directory}/tmp
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log
-services = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-backup = $${rootdirectory:srv}/backup
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-tidstorage = $${rootdirectory:srv}/tidstorage
-zodb = $${rootdirectory:srv}/zodb
-zodb-backup = $${basedirectory:backup}/zodb
-instance = $${rootdirectory:srv}/erp5shared
-instance-etc = $${:instance}/etc
-apache-conf = $${rootdirectory:etc}/apache
-instance-etc-package-include = $${:instance}/etc/package-include
-# because of bug in slapos.recipe.template keys are lowercased
-instance-document = $${:instance}/Document
-instance-propertysheet = $${:instance}/PropertySheet
-instance-products = $${:instance}/Products
-instance-extensions = $${:instance}/Extensions
-instance-constraint = $${:instance}/Constraint
-instance-import = $${:instance}/import
-instance-lib = $${:instance}/lib
-instance-tests = $${:instance}/tests
-erp5-ca-dir = $${rootdirectory:srv}/erp5-ssl
-ca-dir = $${rootdirectory:srv}/ssl
-cron-entries = $${rootdirectory:etc}/cron.d
-crontabs = $${rootdirectory:etc}/crontabs
-cronstamps = $${rootdirectory:etc}/cronstamps
-logrotate-backup = $${basedirectory:backup}/logrotate
-logrotate-entries = $${rootdirectory:etc}/logrotate.d
-
-[binary-link]
-recipe = slapos.cookbook:symbolic.link
-target-directory = $${rootdirectory:bin}
-link-binary = 
-  ${coreutils:location}/bin/basename
-  ${coreutils:location}/bin/cat
-  ${coreutils:location}/bin/cp
-  ${coreutils:location}/bin/ls
-  ${coreutils:location}/bin/tr
-  ${coreutils:location}/bin/uname
-  ${git:location}/bin/git
-  ${graphviz:location}/bin/dot
-  ${grep:location}/bin/grep
-  ${imagemagick:location}/bin/convert
-  ${imagemagick:location}/bin/identify
-  ${mariadb:location}/bin/mysql
-  ${mariadb:location}/bin/mysqldump
-  ${pdftk:location}/bin/pdftk
-  ${sed:location}/bin/sed
-  ${tesseract:location}/bin/tesseract
-  ${w3m:location}/bin/w3m
-  ${poppler:location}/bin/pdfinfo
-  ${poppler:location}/bin/pdftotext
-  ${poppler:location}/bin/pdftohtml
-
-[erp5-bootstrap]
-recipe = slapos.cookbook:erp5.bootstrap
-runner-path = $${basedirectory:services}/erp5-bootstrap
-mysql-url = %(mysql-url)s
-zope-url = http://$${%(zope_section)s:user}:$${%(zope_section)s:password}@$${%(zope_section)s:ip}:$${%(zope_section)s:port}/%(site_id)s
-
-[erp5-promise]
-recipe = slapos.cookbook:erp5.promise
-promise-path = $${rootdirectory:etc}/erp5promise.cfg
-kumofs-url = %(kumofs-url)s
-memcached-url = %(memcached-url)s
-cloudooo-url = %(cloudooo-url)s
-smtp-url = $${slap-parameter:smtp-url}
-bt5 = $${slap-parameter:bt5}
-bt5-repository-url = $${slap-parameter:bt5-repository-url}
-

software/erp5/snippet-zeo.cfg

-[zeo-instance-%(zeo_id)s]
-<= zeo-instance-entry-common
-log-path = $${basedirectory:log}/zeo-%(zeo_id)s.log
-pid-path = $${basedirectory:run}/zeo-%(zeo_id)s.pid
-conf-path = $${rootdirectory:etc}/zeo-%(zeo_id)s.conf
-port = %(zeo_port)s
-storage =
-  %(storage_list)s
-wrapper-path = $${basedirectory:services}/zeo-%(zeo_id)s
-
-[logrotate-entry-zeo-%(zeo_id)s]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = zeo-%(zeo_id)s
-log = $${zeo-instance-%(zeo_id)s:log-path}
-post = ${buildout:bin-directory}/killpidfromfile $${zeo-instance-%(zeo_id)s:pid-path} SIGUSR2

software/erp5/snippet-zope.cfg

-[%(zope_id)s]
-recipe = slapos.cookbook:generic.zope.zeo.client
-
-# XXX: products won't be needed as soon as all ERP5 (and products-deps)
-# products will be eggified so then it will be possible to use them thanks to
-# availability in software's eggs
-products = ${products:list}
-
-# Options
-user = zope
-port = %(zope_port)s
-ip = $${slap-network-information:local-ipv4}
-thread-amount = %(zope_thread_amount)s
-deadlock-path = /manage_debug_threads
-timezone = %(timezone)s
-zeo-connection-string =
-  %(zeo_connection_string)s
-
-timeserver = %(zope_timeserver)s
-tidstorage-ip = $${tidstorage:ip}
-tidstorage-port = $${tidstorage:port}
-
-# long request
-longrequest-logger-file = %(longrequest_logger_file)s
-longrequest-logger-timeout = %(longrequest_logger_timeout)s
-longrequest-logger-interval = %(longrequest_logger_interval)s
-
-# Paths
-wrapper = $${basedirectory:services}/%(zope_id)s
-instance-path = $${directory:instance}
-instance-etc = $${directory:instance-etc}
-instance-products = $${directory:instance-products}
-bt5-repository = $${rootdirectory:var}/bt5_repository
-tmp-path = $${rootdirectory:tmp}
-bin-path = $${rootdirectory:bin}
-site-zcml = $${:instance-etc}/site.zcml
-pid-file = $${basedirectory:run}/%(zope_id)s.pid
-lock-file = $${basedirectory:run}/%(zope_id)s.lock
-event-log = $${basedirectory:log}/%(zope_id)s-event.log
-z2-log = $${basedirectory:log}/%(zope_id)s-Z2.log
-configuration-file = $${rootdirectory:etc}/%(zope_id)s.conf
-inituser = $${:instance-path}/inituser
-# Binary information
-runzope-binary = ${buildout:bin-directory}/runzope
-
-# BT5 Configuration
-bt5-repository-list =
-
-promise-path = $${erp5-promise:promise-path}
-site-id = %(site_id)s
-
-[logrotate-entry-%(zope_id)s]
-<= logrotate
-recipe = slapos.cookbook:logrotate.d
-name = %(zope_id)s
-log = $${%(zope_id)s:event-log} $${%(zope_id)s:z2-log}
-post = ${buildout:bin-directory}/killpidfromfile $${%(zope_id)s:pid-file} SIGUSR2

software/ezpublish/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/joomla/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/kvm/README.txt

+kvm
+===
+
+Introduction
+------------
+
+This software release is used to deploy KVM instances, NBD instances and
+Frontend instances of KVM.
+
+Examples
+--------
+
+The following examples listhow to request different possible instances of KVM
+Software Release from slap console or command line.
+
+KVM instance (1GB of RAM, 10GB of SSD, one core)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Note that the KVM instance will request a frontend slave instance in order
+to be accessible from IPv4.
+
+KVM instance needs a NBD to fetch disk image at first boot. Working NBD IP/port
+has to be specified.
+
+::
+  myawesomekvm = request(
+      software_release=kvm,
+      partition_reference="myawesomekvm",
+      partition_parameter_kw={
+          "ndb_ip":"2a01:e35:2e27:460:e2cb:4eff:fed9:48dc",
+          "ndb_port": 1024
+      }
+  )
+
+
+KVM+ instance (2GB of RAM, 20GB of SSD, two cores)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+::
+  myevenmoreawesomekvm = request(
+      software_release=kvm,
+      partition_reference="myevenmoreawesomekvm",
+      partition_parameter_kw={
+          "ndb_ip":"2a01:e35:2e27:460:e2cb:4eff:fed9:48dc",
+          "ndb_port": 1024
+      },
+      software_type="kvm+",
+  )
+
+
+NBD instance
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This type of instance will allow to host a disk image that will be used by
+any KVM instance.
+
+::
+  mynbd = request(
+      software_release=kvm,
+      partition_reference="mynbd",
+      software_type="nbd",
+  )
+
+
+KVM Frontend Master Instance (will host all frontend Slave Instances)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This type of instance will allow to host any frontend slave instance requested
+by KVM instances. Slave instances (and thus KVM instance) will be accessible
+at : https://mydomain.com/instancereference .
+
+::
+  mykvmfrontend = request(
+      software_release=kvm,
+      partition_reference="mykvmfrontend",
+      partition_parameter_kw={
+          "domain":"mydomain.com"
+      },
+      software_type="frontend",
+  )

software/lamp-template/instance.cfg

@@ -11,7 +11,8 @@ template = ${application-template:location}/${application-template:filename}
 configuration = ${application-configuration:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/lamp-template/software.cfg

@@ -7,7 +7,6 @@ parts =
   mariadb
   eggs
   instance-recipe-egg
-  downloadcache-workaround
   
 extends =
   ../../stack/lamp.cfg
@@ -18,7 +17,6 @@ url = Student shall put here url of zipped or tarballed web page or application
 md5sum = Student may put here md5sum of this file, this is good idea
 #If provided tarball does not contain top directory, option shall be changed to false
 strip-top-level-dir = true
-#extract-directory = 
 
 [application-template]
 recipe = slapos.recipe.download
@@ -43,91 +41,7 @@ url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-[mariadb]
-keep-compile-dir = false
-
 [instance-recipe-egg]
 recipe = zc.recipe.egg
 eggs = 
   ${instance-recipe:egg}
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-003
-# Generated by buildout-versions
-Jinja2 = 2.6
-Werkzeug = 0.8.2
-buildout-versions = 1.7
-hexagonit.recipe.cmmi = 1.5.0
-meld3 = 0.6.8
-plone.recipe.command = 1.1
-slapos.cookbook = 0.20
-slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
-slapos.recipe.template = 2.2
-
-# Required by:
-# slapos.core==0.21
-Flask = 0.8
-
-# Required by:
-# slapos.cookbook==0.38
-PyXML = 0.8.4
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# Required by:
-# slapos.cookbook==0.38
-# slapos.core==0.21
-# xml-marshaller==0.9.7
-lxml = 2.3.3
-
-# Required by:
-# slapos.cookbook==0.38
-netaddr = 0.7.6
-
-# Required by:
-# slapos.core==0.21
-netifaces = 0.6
-
-# Required by:
-# slapos.cookbook==0.38
-# slapos.core==0.21
-# zc.buildout==1.6.0-dev-SlapOS-003
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
-
-# Required by:
-# slapos.cookbook==0.38
-slapos.core = 0.21
-
-# Required by:
-# slapos.core==0.21
-supervisor = 3.0a12
-
-# Required by:
-# slapos.cookbook==0.38
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.38
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.21
-zope.interface = 3.8.0
-
-[downloadcache-workaround]
-# workaround irritating problem of hexagonit.recipe.cmmi which automatically
-# creates download cache, which in turn switches builout to "semi-offline" mode
-recipe = plone.recipe.command
-# in hexagonit.recipe.cmmi if there is no ${buildout:download-cache} set it resolves
-# to ${buildout:directory}/downloads but this variable is available late, that's
-# why it is hardcoded only for required case
-download-cache = ${buildout:directory}/downloads
-command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
-update-command = ${:command}
-stop-on-error = True
-

software/magento/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/mariadb/instance-mariadb.cfg

@@ -43,13 +43,13 @@ error-log = $${basedirectory:log}/mariadb_error.log
 slow-query-log = $${basedirectory:log}/mariadb_slowquery.log
 conf-file = $${rootdirectory:etc}/mariadb.cnf
 backup-pending-directory = $${directory:mariadb-backup-pending}
-dumpname = dump.sql.gz
 
 # Binary information
+mysql-base-directory = ${mariadb:location}
 mysql-binary = ${mariadb:location}/bin/mysql
-mysql-install-binary = ${mariadb:location}/bin/mysql_install_db
+mysql-install-binary = ${mariadb:location}/scripts/mysql_install_db
 mysql-upgrade-binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld-binary = ${mariadb:location}/libexec/mysqld
+mysqld-binary = ${mariadb:location}/bin/mysqld
 mysqldump-binary = ${mariadb:location}/bin/mysqldump
 gzip-binary = $${buildout:gzip-binary}
 zcat-binary = ${gzip:location}/bin/zcat

software/mariadb/software.cfg

@@ -86,7 +86,7 @@ mode = 0644
 [instance-mariadb]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
-md5sum = 737a6d2f1ea9938b8d76e2d35e18e482
+md5sum = 135ad8e59a45e053f3aaf75deb35c5b0
 output = ${buildout:directory}/template-mariadb.cfg
 mode = 0644
 

software/net2ftp/instance.cfg

@@ -12,10 +12,11 @@ configuration = ${application-configuration:location}
 lampconfigure_directory = ${buildout:bin-directory}/lampconfigure
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
 
 #delete = 
 #rename = 

software/openX/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/os-commerce/instance.cfg

@@ -9,7 +9,8 @@ recipe = ${instance-recipe:egg}:${instance-recipe:module}
 source = ${application:location}
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld

software/phpbb/instance.cfg

@@ -10,10 +10,11 @@ source = ${application:location}
 lampconfigure_directory = ${buildout:bin-directory}/lampconfigure
 
 httpd_binary = ${apache:location}/bin/httpd
+mysql_base_directory = ${mariadb:location}
 mysql_binary = ${mariadb:location}/bin/mysql
-mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_install_binary = ${mariadb:location}/scripts/mysql_install_db
 mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
-mysqld_binary = ${mariadb:location}/libexec/mysqld
+mysqld_binary = ${mariadb:location}/bin/mysqld
 
 delete = install
 #rename =