Merge remote-tracking branch 'origin/erp5-generic' into kvm

Conflicts:
	component/git/buildout.cfg

MANIFEST.in

 include CHANGES.txt
-include slapos/recipe/erp5/template/site.zcml
+include slapos/recipe/generic_zope/template/site.zcml
 recursive-include slapos/recipe *.in
 recursive-include slapos/recipe *.bin
 recursive-include slapos/recipe README.*.txt

component/gdbm/buildout.cfg

@@ -4,9 +4,9 @@ parts =
 
 [gdbm]
 recipe = hexagonit.recipe.cmmi
-version = 1.9.1
+version = 1.10
 url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
-md5sum = 59f6e4c4193cb875964ffbe8aa384b58
+md5sum = 88770493c2559dc80b561293e39d3570
 configure-options =
   --disable-static
 # install as parts/gdbm/include/gdbm/*.h etc. because some softwares

component/git/buildout.cfg

@@ -15,8 +15,8 @@ parts =
 recipe = hexagonit.recipe.cmmi
 # url = http://kernel.org/pub/software/scm/git/git-1.7.4.5.tar.bz2
 # Circumvent kernel.org downtime
-url = http://git-core.googlecode.com/files/git-1.7.7.4.tar.gz
-md5sum = 2f3277475b8da2eb92cef54c4c641a2c
+url = http://git-core.googlecode.com/files/git-1.7.8.tar.gz
+md5sum = 4a3c03a04dbb857ecc875dae1278b76e
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/groonga/buildout.cfg

@@ -3,14 +3,41 @@
 # http://groonga.org/
 
 [buildout]
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../glib/buildout.cfg
+  ../libtool/buildout.cfg
+  ../pkgconfig/buildout.cfg
 parts =
   groonga
 
+[groonga-1.2.8-configure-Wno-cflags-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = b48ac46c7de0ed4c0e632e06118b8a58
+filename = groonga-1.2.8-configure-Wno-cflags.patch
+download-only = true
+
 [groonga]
 recipe = hexagonit.recipe.cmmi
 url = http://packages.groonga.org/source/groonga/groonga-1.2.8.tar.gz
 md5sum = a319b1f3a55cbf250ef5255f5c51ff46
+patch-options = -p0
+patches =
+  ${groonga-1.2.8-configure-Wno-cflags-patch:location}/${groonga-1.2.8-configure-Wno-cflags-patch:filename}
+environment =
+  PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:%(PATH)s
+configure-command =
+  aclocal -I ${glib:location}/share/aclocal -I ${libtool:location}/share/aclocal -I ${pkgconfig:location}/share/aclocal -I .
+  libtoolize -c -f
+  autoheader
+  automake -c -a -f
+  autoconf
+  ./configure
 configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --disable-static
   --disable-glibtest
+  --disable-benchmark
   --without-mecab

component/groonga/groonga-1.2.8-configure-Wno-cflags.patch

+--- configure.ac.orig	2011-12-06 12:54:26.812408976 +0900
++++ configure.ac	2011-12-06 13:17:39.060465045 +0900
+@@ -70,9 +70,10 @@
+           m4_pattern_allow(PKG_CONFIG_LIBDIR)])
+ 
+ AC_DEFUN([CHECK_CFLAG], [
++  cflag=$(echo "$1" | sed -e 's,^-Wno-,-W,')
+   AC_MSG_CHECKING([if gcc supports $1])
+   old_CFLAGS=$CFLAGS
+-  CFLAGS="$CFLAGS $1 -Werror"
++  CFLAGS="$CFLAGS $cflag -Werror"
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
+     [check_cflag=yes],
+     [check_cflag=no])
+@@ -84,9 +85,10 @@
+ ])
+ 
+ AC_DEFUN([CHECK_CXXFLAG], [
++  cxxflag=$(echo "$1" | sed -e 's,^-Wno-,-W,')
+   AC_MSG_CHECKING([if g++ supports $1])
+   old_CXXFLAGS=$CXXFLAGS
+-  CXXFLAGS="$CXXFLAGS $1 -Werror"
++  CXXFLAGS="$CXXFLAGS $cxxflag -Werror"
+   AC_LANG_PUSH([C++])
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
+     [check_cxxflag=yes],

component/imagemagick/buildout.cfg

@@ -25,18 +25,10 @@ md5sum = 3f28ecd9f6722cf2c3238ce6ec3d7a68
 download-only = true
 filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
 
-[imagemagick-6.6.7-4-without-lzma.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-path = ${:filename}
-md5sum = 04e1b934a58f4b3a83e4df148795b338
-download-only = true
-filename = imagemagick-6.6.7-4-without-lzma.patch
-
 [imagemagick]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.3-1.tar.bz2
-md5sum = 89d378733d89bc61c04bc0fdc140a3a7
+url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.3-10.tar.bz2
+md5sum = 3c1d1a04b1ed2998217e16001b58069f
 configure-options =
   --disable-static
   --without-x
@@ -55,6 +47,7 @@ configure-options =
   --without-lqr
   --without-lzma
   --without-openexr
+  --without-pango
   --without-rsvg
   --without-wmf
   --without-xml
@@ -66,7 +59,6 @@ configure-options =
 patch-options = -p1
 patches =
   ${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:location}/${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:filename}
-  ${imagemagick-6.6.7-4-without-lzma.patch:location}/${imagemagick-6.6.7-4-without-lzma.patch:filename}
 environment =
   PATH=${freetype:location}/bin:${ghostscript:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig

component/imagemagick/imagemagick-6.6.7-4-without-lzma.patch

---- ImageMagick-6.6.7-4/configure~	2011-02-10 11:50:21.704561096 +0100
-+++ ImageMagick-6.6.7-4/configure	2011-02-10 12:23:45.612561097 +0100
-@@ -28251,7 +28251,7 @@
- #
- have_lzma='no'
- LZMA_LIBS=''
--if test "$with_lzma" != 'no' || test "$with_tiff" != 'no'; then
-+if test "$with_lzma" != 'no'; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
- $as_echo "-------------------------------------------------------------" >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LZMA" >&5
---- ImageMagick-6.6.7-4/configure.ac~	2011-02-10 11:50:21.693561096 +0100
-+++ ImageMagick-6.6.7-4/configure.ac	2011-02-10 12:23:40.013561098 +0100
-@@ -2290,7 +2290,7 @@
- #
- have_lzma='no'
- LZMA_LIBS=''
--if test "$with_lzma" != 'no' || test "$with_tiff" != 'no'; then
-+if test "$with_lzma" != 'no'; then
-     AC_MSG_RESULT([-------------------------------------------------------------])
-   AC_MSG_CHECKING(for LZMA)
-   AC_MSG_RESULT()

component/mariadb/buildout.cfg

@@ -22,9 +22,9 @@ download-only = true
 
 [mariadb]
 recipe = hexagonit.recipe.cmmi
-version = 5.3.2-beta
+version = 5.3.3-rc
 url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
-md5sum = d8199454059ab2c98313aaad0c1bc318
+md5sum = 715c61bb101acc7d37e893f6a9de9267
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 # configure: how to avoid searching for my.cnf?
@@ -56,8 +56,8 @@ patch-options = -p0
 patches =
   ${mariadb-no_test-patch:location}/${mariadb-no_test-patch:filename}
 environment =
-  CPPFLAGS=-I${ncurses:location}/include -I${readline:location}/include
-  LDFLAGS=-Wl,-rpath=${libevent:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${zlib:location}/lib
+  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

component/readline/buildout.cfg

 [buildout]
 parts =
+  readline5
   readline
 extends =
   ../ncurses/buildout.cfg
 
+# readline-5.x is still used for GPL2 only softwares.
+[readline5]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz
+md5sum = e39331f32ad14009b9ff49cc10c5e751
+configure-options =
+  --enable-multibyte
+  --disable-static
+  --with-ncurses=${ncurses:location}
+environment =
+    LDFLAGS =-Wl,-rpath=${ncurses:location}/lib
+
 [readline]
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz

component/zabbix/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [zabbix-agent]
 recipe = hexagonit.recipe.cmmi
-url = http://prdownloads.sourceforge.net/zabbix/zabbix-1.8.5.tar.gz?download
-md5sum = 58b9253fb0eace1e20b2fe5c1fce32a3
+url = http://prdownloads.sourceforge.net/zabbix/zabbix-1.8.9.tar.gz?download
+md5sum = fc8c7fad2943dea73d4f2338cd216715
 configure-options =
   --enable-agent
   --enable-ipv6

setup.py

@@ -39,6 +39,7 @@ setup(name=name,
       zip_safe=True,
       entry_points={
         'zc.buildout': [
+          'apache.zope.backend = slapos.recipe.apache_zope_backend:Recipe',
           'certificate_authority = slapos.recipe.certificate_authority:Recipe',
           'certificate_authority.request = slapos.recipe.certificate_authority:Request',
           'check_port_listening = slapos.recipe.check_port_listening:Recipe',
@@ -46,20 +47,25 @@ setup(name=name,
           'cron.d = slapos.recipe.dcron:Part',
           'davstorage = slapos.recipe.davstorage:Recipe',
           'duplicity = slapos.recipe.duplicity:Recipe',
-          'erp5 = slapos.recipe.erp5:Recipe',
           'erp5testnode = slapos.recipe.erp5testnode:Recipe',
           'generate.mac = slapos.recipe.generatemac:Recipe',
           'generic.kvm = slapos.recipe.generic_kvm:Recipe',
           'generic.novnc = slapos.recipe.generic_novnc:Recipe',
           'helloworld = slapos.recipe.helloworld:Recipe',
+          'generic.cloudooo = slapos.recipe.generic_cloudooo:Recipe',
+          'fontconfig = slapos.recipe.fontconfig:Recipe',
           'java = slapos.recipe.java:Recipe',
           'kumofs = slapos.recipe.kumofs:Recipe',
+          'generic.kumofs = slapos.recipe.generic_kumofs:Recipe',
+          'haproxy = slapos.recipe.haproxy:Recipe',
           'kvm = slapos.recipe.kvm:Recipe',
           'kvm_frontend = slapos.recipe.kvm_frontend:Recipe',
           'libcloud = slapos.recipe.libcloud:Recipe',
           'libcloudrequest = slapos.recipe.libcloudrequest:Recipe',
           'memcached = slapos.recipe.memcached:Recipe',
+          'generic.memcached = slapos.recipe.generic_memcached:Recipe',
           'mysql = slapos.recipe.mysql:Recipe',
+          'generic.mysql = slapos.recipe.generic_mysql:Recipe',
           'mkdirectory = slapos.recipe.mkdirectory:Recipe',
           'nbdserver = slapos.recipe.nbdserver:Recipe',
           'nosqltestbed = slapos.recipe.nosqltestbed:NoSQLTestBed',
@@ -69,18 +75,29 @@ setup(name=name,
           'lamp.simple = slapos.recipe.lamp:Simple',
           'logrotate = slapos.recipe.logrotate:Recipe',
           'logrotate.d = slapos.recipe.logrotate:Part',
+          'publish = slapos.recipe.publish:Recipe',
           'publishurl = slapos.recipe.publishurl:Recipe',
           'proactive = slapos.recipe.proactive:Recipe',
           'request = slapos.recipe.request:Recipe',
           'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',
+          'symbolic.link = slapos.recipe.symbolic_link:Recipe',
           'softwaretype = slapos.recipe.softwaretype:Recipe',
           'siptester = slapos.recipe.siptester:SipTesterRecipe',
           'simplelogger = slapos.recipe.simplelogger:Recipe',
           'slaprunner = slapos.recipe.slaprunner:Recipe',
+          'sphinx= slapos.recipe.sphinx:Recipe',
           'stunnel = slapos.recipe.stunnel:Recipe',
           'testnode = slapos.recipe.testnode:Recipe',
           'vifib = slapos.recipe.vifib:Recipe',
           'xwiki = slapos.recipe.xwiki:Recipe',
           'zabbixagent = slapos.recipe.zabbixagent:Recipe',
+          'generic.zope = slapos.recipe.generic_zope:Recipe',
+          'generic.zope.zeo.client = slapos.recipe.generic_zope_zeo_client:Recipe',
+          '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.update = slapos.recipe.erp5_update:Recipe',
+          'erp5.test = slapos.recipe.erp5_test:Recipe',
       ]},
     )

slapos/recipe/apache_zope_backend/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+import pkg_resources
+
+class Recipe(GenericBaseRecipe):
+  def install(self):
+    path_list = []
+    ip = self.options['ip']
+    port = self.options['port']
+    backend = self.options['backend']
+    key = self.options['key-file']
+    certificate = self.options['cert-file']
+    access_control_string = self.options['access-control-string']
+    apache_conf = dict()
+    apache_conf['pid_file'] = self.options['pid-file']
+    apache_conf['lock_file'] = self.options['lock-file']
+    apache_conf['ip'] = ip
+    apache_conf['port'] = port
+    apache_conf['server_admin'] = 'admin@'
+    apache_conf['error_log'] = self.options['error-log']
+    apache_conf['access_log'] = self.options['access-log']
+    apache_conf['server_name'] = '%s' % apache_conf['ip']
+    apache_conf['certificate'] = certificate
+    apache_conf['key'] = key
+    apache_conf['path'] = '/'
+    apache_conf['access_control_string'] = access_control_string
+    apache_conf['rewrite_rule'] = "RewriteRule (.*) %s$1 [L,P]" % backend
+    apache_conf_string = pkg_resources.resource_string(__name__,
+          'template/apache.zope.conf.in') % apache_conf
+    apache_config_file = self.createFile(self.options['configuration-file'],
+      apache_conf_string)
+    path_list.append(apache_config_file)
+    wrapper = self.createPythonScript(self.options['wrapper'], __name__ +
+      '.apache.runApache', [
+            dict(
+              required_path_list=[key, certificate],
+              binary=self.options['apache-binary'],
+              config=apache_config_file
+            )
+          ])
+    path_list.append(wrapper)
+    return path_list

slapos/recipe/apache_zope_backend/apache.py

+import os
+import sys
+import time
+
+
+def runApache(args):
+  sleep = 60
+  conf = args[0]
+  while True:
+    ready = True
+    for f in conf.get('required_path_list', []):
+      if not os.path.exists(f):
+        print 'File %r does not exists, sleeping for %s' % (f, sleep)
+        ready = False
+    if ready:
+      break
+    time.sleep(sleep)
+  apache_wrapper_list = [conf['binary'], '-f', conf['config'], '-DFOREGROUND']
+  apache_wrapper_list.extend(sys.argv[1:])
+  sys.stdout.flush()
+  sys.stderr.flush()
+  os.execl(apache_wrapper_list[0], *apache_wrapper_list)

slapos/recipe/apache_zope_backend/template/apache.zope.conf.in

+# Apache configuration file for Zope
+# Automatically generated
+
+# List of modules
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule ssl_module modules/mod_ssl.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule dav_module modules/mod_dav.so
+LoadModule dav_fs_module modules/mod_dav_fs.so
+LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule headers_module modules/mod_headers.so
+
+# Basic server configuration
+PidFile "%(pid_file)s"
+LockFile "%(lock_file)s"
+Listen %(ip)s:%(port)s
+ServerAdmin %(server_admin)s
+TypesConfig conf/mime.types
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+
+# As backend is trusting REMOTE_USER header unset it always
+RequestHeader unset REMOTE_USER
+
+# SSL Configuration
+SSLEngine on
+SSLCertificateFile %(certificate)s
+SSLCertificateKeyFile %(key)s
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+
+SSLProxyEngine On
+
+# Log configuration
+ErrorLog "%(error_log)s"
+# Default apache log format with request time in microsecond at the end
+LogFormat "%%h %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\" %%D" combined
+CustomLog "%(access_log)s" combined
+
+# Directory protection
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+</Directory>
+
+# Path protected
+<Location %(path)s>
+  Order Deny,Allow
+  Deny from all
+  Allow from %(access_control_string)s
+</Location>
+
+# Magic of Zope related rewrite
+RewriteEngine On
+%(rewrite_rule)s

slapos/recipe/dcron.py

@@ -58,13 +58,10 @@ class Recipe(GenericBaseRecipe):
 
 class Part(GenericBaseRecipe):
 
-  def _options(self, options):
-    if 'name' not in options:
-      options['name'] = self.name
-
   def install(self):
     cron_d = self.options['cron-entries']
-    filename = os.path.join(cron_d, 'name')
+    name = self.options['name']
+    filename = os.path.join(cron_d, name)
 
     with open(filename, 'w') as part:
       part.write('%(frequency)s %(command)s\n' % {

slapos/recipe/erp5/catdatefile.py

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

slapos/recipe/erp5/certificate_authority.py

-import os
-import subprocess
-import time
-import ConfigParser
-
-
-def popenCommunicate(command_list, input=None):
-  subprocess_kw = dict(stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-  if input is not None:
-    subprocess_kw.update(stdin=subprocess.PIPE)
-  popen = subprocess.Popen(command_list, **subprocess_kw)
-  result = popen.communicate(input)[0]
-  if popen.returncode is None:
-    popen.kill()
-  if popen.returncode != 0:
-    raise ValueError('Issue during calling %r, result was:\n%s' % (
-      command_list, result))
-  return result
-
-
-class CertificateAuthority:
-  def __init__(self, key, certificate, openssl_binary,
-      openssl_configuration, request_dir):
-    self.key = key
-    self.certificate = certificate
-    self.openssl_binary = openssl_binary
-    self.openssl_configuration = openssl_configuration
-    self.request_dir = request_dir
-
-  def checkAuthority(self):
-    file_list = [ self.key, self.certificate ]
-    ca_ready = True
-    for f in file_list:
-      if not os.path.exists(f):
-        ca_ready = False
-        break
-    if ca_ready:
-      return
-    for f in file_list:
-      if os.path.exists(f):
-        os.unlink(f)
-    try:
-      # no CA, let us create new one
-      popenCommunicate([self.openssl_binary, 'req', '-nodes', '-config',
-          self.openssl_configuration, '-new', '-x509', '-extensions',
-          'v3_ca', '-keyout', self.key, '-out', self.certificate,
-          '-days', '10950'], 'Automatic Certificate Authority\n')
-    except:
-      try:
-        for f in file_list:
-          if os.path.exists(f):
-            os.unlink(f)
-      except:
-        # do not raise during cleanup
-        pass
-      raise
-
-  def _checkCertificate(self, common_name, key, certificate):
-    file_list = [key, certificate]
-    ready = True
-    for f in file_list:
-      if not os.path.exists(f):
-        ready = False
-        break
-    if ready:
-      return False
-    for f in file_list:
-      if os.path.exists(f):
-        os.unlink(f)
-    csr = certificate + '.csr'
-    try:
-      popenCommunicate([self.openssl_binary, 'req', '-config',
-        self.openssl_configuration, '-nodes', '-new', '-keyout',
-        key, '-out', csr, '-days', '3650'],
-        common_name + '\n')
-      try:
-        popenCommunicate([self.openssl_binary, 'ca', '-batch', '-config',
-          self.openssl_configuration, '-out', certificate,
-          '-infiles', csr])
-      finally:
-        if os.path.exists(csr):
-          os.unlink(csr)
-    except:
-      try:
-        for f in file_list:
-          if os.path.exists(f):
-            os.unlink(f)
-      except:
-        # do not raise during cleanup
-        pass
-      raise
-    else:
-      return True
-
-  def checkRequestDir(self):
-    for request_file in os.listdir(self.request_dir):
-      parser = ConfigParser.RawConfigParser()
-      parser.readfp(open(os.path.join(self.request_dir, request_file), 'r'))
-      if self._checkCertificate(parser.get('certificate', 'name'),
-          parser.get('certificate', 'key_file'), parser.get('certificate',
-            'certificate_file')):
-        print 'Created certificate %r' % parser.get('certificate', 'name')
-
-def runCertificateAuthority(args):
-  ca_conf = args[0]
-  ca = CertificateAuthority(ca_conf['key'], ca_conf['certificate'],
-      ca_conf['openssl_binary'], ca_conf['openssl_configuration'],
-      ca_conf['request_dir'])
-  while True:
-    ca.checkAuthority()
-    ca.checkRequestDir()
-    time.sleep(60)

slapos/recipe/erp5/killpidfromfile.py

-import sys
-import os
-import signal
-def killpidfromfile():
-  file = sys.argv[1]
-  sig = getattr(signal, sys.argv[2], None)
-  if sig is None:
-    raise ValueError('Unknwon signal name %s' % sys.argv[2])
-  if os.path.exists(file):
-    pid = int(open(file).read())
-    print 'Killing pid %s with signal %s' % (pid, sys.argv[2])
-    os.kill(pid, sig)

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

@@ -3,5 +3,7 @@ SSLCertificateFile %(login_certificate)s
 SSLCertificateKeyFile %(login_key)s
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
+SSLProtocol -ALL +SSLv3 +TLSv1
+SSLCipherSuite ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM
 
 SSLProxyEngine On

slapos/recipe/erp5/template/apache.zope.conf.in

@@ -26,6 +26,10 @@ TypesConfig conf/mime.types
 AddType application/x-compress .Z
 AddType application/x-gzip .gz .tgz
 
+ServerTokens Prod
+ServerSignature Off
+TraceEnable Off
+
 # As backend is trusting REMOTE_USER header unset it always
 RequestHeader unset REMOTE_USER
 

slapos/recipe/erp5/template/logrotate_entry.in

-%(file_list)s {
-  daily
-  dateext
-  rotate 3650
-  compress
-  notifempty
-  sharedscripts
-  create
-  postrotate
-    %(postrotate)s
-  endscript
-  olddir %(olddir)s
-}

slapos/recipe/erp5/template/tidstorage.py.in

-known_tid_storage_identifier_dict = %(known_tid_storage_identifier_dict)s
-base_url = '%(base_url)s'
-address = '%(host)s'
-port = %(port)s
-
-#fork = False
-#setuid = None
-#setgid = None
-burst_period = 30
-full_dump_period = 300
-
-timestamp_file_path = '%(timestamp_file_path)s'
-logfile_name = '%(logfile)s'
-pidfile_name = '%(pidfile)s'
-status_file = '%(statusfile)s'

slapos/recipe/erp5/template/zope-deadlockdebugger-snippet.conf.in

-
-# DeadlockDebugger configuration
-<product-config DeadlockDebugger>
-  dump_url %(dump_url)s
-  secret %(secret)s
-</product-config>
-

slapos/recipe/erp5/template/zope-tidstorage-snippet.conf.in

-
-# TIDStorage connection
-<product-config TIDStorage>
-  backend-ip %(host)s
-  backend-port %(port)s
-</product-config>

slapos/recipe/erp5/template/zope-zeo-snippet.conf.in

-<zodb_db %(storage_name)s>
-  cache-size %(zodb_cache_size)d
-  mount-point %(mount_point)s
-  <zeoclient>
-    cache-size %(zeo_client_cache_size)s
-    server %(address)s
-    storage %(storage_name)s
-    name %(storage_name)s
-  </zeoclient>
-</zodb_db>

slapos/recipe/erp5/template/zope-zodb-snippet.conf.in

-<zodb_db root>
-    cache-size %(zodb_cache_size)d
-    <filestorage>
-      path %(zodb_root_path)s
-    </filestorage>
-    mount-point /
-</zodb_db>

slapos/recipe/erp5/test_suite_runner.py

-import os
-import sys
-def runTestSuite(args):
-  env = os.environ.copy()
-  d = args[0]
-  env['OPENSSL_BINARY'] = d['openssl_binary']
-  env['TEST_CA_PATH'] = d['test_ca_path']
-  env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
-  env['INSTANCE_HOME'] = d['instance_home']
-  env['REAL_INSTANCE_HOME'] = d['instance_home']
-  # Deal with Shebang size limitation
-  executable_filepath = d['call_list'][0]
-  file_object = open(executable_filepath, 'r')
-  line = file_object.readline()
-  file_object.close()
-  argument_list = []
-  if line[:2] == '#!':
-    executable_filepath = line[2:].strip()
-    argument_list.append(executable_filepath)
-  argument_list.extend(d['call_list'])
-  argument_list.extend(sys.argv[1:])
-  argument_list.append(env)
-  os.execle(executable_filepath, *argument_list)

slapos/recipe/erp5/testrunner.py

-import os
-import sys
-def runUnitTest(args):
-  env = os.environ.copy()
-  d = args[0]
-  env['OPENSSL_BINARY'] = d['openssl_binary']
-  env['TEST_CA_PATH'] = d['test_ca_path']
-  env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
-  env['INSTANCE_HOME'] = d['instance_home']
-  env['REAL_INSTANCE_HOME'] = d['instance_home']
-  # Deal with Shebang size limitation
-  executable_filepath = d['call_list'][0]
-  file_object = open(executable_filepath, 'r')
-  line = file_object.readline()
-  file_object.close()
-  argument_list = []
-  if line[:2] == '#!':
-    executable_filepath = line[2:].strip()
-    argument_list.append(executable_filepath)
-  argument_list.extend(d['call_list'])
-  argument_list.extend(sys.argv[1:])
-  argument_list.append(env)
-  os.execle(executable_filepath, *argument_list)

slapos/recipe/erp5_test/__init__.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+import urlparse
+
+class Recipe(GenericBaseRecipe):
+  def install(self):
+    testinstance = self.options['test-instance-path']
+    mysql_connection_string_list = []
+    path_list = []
+    # XXX: assume existence of 100 test databases, because slaves are not
+    # functional yet in slapos: testdb_0...testdb_100, with testuser_N
+    mysql_template = "%s@%s:%s %s %s"
+    mysql_parsed = urlparse.urlparse(self.options['mysql-url'])
+    for i in range(0, 100):
+      mysql_connection_string_list.append(mysql_template % ('testdb_%s'% i,
+        mysql_parsed.hostname, mysql_parsed.port, 'testuser_%s'% i, mysql_parsed.password))
+    mysql_connection_string = mysql_template % ('erp5_test', mysql_parsed.hostname,
+      mysql_parsed.port, 'erp5_test', mysql_parsed.password)
+    cloudooo_parsed = urlparse.urlparse(self.options['cloudooo-url'])
+    memcached_parsed = urlparse.urlparse(self.options['memcached-url'])
+    kumofs_parsed = urlparse.urlparse(self.options['kumofs-url'])
+    common_dict = dict(
+        instance_home=testinstance,
+        prepend_path=self.options['prepend-path'],
+        openssl_binary=self.options['openssl-binary'],
+        test_ca_path=self.options['certificate-authority-path'],
+    )
+    common_list = [
+      '--conversion_server_hostname=%s' % cloudooo_parsed.hostname,
+      '--conversion_server_port=%s' % cloudooo_parsed.port,
+      '--volatile_memcached_server_hostname=%s' % memcached_parsed.hostname,
+      '--volatile_memcached_server_port=%s' % memcached_parsed.port,
+      '--persistent_memcached_server_hostname=%s' % kumofs_parsed.hostname,
+      '--persistent_memcached_server_port=%s' % kumofs_parsed.port,
+    ]
+    path_list.append(self.createPythonScript(self.options['run-unit-test'],
+        __name__ + '.test.runUnitTest', [dict(
+        call_list=[self.options['run-unit-test-binary'],
+          '--erp5_sql_connection_string', mysql_connection_string,
+          '--extra_sql_connection_string_list', ','.join(
+            mysql_connection_string_list),
+          ] + common_list, **common_dict)]))
+    path_list.append(self.createPythonScript(self.options['run-test-suite'],
+        __name__ + '.test.runUnitTest', [dict(
+        call_list=[self.options['run-test-suite-binary'],
+          '--db_list', ','.join(mysql_connection_string_list),
+          ] + common_list, **common_dict)]))
+
+    return path_list

slapos/recipe/erp5_test/test.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+import sys
+def runTestSuite(args):
+  env = os.environ.copy()
+  d = args[0]
+  env['OPENSSL_BINARY'] = d['openssl_binary']
+  env['TEST_CA_PATH'] = d['test_ca_path']
+  env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
+  env['INSTANCE_HOME'] = d['instance_home']
+  env['REAL_INSTANCE_HOME'] = d['instance_home']
+  # Deal with Shebang size limitation
+  executable_filepath = d['call_list'][0]
+  file_object = open(executable_filepath, 'r')
+  line = file_object.readline()
+  file_object.close()
+  argument_list = []
+  if line[:2] == '#!':
+    executable_filepath = line[2:].strip()
+    argument_list.append(executable_filepath)
+  argument_list.extend(d['call_list'])
+  argument_list.extend(sys.argv[1:])
+  argument_list.append(env)
+  os.execle(executable_filepath, *argument_list)
+
+def runUnitTest(args):
+  env = os.environ.copy()
+  d = args[0]
+  env['OPENSSL_BINARY'] = d['openssl_binary']
+  env['TEST_CA_PATH'] = d['test_ca_path']
+  env['PATH'] = ':'.join([d['prepend_path']] + os.environ.get('PATH', '').split(':'))
+  env['INSTANCE_HOME'] = d['instance_home']
+  env['REAL_INSTANCE_HOME'] = d['instance_home']
+  # Deal with Shebang size limitation
+  executable_filepath = d['call_list'][0]
+  file_object = open(executable_filepath, 'r')
+  line = file_object.readline()
+  file_object.close()
+  argument_list = []
+  if line[:2] == '#!':
+    executable_filepath = line[2:].strip()
+    argument_list.append(executable_filepath)
+  argument_list.extend(d['call_list'])
+  argument_list.extend(sys.argv[1:])
+  argument_list.append(env)
+  os.execle(executable_filepath, *argument_list)
+

slapos/recipe/erp5_update/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import urlparse
+from slapos.recipe.librecipe import GenericSlapRecipe
+
+class Recipe(GenericSlapRecipe):
+  def _install(self):
+    conversion_server = None
+    if 'cloudooo-url' in self.options and self.options['cloudooo-url']:
+      parsed = urlparse.urlparse(self.options['cloudooo-url'])
+      conversion_server = "%s:%s" % (parsed.hostname, parsed.port)
+    memcached = None
+    if 'memcached-url' in self.options and self.options['memcached-url']:
+      parsed = urlparse.urlparse(self.options['memcached-url'])
+      memcached = "%s:%s" % (parsed.hostname, parsed.port)
+    kumofs = None
+    if 'kumofs-url' in self.options and self.options['kumofs-url']:
+      parsed = urlparse.urlparse(self.options['kumofs-url'])
+      kumofs = "%s:%s" % (parsed.hostname, parsed.port)
+
+    parsed = urlparse.urlparse(self.options['mysql-url'])
+    mysql_connection_string = "%(database)s@%(hostname)s:%(port)s "\
+        "%(username)s %(password)s" % dict(
+      database=parsed.path.split('/')[1],
+      hostname=parsed.hostname,
+      port=parsed.port,
+      username=parsed.username,
+      password=parsed.password
+    )
+
+    parsed = urlparse.urlparse(self.options['url'])
+    zope_user = parsed.username
+    zope_password = parsed.password
+    zope_host = '%s:%s' % (parsed.hostname, parsed.port)
+    bt5_list = []
+    if len(self.parameter_dict.get("bt5_list", "").strip()):
+      bt5_list = self.parameter_dict["bt5_list"].split()
+    elif self.parameter_dict.get("flavour", "default") == 'configurator':
+      bt5_list = self.options['configurator-bt5-list'].split()
+    bt5_repository_list = self.parameter_dict.get("bt5_repository_list",
+      "").split() or self.options['bt5-repository-list'].split()
+
+    script = self.createPythonScript(self.options['update-wrapper'],
+      __name__+'.erp5.updateERP5', [
+        self.options['site-id'], mysql_connection_string,
+        [zope_user, zope_password, zope_host],
+        memcached, conversion_server, kumofs, bt5_list, bt5_repository_list,
+        self.options['cadir-path'], self.options['openssl-binary']])
+    return [script]

slapos/recipe/erp5/erp5.py → slapos/recipe/erp5_update/erp5.py

@@ -251,16 +251,6 @@ class ERP5Updater(object):
       return True
     return False
 
-  def isCertificateAuthorityConfigured(self):
-    """ Check if certificate Authority is configured correctly. """
-    external_connection_dict = self.system_signature_dict[
-      'external_connection_dict']
-    if self.certificate_authority_path == external_connection_dict.get(
-          'portal_certificate_authority/certificate_authority_path') and \
-       self.openssl_binary == external_connection_dict.get(
-          'portal_certificate_authority/openssl_binary'):
-      return True
-    return False
   def isCertificateAuthorityConfigured(self):
     """ Check if certificate Authority is configured correctly. """
     external_connection_dict = self.system_signature_dict[
@@ -303,6 +293,7 @@ class ERP5Updater(object):
 
   def updateERP5Site(self):
     if not self.isERP5Present():
+      self.log('INFO', 'No site present, adding new with id %r' % self.site_id)
       self.POST('/manage_addProduct/ERP5/manage_addERP5Site', {
           "id": self.site_id,
           "erp5_catalog_storage": self.erp5_catalog_storage,
@@ -330,6 +321,7 @@ class ERP5Updater(object):
   def run(self):
     """ Keep running until kill"""
     while 1:
+      self.log('INFO', 'Sleeping for %s' % self.short_sleeping_time)
       time.sleep(self.short_sleeping_time)
       if not self.updateERP5Site():
         self.loadSystemSignatureDict()

slapos/recipe/fontconfig/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+import pkg_resources
+import os
+import zc.buildout
+
+class Recipe(GenericBaseRecipe):
+  """
+  fontconfig instance configuration.
+
+  conf-path -- location of the configuration file
+
+  font-system-folder -- fonts installed by software release
+
+  font-folder -- location where to download fonts
+
+  url-list -- From where to download fonts
+  """
+
+  def install(self):
+    created_file_list = []
+    font_folder = self.options['font-folder']
+    service_folder = self.options['service-folder']
+    snippet_filename = self.getTemplateFilename(
+                                    'fontconfig-snippet.cfg.in')
+    font_snippet_list = [self.substituteTemplate(snippet_filename,
+                    dict(font_folder_path=self.options['font-system-folder']))]
+    font_snippet_list.append(self.substituteTemplate(snippet_filename,
+                                           dict(font_folder_path=font_folder)))
+
+    config = dict(
+        font_folder_path_snippet=''.join(font_snippet_list),
+        )
+    template_filename = self.getTemplateFilename('fontconfig.cfg.in')
+    configuration_path = self.createFile(
+        self.options['conf-path'],
+        self.substituteTemplate(template_filename, config))
+
+    created_file_list.append(configuration_path)
+    # Instanciate onetimedownloads, one for each url
+    wrapper_template_location = pkg_resources.resource_filename(
+                                        __name__, os.path.join(
+                                        'template', 'onetimedownload_run.in'))
+
+    onetimedownload_config = {}
+    onetimedownload_config.update(self.options)
+    for index, url in enumerate(self.options['url-list'].split()):
+      if not url.strip():
+        continue
+      bin_path = os.path.join(service_folder, 'onetimedownload%s' % index)
+      file_path = os.path.join(font_folder, '%s' % index)
+      onetimedownload_config['url'] = url
+      onetimedownload_config['file_path'] = file_path
+      onetimedownload_runner_path = self.createExecutable(bin_path,
+          self.substituteTemplate(wrapper_template_location, 
+                                  onetimedownload_config))
+
+      created_file_list.append(onetimedownload_runner_path)
+
+    return created_file_list

slapos/recipe/fontconfig/template/fontconfig-snippet.cfg.in

+<dir>%(font_folder_path)s</dir>

slapos/recipe/fontconfig/template/fontconfig.cfg.in

+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+%(font_folder_path_snippet)s
+</fontconfig>
\ No newline at end of file

slapos/recipe/fontconfig/template/onetimedownload_run.in

+#!/bin/sh
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+exec %(onetimedownload_path)s "%(url)s" "%(file_path)s"

slapos/recipe/generate_cloudooo.py

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

slapos/recipe/generate_erp5_tidstorage.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericSlapRecipe
+import os
+import json
+import traceback
+
+SECTION_BACKEND_PUBLISHER = """[publish-apache-backend-list]
+recipe = slapos.cookbook:publish"""
+ZOPE_PORT_BASE = 12000
+ZEO_PORT_BASE = 15000
+HAPROXY_PORT_BASE = 11000
+APACHE_PORT_BASE = 10000
+
+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):
+    current_zeo_port = ZEO_PORT_BASE
+    current_zope_port = ZOPE_PORT_BASE
+    current_apache_port = APACHE_PORT_BASE
+    current_haproxy_port = HAPROXY_PORT_BASE
+    json_data = json.loads(self.parameter_dict['json'])
+    site_id = str(json_data['site-id'])
+    # prepare zeo
+    output = ''
+    part_list = []
+    zope_dict = {}
+    zope_connection_dict = {}
+    known_tid_storage_identifier_dict = {}
+    snippet_zeo = open(self.options['snippet-zeo']).read()
+    for zeo_id, zeo_configuration_list in json_data['zeo'].iteritems():
+      storage_list = []
+      a = storage_list.append
+      for zeo_slave in zeo_configuration_list:
+        zope_connection_dict[zeo_slave['storage-name']] = {
+          'zope-cache-size': zeo_slave['zope-cache-size'],
+          'zeo-cache-size': zeo_slave['zeo-cache-size'],
+          'mount-point': zeo_slave['mount-point'] % {'site-id': site_id},
+          'storage-name': zeo_slave['storage-name'],
+          'server': '${zeo-instance-%(zeo-id)s:ip}:${zeo-instance-%(zeo-id)s:port}' % {'zeo-id': zeo_id}
+        }
+        zodb_path = os.path.join('${directory:zodb}', zeo_slave['storage-name'] + '.fs')
+        a('  storage-name=%(storage-name)s zodb-path=%(zodb-path)s' % {'zodb-path': zodb_path, 'storage-name': zeo_slave['storage-name']})
+        known_tid_storage_identifier_dict[
+          "((('%(ip)s', %(port)s),), '%(storage_name)s')" % dict(
+            ip='${zeo-instance-%s:ip}' % zeo_id,
+            port='${zeo-instance-%s:port}' % zeo_id,
+            storage_name=zeo_slave['storage-name'])] = (zodb_path, '${directory:zodb-backup}/%s/' % zeo_slave['storage-name'], zeo_slave['serialize-path'] % {'site-id': site_id})
+      current_zeo_port += 1
+      output += snippet_zeo % dict(
+        zeo_id=zeo_id,
+        zeo_port=current_zeo_port,
+        storage_list='\n'.join(storage_list)
+      )
+      part_list.extend([
+        "zeo-instance-%s" % zeo_id,
+        "logrotate-entry-zeo-%s" % zeo_id
+      ])
+
+    zeo_connection_list = []
+    a = zeo_connection_list.append
+    for k, v in zope_connection_dict.iteritems():
+      a('  zeo-cache-size=%(zeo-cache-size)s zope-cache-size=%(zope-cache-size)s server=%(server)s mount-point=%(mount-point)s storage-name=%(storage-name)s' % v)
+    zeo_connection_string = '\n'.join(zeo_connection_list)
+    zope_dict.update(
+      timezone=json_data['timezone'],
+      zeo_connection_string=zeo_connection_string
+    )
+    # always one distribution node
+    current_zope_port += 1
+    snippet_zope = open(self.options['snippet-zope']).read()
+    zope_id = 'zope-distribution'
+    part_list.append(zope_id)
+    part_list.append('logrotate-entry-%s' % zope_id)
+    output += snippet_zope % dict(zope_thread_amount=1, zope_id=zope_id,
+      zope_port=current_zope_port, zope_timeserver=True, **zope_dict)
+    # always one admin node
+    current_zope_port += 1
+    zope_id = 'zope-admin'
+    part_list.append(zope_id)
+    part_list.append('logrotate-entry-%s' % zope_id)
+    output += snippet_zope % dict(zope_thread_amount=1, zope_id=zope_id,
+      zope_port=current_zope_port, zope_timeserver=False, **zope_dict)
+    # handle activity key
+    for q in range(1, json_data['activity']['zopecount'] + 1):
+      current_zope_port += 1
+      part_name = 'zope-activity-%s' % q
+      part_list.append(part_name)
+      part_list.append('logrotate-entry-%s' % part_name)
+      output += snippet_zope % dict(zope_thread_amount=1, zope_id=part_name,
+        zope_port=current_zope_port, zope_timeserver=True, **zope_dict)
+    # handle backend key
+    snippet_backend = open(self.options['snippet-backend']).read()
+    publish_url_list = []
+    for backend_name, backend_configuration in json_data['backend'].iteritems():
+      haproxy_backend_list = []
+      for q in range(1, backend_configuration['zopecount'] + 1):
+        current_zope_port += 1
+        part_name = 'zope-%s-%s' % (backend_name, q)
+        part_list.append(part_name)
+        part_list.append('logrotate-entry-%s' % part_name)
+        output += snippet_zope % dict(
+          zope_thread_amount=backend_configuration['thread-amount'],
+          zope_id=part_name, zope_port=current_zope_port, zope_timeserver=False,
+          **zope_dict)
+        haproxy_backend_list.append('${%(part_name)s:ip}:${%(part_name)s:port}' % dict(part_name=part_name))
+      # now generate backend access
+      current_apache_port += 1
+      current_haproxy_port += 1
+      part_list.append('apache-%(backend_name)s ca-apache-%(backend_name)s logrotate-entry-apache-%(backend_name)s haproxy-%(backend_name)s' % dict(backend_name=backend_name))
+      backend_dict = dict(
+        backend_name=backend_name,
+        apache_port=current_apache_port,
+        haproxy_port=current_haproxy_port,
+        access_control_string=backend_configuration['access-control-string'],
+        maxconn=backend_configuration['maxconn'],
+        server_check_path='/%s/getId' % site_id,
+        haproxy_backend_list=' '.join(haproxy_backend_list)
+      )
+      publish_url_list.append('url-%(backend_name)s = https://[${apache-%(backend_name)s:ip}]:${apache-%(backend_name)s:port}' % dict(
+        backend_name=backend_name))
+      output += snippet_backend % backend_dict
+    output += SECTION_BACKEND_PUBLISHER + '\n'
+    output += '\n'.join(publish_url_list)
+    part_list.append('publish-apache-backend-list')
+    prepend = open(self.options['snippet-master']).read() % dict(
+        part_list='  \n'.join(['  '+q for q in part_list]),
+        known_tid_storage_identifier_dict=known_tid_storage_identifier_dict,
+        haproxy_section="haproxy-%s" % backend_name,
+        zope_section=zope_id,
+        site_id=site_id,
+        **self.parameter_dict
+        )
+    output = prepend + output
+    with open(self.options['output'], 'w') as f:
+      f.write(output)
+
+  def _install(self):
+    if not os.path.exists(self.dirname):
+      os.mkdir(self.dirname)
+    if not "json" in self.parameter_dict:
+      # no json transimtted, nothing to do
+      with open(self.options['output'], 'w') as f:
+        f.write("[buildout]\nparts =\n")
+    else:
+      try:
+        self._generateRealTemplate()
+      except Exception:
+        print 'Ignored issue during template generation:\n%s' % \
+          traceback.format_exc()
+    return [self.dirname]

slapos/recipe/generic_cloudooo/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import zc.buildout
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+  def install(self):
+    path_list = []
+    conversion_server_dict = dict(
+      working_path=self.options['data-directory'],
+      uno_path=self.options['ooo-uno-path'],
+      office_binary_path=self.options['ooo-binary-path'],
+      ip=self.options['ip'],
+      port=int(self.options['port']),
+      openoffice_port=int(self.options['openoffice-port']),
+    )
+    for env_line in self.options['environment'].splitlines():
+      env_line = env_line.strip()
+      if not env_line:
+        continue
+      if '=' in env_line:
+        env_key, env_value = env_line.split('=')
+        conversion_server_dict[env_key.strip()] = env_value.strip()
+      else:
+        raise zc.buildout.UserError('Line %r in environment parameter is '
+            'incorrect' % env_line)
+    config_file = self.createFile(self.options['configuration-file'],
+        self.substituteTemplate(self.getTemplateFilename('cloudooo.cfg.in'),
+          conversion_server_dict))
+    path_list.append(config_file)
+    path_list.append(self.createPythonScript(self.options['wrapper'],
+     'slapos.recipe.librecipe.execute.execute_with_signal_translation',
+      [self.options['ooo-paster'].strip(), 'serve', config_file]))
+    return path_list

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

@@ -34,6 +34,7 @@ application_hostname = %(ip)s
 openoffice_port = %(openoffice_port)s
 # LD_LIBRARY_PATH passed to OpenOffice
 env-LD_LIBRARY_PATH = %(LD_LIBRARY_PATH)s
+env-FONTCONFIG_FILE = %(FONTCONFIG_FILE)s
 
 #
 # Mimetype Registry

slapos/recipe/generic_kumofs/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+  def install(self):
+    ip = self.options['ip']
+    kumo_manager_port = int(self.options['manager-port'])
+    kumo_server_port = int(self.options['server-port'])
+    kumo_server_listen_port = int(self.options['server-listen-port'])
+    kumo_gateway_port = int(self.options['gateway-port'])
+    path_list = []
+    # XXX: kumo is not storing pid in file, unless it is not running as daemon
+    #      but running daemons is incompatible with SlapOS, so there is currently
+    #      no way to have Kumo's pid files to rotate logs and send signals to them
+    config = dict(
+      kumo_gateway_binary=self.options['kumo-gateway-binary'],
+      kumo_gateway_ip=ip,
+      kumo_gateway_log=self.options['kumo-gateway-log'],
+      kumo_manager_binary=self.options['kumo-manager-binary'],
+      kumo_manager_ip=ip,
+      kumo_manager_log=self.options['kumo-manager-log'],
+      kumo_server_binary=self.options['kumo-server-binary'],
+      kumo_server_ip=ip,
+      kumo_server_log=self.options['kumo-server-log'],
+      kumo_server_storage=os.path.join(self.options['data-directory'], "kumodb.tch"),
+      kumo_manager_port=kumo_manager_port,
+      kumo_server_port=kumo_server_port,
+      kumo_server_listen_port=kumo_server_listen_port,
+      kumo_gateway_port=kumo_gateway_port
+    )
+
+    path_list.append(self.createExecutable(self.options['gateway-wrapper'],
+      self.substituteTemplate(self.getTemplateFilename('kumo_gateway.in'),
+        config)))
+
+    path_list.append(self.createExecutable(self.options['manager-wrapper'],
+      self.substituteTemplate(self.getTemplateFilename('kumo_manager.in'),
+        config)))
+
+    path_list.append(self.createExecutable(self.options['server-wrapper'],
+      self.substituteTemplate(self.getTemplateFilename('kumo_server.in'),
+        config)))
+
+    return path_list

slapos/recipe/generic_memcached/__init__.py

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

slapos/recipe/generic_mysql/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+import os
+
+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'])):
+      options['test-password-%s' % x] = self.generatePassword()
+
+  def install(self):
+    path_list = []
+
+    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'],
+
+    mysql_conf_file = self.createFile(
+      self.options['conf-file'],
+      self.substituteTemplate(template_filename, mysql_conf)
+    )
+    path_list.append(mysql_conf_file)
+
+    mysql_script_list = []
+
+    # real database
+    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']
+      }
+    ))
+    # 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']
+      }
+    ))
+    # parallel test databases
+    for x in xrange(0, int(self.options['parallel-test-database-amount'])):
+      mysql_script_list.append(self.substituteTemplate(
+        self.getTemplateFilename('initmysql.sql.in'),
+        {
+          'mysql_database': self.options['mysql-test-database-base'] + '_%s' % x,
+          'mysql_user': self.options['mysql-test-user-base'] + '_%s' % x,
+          'mysql_password': self.options['test-password-%s' % x]
+        }
+      ))
+    mysql_script_list.append('EXIT')
+    mysql_script = '\n'.join(mysql_script_list)
+
+    mysql_upgrade_binary = self.options['mysql-upgrade-binary']
+    mysql_update = self.createPythonScript(
+      self.options['update-wrapper'],
+      '%s.mysql.updateMysql' % __name__,
+      [dict(
+        mysql_script=mysql_script,
+        mysql_binary=mysql_binary,
+        mysql_upgrade_binary=mysql_upgrade_binary,
+        socket=socket,
+      )]
+    )
+    path_list.append(mysql_update)
+
+    mysqld_binary = self.options['mysqld-binary']
+    mysqld = self.createPythonScript(
+      self.options['wrapper'],
+      '%s.mysql.runMysql' % __name__,
+      [dict(
+        mysql_install_binary=self.options['mysql-install-binary'],
+        mysqld_binary=mysqld_binary,
+        data_directory=mysql_conf['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
+    for pt_script_name in (
+        'pt-archiver',
+        'pt-config-diff',
+        'pt-deadlock-logger',
+        'pt-duplicate-key-checker',
+        'pt-fifo-split',
+        'pt-find',
+        'pt-fk-error-logger',
+        'pt-heartbeat',
+        'pt-index-usage',
+        'pt-kill',
+        'pt-log-player',
+        'pt-online-schema-change',
+        'pt-query-advisor',
+        'pt-query-digest',
+        'pt-show-grants',
+        'pt-slave-delay',
+        'pt-slave-find',
+        'pt-slave-restart',
+        'pt-table-checksum',
+        'pt-table-sync',
+        'pt-tcp-model',
+        'pt-trend',
+        'pt-upgrade',
+        'pt-variable-advisor',
+        'pt-visual-explain',
+        ):
+      pt_argument_list = [self.options['perl-binary'],
+          self.options['%s-binary' % pt_script_name],
+          '--defaults-file=%s' % mysql_conf_file,
+          '--socket=%s' %mysql_conf['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)
+
+    return path_list

slapos/recipe/generic_zope/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+import binascii
+import hashlib
+import os
+import re
+import zc.buildout
+
+_isurl = re.compile('([a-zA-Z0-9+.-]+)://').match
+
+# based on Zope2.utilities.mkzopeinstance.write_inituser
+def Zope2InitUser(path, username, password):
+  open(path, 'w').write('')
+  os.chmod(path, 0600)
+  open(path, "w").write('%s:{SHA}%s\n' % (
+    username,binascii.b2a_base64(hashlib.sha1(password).digest())[:-1]))
+
+class Recipe(GenericBaseRecipe):
+  def _options(self, options):
+    options['password'] = self.generatePassword()
+    options['deadlock-password'] = self.generatePassword()
+
+  def install(self):
+    """
+    All zope have to share file created by portal_classes
+    (until everything is integrated into the ZODB).
+    So, do not request zope instance and create multiple in the same partition.
+    """
+    path_list = []
+    Zope2InitUser(self.options['inituser'], self.options['user'],
+      self.options['password'])
+
+    # Symlink to BT5 repositories defined in instance config.
+    # Those paths will eventually end up in the ZODB, and having symlinks
+    # inside the XXX makes it possible to reuse such ZODB with another software
+    # release[ version].
+    # Note: this path cannot be used for development, it's really just a
+    # read-only repository.
+    repository_path = self.options['bt5-repository']
+
+    self.bt5_repository_list = []
+    append = self.bt5_repository_list.append
+    for repository in self.options.get('bt5-repository-list', '').split():
+      repository = repository.strip()
+      if not repository:
+        continue
+
+      if _isurl(repository) and not repository.startswith("file://"):
+        # XXX: assume it's a valid URL
+        append(repository)
+        continue
+
+      if repository.startswith('file://'):
+        repository = repository.replace('file://', '', '')
+
+      if os.path.isabs(repository):
+        repo_id = hashlib.sha1(repository).hexdigest()
+        link = os.path.join(repository_path, repo_id)
+        if os.path.lexists(link):
+          if not os.path.islink(link):
+            raise zc.buildout.UserError(
+              'Target link already %r exists but it is not link' % link)
+          os.unlink(link)
+        os.symlink(repository, link)
+        self.logger.debug('Created link %r -> %r' % (link, repository_path))
+        # Always provide a URL-Type
+        append("file://" + link)
+
+    # Create zope configuration file
+    zope_config = dict(
+        products=self.options['products'],
+        thread_amount=self.options['thread-amount'],
+        zodb_root_path=self.options['zodb-path'],
+        zodb_cache_size=int(self.options['zodb-cache-size']),
+    )
+    zope_environment = dict(
+      TMP=self.options['tmp-path'],
+      TMPDIR=self.options['tmp-path'],
+      HOME=self.options['tmp-path'],
+      PATH=self.options['bin-path']
+    )
+    # configure default Zope2 zcml
+    open(self.options['site-zcml'], 'w').write(open(self.getTemplateFilename(
+        'site.zcml')).read())
+    zope_config['instance'] = self.options['instance-path']
+    zope_config['event_log'] = self.options['event-log']
+    zope_config['z2_log'] = self.options['z2-log']
+    zope_config['pid-filename'] = self.options['pid-file']
+    zope_config['lock-filename'] = self.options['lock-file']
+    prefixed_products = []
+    for product in reversed(zope_config['products'].split()):
+      product = product.strip()
+      if product:
+        prefixed_products.append('products %s' % product)
+    prefixed_products.insert(0, 'products %s' % self.options[
+      'instance-products'])
+    zope_config['products'] = '\n'.join(prefixed_products)
+    zope_config['address'] = '%s:%s' % (self.options['ip'], self.options['port'])
+    zope_config.update(dump_url=self.options['deadlock-path'],
+      secret=self.options['deadlock-password'])
+
+    zope_wrapper_template_location = self.getTemplateFilename('zope.conf.in')
+    zope_conf_content = self.substituteTemplate(zope_wrapper_template_location,
+      zope_config)
+
+    zope_conf_path = self.createFile(self.options['configuration-file'], zope_conf_content)
+    path_list.append(zope_conf_path)
+    # Create init script
+    path_list.append(self.createPythonScript(self.options['wrapper'], 'slapos.recipe.librecipe.execute.executee', [[self.options['runzope-binary'].strip(), '-C', zope_conf_path], zope_environment]))
+    return path_list

slapos/recipe/generic_zope/template/zope.conf.in

+## Zope 2 configuration file generated by SlapOS
+
+# Some defines
+%%define INSTANCE %(instance)s
+instancehome $INSTANCE
+
+# Used products
+%(products)s
+
+# Environment is setup in running wrapper script
+# Reason: zope.conf is read too late for some componets
+
+# No need to debug
+debug-mode off
+
+# One thread is safe enough
+zserver-threads %(thread_amount)s
+
+# File location
+pid-filename %(pid-filename)s
+lock-filename %(lock-filename)s
+
+# Temporary storage database (for sessions)
+<zodb_db temporary>
+     <temporarystorage>
+       name temporary storage for sessioning
+     </temporarystorage>
+     mount-point /temp_folder
+     container-class Products.TemporaryFolder.TemporaryContainer
+</zodb_db>
+
+# Logging configuration
+<eventlog>
+  <logfile>
+    dateformat
+    path %(event_log)s
+  </logfile>
+</eventlog>
+<logger access>
+  <logfile>
+    dateformat
+    path %(z2_log)s
+  </logfile>
+</logger>
+
+# Serving configuration
+<http-server>
+  address %(address)s
+</http-server>
+
+# ZODB configuration
+<zodb_db root>
+    cache-size %(zodb_cache_size)d
+    <filestorage>
+      path %(zodb_root_path)s
+    </filestorage>
+    mount-point /
+</zodb_db>
+<zoperunner>
+    program $INSTANCE/bin/runzope
+</zoperunner>
+
+# DeadlockDebugger configuration
+<product-config DeadlockDebugger>
+  dump_url %(dump_url)s
+  secret %(secret)s
+</product-config>
+
+# ERP5 Timer Service
+%%import timerserver
+<timer-server>
+  interval 5
+</timer-server>

slapos/recipe/generic_zope_zeo_client/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+import binascii
+import hashlib
+import os
+import re
+import zc.buildout
+
+_isurl = re.compile('([a-zA-Z0-9+.-]+)://').match
+
+# based on Zope2.utilities.mkzopeinstance.write_inituser
+def Zope2InitUser(path, username, password):
+  open(path, 'w').write('')
+  os.chmod(path, 0600)
+  open(path, "w").write('%s:{SHA}%s\n' % (
+    username,binascii.b2a_base64(hashlib.sha1(password).digest())[:-1]))
+
+class Recipe(GenericBaseRecipe):
+  def _options(self, options):
+    options['password'] = self.generatePassword()
+    options['deadlock-password'] = self.generatePassword()
+
+  def install(self):
+    """
+    All zope have to share file created by portal_classes
+    (until everything is integrated into the ZODB).
+    So, do not request zope instance and create multiple in the same partition.
+    """
+    path_list = []
+    Zope2InitUser(self.options['inituser'], self.options['user'],
+      self.options['password'])
+
+    # Symlink to BT5 repositories defined in instance config.
+    # Those paths will eventually end up in the ZODB, and having symlinks
+    # inside the XXX makes it possible to reuse such ZODB with another software
+    # release[ version].
+    # Note: this path cannot be used for development, it's really just a
+    # read-only repository.
+    repository_path = self.options['bt5-repository']
+
+    self.bt5_repository_list = []
+    append = self.bt5_repository_list.append
+    for repository in self.options.get('bt5-repository-list', '').split():
+      repository = repository.strip()
+      if not repository:
+        continue
+
+      if _isurl(repository) and not repository.startswith("file://"):
+        # XXX: assume it's a valid URL
+        append(repository)
+        continue
+
+      if repository.startswith('file://'):
+        repository = repository.replace('file://', '', '')
+
+      if os.path.isabs(repository):
+        repo_id = hashlib.sha1(repository).hexdigest()
+        link = os.path.join(repository_path, repo_id)
+        if os.path.lexists(link):
+          if not os.path.islink(link):
+            raise zc.buildout.UserError(
+              'Target link already %r exists but it is not link' % link)
+          os.unlink(link)
+        os.symlink(repository, link)
+        self.logger.debug('Created link %r -> %r' % (link, repository_path))
+        # Always provide a URL-Type
+        append("file://" + link)
+
+    # Generate Zeo connections
+    zeo_snippet_template = open(self.getTemplateFilename('zope.zeo.entry.conf.in'
+      )).read()
+    zeo_snippet_list = []
+    for zeo_line in self.options['zeo-connection-string'].splitlines():
+      zeo_line.strip()
+      if not zeo_line:
+        continue
+      d = dict()
+      for param in zeo_line.split():
+        k, v = param.split('=')
+        d[k.strip()] = v.strip()
+      zeo_snippet_list.append(zeo_snippet_template % d)
+    # Create zope configuration file
+    zope_config = dict(
+        products=self.options['products'],
+        thread_amount=self.options['thread-amount'],
+        zodb_configuration='\n'.join(zeo_snippet_list)
+    )
+    zope_environment = dict(
+      TMP=self.options['tmp-path'],
+      TMPDIR=self.options['tmp-path'],
+      HOME=self.options['tmp-path'],
+      PATH=self.options['bin-path'],
+      TIMEZONE=self.options['timezone'],
+    )
+    # configure default Zope2 zcml
+    open(self.options['site-zcml'], 'w').write(open(self.getTemplateFilename(
+        'site.zcml')).read())
+    zope_config['instance'] = self.options['instance-path']
+    zope_config['event_log'] = self.options['event-log']
+    zope_config['z2_log'] = self.options['z2-log']
+    zope_config['pid-filename'] = self.options['pid-file']
+    zope_config['lock-filename'] = self.options['lock-file']
+    prefixed_products = []
+    for product in reversed(zope_config['products'].split()):
+      product = product.strip()
+      if product:
+        prefixed_products.append('products %s' % product)
+    prefixed_products.insert(0, 'products %s' % self.options[
+      'instance-products'])
+    zope_config['products'] = '\n'.join(prefixed_products)
+    zope_config['address'] = '%s:%s' % (self.options['ip'], self.options['port'])
+    zope_config.update(dump_url=self.options['deadlock-path'],
+      secret=self.options['deadlock-password'])
+
+    zope_wrapper_template_location = self.getTemplateFilename('zope.conf.in')
+    zope_conf_content = self.substituteTemplate(zope_wrapper_template_location,
+      zope_config)
+    if self.isTrueValue(self.options['timeserver']):
+      zope_conf_content += self.substituteTemplate(self.getTemplateFilename(
+          'zope.conf.timeserver.in'), {})
+
+    zope_conf_path = self.createFile(self.options['configuration-file'], zope_conf_content)
+    path_list.append(zope_conf_path)
+    # Create init script
+    path_list.append(self.createPythonScript(self.options['wrapper'], 'slapos.recipe.librecipe.execute.executee', [[self.options['runzope-binary'].strip(), '-C', zope_conf_path], zope_environment]))
+    return path_list

slapos/recipe/generic_zope_zeo_client/template/site.zcml

+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:meta="http://namespaces.zope.org/meta"
+    xmlns:five="http://namespaces.zope.org/five">
+
+  <include package="Products.Five" />
+  <meta:redefinePermission from="zope2.Public" to="zope.Public" />
+
+
+  <!-- Load the meta -->
+  <include files="package-includes/*-meta.zcml" />
+  <five:loadProducts file="meta.zcml"/>
+
+  <!-- Load the configuration -->
+  <include files="package-includes/*-configure.zcml" />
+  <five:loadProducts />
+
+  <!-- Load the configuration overrides-->
+  <includeOverrides files="package-includes/*-overrides.zcml" />
+  <five:loadProductsOverrides />
+
+
+  <securityPolicy
+      component="Products.Five.security.FiveSecurityPolicy" />
+
+</configure>

slapos/recipe/erp5/template/zope.conf.in → slapos/recipe/generic_zope_zeo_client/template/zope.conf.in

@@ -31,12 +31,14 @@ lock-filename %(lock-filename)s
 
 # Logging configuration
 <eventlog>
+  level info
   <logfile>
     dateformat
     path %(event_log)s
   </logfile>
 </eventlog>
 <logger access>
+  level WARN
   <logfile>
     dateformat
     path %(z2_log)s
@@ -49,7 +51,14 @@ lock-filename %(lock-filename)s
 </http-server>
 
 # ZODB configuration
-%(zodb_configuration_string)s
+%(zodb_configuration)s
+
 <zoperunner>
     program $INSTANCE/bin/runzope
 </zoperunner>
+
+# DeadlockDebugger configuration
+<product-config DeadlockDebugger>
+  dump_url %(dump_url)s
+  secret %(secret)s
+</product-config>

slapos/recipe/generic_zope_zeo_client/template/zope.zeo.entry.conf.in

+<zodb_db %(storage-name)s>
+  cache-size %(zope-cache-size)s
+  mount-point %(mount-point)s
+  <zeoclient>
+    cache-size %(zeo-cache-size)s
+    server %(server)s
+    storage %(storage-name)s
+    name %(storage-name)s
+  </zeoclient>
+</zodb_db>

slapos/recipe/haproxy/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+  """
+  haproxy instance configuration.
+
+  name -- local name of the haproxy
+
+  wrapper-path -- location of the init script to generate
+
+  binary-path -- location of the haproxy command
+
+  conf-path -- location of the configuration file
+
+  ip -- ip of the haproxy server
+
+  port -- port of the haproxy server
+
+  server-check-path -- path of the domain to check
+
+  address -- string with list of all url to check
+    Example: 127.0.0.1:12004 127.0.0.1:12005
+  """
+
+  def install(self):
+    # inter must be quite short in order to detect quickly an unresponsive node
+    #      and to detect quickly a node which is back
+    # rise must be minimal possible : 1, indeed, a node which is back don't need
+    #      to sleep more time and we can give him work immediately
+    # fall should be quite sort. with inter at 3, and fall at 2, a node will be
+    #      considered as dead after 6 seconds.
+    # maxconn should be set as the maximum thread we have per zope, like this
+    #      haproxy will manage the queue of request with the possibility to
+    #      move a request to another node if the initially selected one is dead
+    # maxqueue is the number of waiting request in the queue of every zope client.
+    #      It allows to make sure that there is not a zope client handling all
+    #      the work while other clients are doing nothing. This was happening
+    #      even thoug we have round robin distribution because when a node dies
+    #      some seconds, all request are dispatched to other nodes, and then users
+    #      stick in other nodes and are not coming back. Please note this option
+    #      is not an issue if you have more than (maxqueue * node_quantity) requests
+    #      because haproxy will handle a top-level queue
+
+    snippet_filename = self.getTemplateFilename(
+                                    'haproxy-server-snippet.cfg.in')
+    # Prepare all filestorages
+    server_snippet = ""
+    i = 0
+    name = self.options['name']
+    for address in self.options['backend-list'].split():
+      i += 1
+      server_snippet += self.substituteTemplate(
+          snippet_filename, dict(
+             name='%s_%s' % (name, i), 
+             address=address,
+             cluster_zope_thread_amount=self.options['maxconn']))
+
+    config = dict(
+        name=name, 
+        ip=self.options['ip'], 
+        port=self.options['port'],
+        server_text=server_snippet,
+        server_check_path=self.options['server-check-path'],)
+    template_filename = self.getTemplateFilename('haproxy.cfg.in')
+    configuration_path = self.createFile(
+        self.options['conf-path'],
+        self.substituteTemplate(template_filename, config))
+
+    # Create running wrapper
+    wrapper_path = self.createPythonScript(
+      self.options['wrapper-path'],
+      'slapos.recipe.librecipe.execute.execute',
+      arguments=[self.options['binary-path'].strip(), '-f', configuration_path],)
+
+    return [configuration_path, wrapper_path]

slapos/recipe/haproxy/template/haproxy-server-snippet.cfg.in

+  server %(name)s %(address)s cookie %(name)s check inter 3s rise 1 fall 2 maxqueue 5 maxconn %(cluster_zope_thread_amount)s
+

slapos/recipe/librecipe/generic.py

@@ -120,4 +120,6 @@ class GenericBaseRecipe(object):
     return str(value).lower() in GenericBaseRecipe.TRUE_VALUES
 
   def optionIsTrue(self, optionname, default=None):
+    if default is not None and optionname not in self.options:
+      return default
     return self.isTrueValue(self.options[optionname])

slapos/recipe/librecipe/genericslap.py

@@ -24,23 +24,20 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-import logging
 from slapos import slap
-import zc.buildout
-import zc.recipe.egg
 import time
 import re
 import urlparse
 
-class GenericSlapRecipe(object):
+from generic import GenericBaseRecipe
+
+class GenericSlapRecipe(GenericBaseRecipe):
   """Base class for all slap.recipe.*"""
 
   def __init__(self, buildout, name, options):
     """Default initialisation"""
-    self.name = name
     options['eggs'] = 'slapos.cookbook'
-    self.options = options
-    self.logger = logging.getLogger(self.name)
+    GenericBaseRecipe.__init__(self, buildout, name, options)
     self.slap = slap.slap()
 
     # SLAP related information
@@ -52,12 +49,6 @@ class GenericSlapRecipe(object):
     self.key_file = slap_connection.get('key-file')
     self.cert_file = slap_connection.get('cert-file')
 
-    # setup egg to give possibility to generate scripts
-    self.egg = zc.recipe.egg.Egg(buildout, options['recipe'], options)
-
-    # Hook options
-    self._options(options)
-
     # setup auto uninstall/install
     self._setupAutoInstallUninstall()
 
@@ -88,10 +79,6 @@ class GenericSlapRecipe(object):
     """Hook which shall be implemented in children class"""
     raise NotImplementedError('Shall be implemented by subclass')
 
-  def _options(self, options):
-    """Hook which can be implemented in children class"""
-    pass
-
   def setConnectionUrl(self, *args, **kwargs):
     url = self._unparseUrl(*args, **kwargs)
     self.setConnectionDict(dict(url=url))

slapos/recipe/logrotate.py

@@ -30,87 +30,55 @@ from slapos.recipe.librecipe import GenericBaseRecipe
 
 class Recipe(GenericBaseRecipe):
 
-  def _options(self, options):
-    if 'name' not in options:
-      options['name'] = self.name
-
   def install(self):
-    path_list = []
-
     logrotate_backup = self.options['backup']
     logrotate_d = self.options['logrotate-entries']
     logrotate_conf_file = self.options['conf']
 
-    logrotate_conf = []
-    logrotate_conf.append("include %s" % logrotate_d)
-    logrotate_conf.append("olddir %s" % logrotate_backup)
-    logrotate_conf.append("dateext")
-
-    frequency = 'daily'
-    if 'frequency' in self.options:
-      frequency = self.options['frequency']
-    logrotate_conf.append(frequency)
-
-    num_rotate = 30
-    if 'num-rotate' in self.options:
-      num_rotate = self.options['num-rotate']
-    logrotate_conf.append("rotate %s" % num_rotate)
-
-    logrotate_conf.append("compress")
-    logrotate_conf.append("compresscmd %s" % self.options['gzip-binary'])
-    logrotate_conf.append("compressoptions -9")
-    logrotate_conf.append("uncompresscmd %s" % self.options['gunzip-binary'])
-
-    logrotate_conf_file = self.createFile(logrotate_conf_file, '\n'.join(logrotate_conf))
-    logrotate_conf.append(logrotate_conf_file)
+    logrotate_conf = [
+      'daily',
+      'dateext',
+      'rotate 3650',
+      'compress',
+      'compresscmd %s' % self.options['gzip-binary'],
+      'compressoptions -9',
+      'uncompresscmd %s' % self.options['gunzip-binary'],
+      'notifempty',
+      'sharedscripts',
+      'create',
+      'include %s' % logrotate_d,
+      'olddir %s' % logrotate_backup,
+    ]
+
+    logrotate_conf_file = self.createFile(logrotate_conf_file, 
+        '\n'.join(logrotate_conf))
 
     state_file = self.options['state-file']
 
     logrotate = self.createPythonScript(
       self.options['wrapper'],
-      'slapos.recipe.librecipe.exceute.execute',
+      'slapos.recipe.librecipe.execute.execute',
       [self.options['logrotate-binary'], '-s', state_file, logrotate_conf_file, ]
     )
-    path_list.append(logrotate)
 
-    return path_list
+    return [logrotate, logrotate_conf_file]
 
 class Part(GenericBaseRecipe):
 
-  def _options(self, options):
-    if 'name' not in options:
-      options['name'] = self.name
-
   def install(self):
 
     logrotate_d = self.options['logrotate-entries']
 
-    part_path = os.path.join(logrotate_d, self.options['name'])
-
     conf = []
 
-    if 'frequency' in self.options:
-      conf.append(self.options['frequency'])
-    if 'num-rotate' in self.options:
-      conf.append('rotate %s' % self.options['num-rotate'])
-
     if 'post' in self.options:
       conf.append("postrotate\n%s\nendscript" % self.options['post'])
     if 'pre' in self.options:
       conf.append("prerotate\n%s\nendscript" % self.options['pre'])
 
-    if self.optionIsTrue('sharedscripts', False):
-      conf.append("sharedscripts")
-
-    if self.optionIsTrue('notifempty', False):
-      conf.append('notifempty')
-
-    if self.optionIsTrue('create', True):
-      conf.append('create')
-
     log = self.options['log']
 
-    self.createFile(os.path.join(logrotate_d, self.options['name']),
+    part_path = self.createFile(os.path.join(logrotate_d, self.options['name']),
                     "%(logfiles)s {\n%(conf)s\n}" % {
                       'logfiles': log,
                       'conf': '\n'.join(conf),

slapos/recipe/mkdirectory.py

@@ -42,7 +42,7 @@ class Recipe(GenericBaseRecipe):
 
   def install(self):
 
-    for directory in self.directory.values():
+    for directory in sorted(self.directory.values()):
       path = directory
 
       if not os.path.exists(path):

slapos/recipe/publish.py

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

slapos/recipe/request.py

@@ -31,37 +31,28 @@ from slapos import slap as slapmodule
 
 class Recipe(object):
 
-  def parseMultiValues(self, string):
-    return dict([ [str(column).strip() for column in line.split('=', 1)]
-                 for line in str(string).splitlines() if '=' in line])
-
   def __init__(self, buildout, name, options):
     self.logger = logging.getLogger(name)
 
     slap = slapmodule.slap()
 
-    slap_connection = buildout['slap_connection']
-    self.software_release_url = slap_connection['software_release_url']
+    self.software_release_url = options['software-url']
 
-    # XXX: Dirty network interation stuff
-    slap.initializeConnection(slap_connection['server_url'],
-                              slap_connection.get('key_file'),
-                              slap_connection.get('cert_file'),
+    slap.initializeConnection(options['server-url'],
+                              options.get('key-file'),
+                              options.get('cert-file'),
                              )
     computer_partition = slap.registerComputerPartition(
-      slap_connection['computer_id'], slap_connection['partition_id'])
+      options['computer-id'], options['partition-id'])
     self.request = computer_partition.request
 
-    if 'software-url' not in options:
-      options['software-url'] = self.software_release_url
-
     if 'name' not in options:
       options['name'] = name
 
     self.return_parameters = []
     if 'return' in options:
       self.return_parameters = [str(parameter).strip()
-                               for parameter in options['return'].splitlines()]
+                               for parameter in options['return'].split()]
     else:
       self.logger.warning("No parameter to return to main instance."
                           "Be careful about that...")
@@ -72,23 +63,24 @@ class Recipe(object):
 
     filter_kw = {}
     if 'sla' in options:
-      filter_kw = self.parseMultiValues(options['sla'])
+      for sla_parameter in options['sla'].split():
+        filter_kw[sla_parameter] = options['sla-%s' % sla_parameter]
 
     partition_parameter_kw = {}
     if 'config' in options:
-      partition_parameter_kw = self.parseMultiValues(options['config'])
+      for config_parameter in options['config'].split():
+        partition_parameter_kw[config_parameter] = \
+            options['config-%s' % config_parameter]
 
     instance = self.request(options['software-url'], software_type,
       options['name'], partition_parameter_kw=partition_parameter_kw,
         filter_kw=filter_kw)
 
-    result = {}
     for param in self.return_parameters:
-      result[param] = instance.getConnectionParameter(param)
-
-    # Return the connections parameters in options dict
-    for key, value in result.items():
-      options['connection-%s' % key] = value
+      try:
+        options['connection-%s' % param] = instance.getConnectionParameter(param)
+      except slapmodule.NotFoundError:
+        options['connection-%s' % param] = ''
 
   def install(self):
     return []

slapos/recipe/softwaretype.py

@@ -97,8 +97,8 @@ class Recipe:
     instance_file_path = self.options[software_type]
 
     if not os.path.exists(instance_file_path):
-      raise zc.buildout.UserError("The specified buildout config file does not"
-                                  "exist.")
+      raise zc.buildout.UserError("The specified buildout config file %r does "
+                                  "not exist." % instance_file_path)
 
     buildout = ConfigParser()
     with open(instance_file_path) as instance_path:
@@ -107,7 +107,8 @@ class Recipe:
     buildout.set('buildout', 'installed',
                  '.installed-%s.cfg' % software_type)
 
-    buildout.add_section('slap-parameter')
+    if not buildout.has_section('slap-parameter'):
+      buildout.add_section('slap-parameter')
     for parameter, value in self.parameter_dict.items():
       buildout.set('slap-parameter', parameter, value)
 

slapos/recipe/sphinx/__init__.py

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

slapos/recipe/erp5/template/sphinx.conf.in → slapos/recipe/sphinx/template/sphinx.conf.in

@@ -389,7 +389,7 @@ index erp5
 	#
 	# ondisk_dict		= 1
 
-	# whether to enable in-place inversion (2x less disk, 90-95% speed)
+	# whether to enable in-place inversion (2x less disk, 90-95%% speed)
 	# optional, default is 0 (use separate temporary files), indexer-only
 	#
 	# inplace_enable		= 1
@@ -460,11 +460,11 @@ searchd
 
 	# log file, searchd run info is logged here
 	# optional, default is 'searchd.log'
-	log			= %(log_directory)s/sphinx-searchd.log
+	log			= %(searchd_log)s
 
 	# query log file, all search queries are logged here
 	# optional, default is empty (do not log queries)
-	query_log		= %(log_directory)s/sphinx-query.log
+	query_log		= %(query_log)s
 
 	# client read timeout, seconds
 	# optional, default is 5
@@ -480,7 +480,7 @@ searchd
 
 	# PID file, searchd process ID file name
 	# mandatory
-	pid_file		= %(data_directory)s/sphinx-searchd.pid
+	pid_file		= %(pid)s
 
 	# max amount of matches the daemon ever keeps in RAM, per-index
 	# WARNING, THERE'S ALSO PER-QUERY LIMIT, SEE SetLimits() API CALL
@@ -524,7 +524,7 @@ searchd
 	# searchd will (try to) log crashed query to 'crash_log_path.PID' file
 	# optional, default is empty (do not create crash logs)
 	#
-	# crash_log_path		= %(log_directory)s
+	# crash_log_path		= (log_directory)
 
 	# max allowed per-query filter count
 	# optional, default is 256

slapos/recipe/symbolic_link.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+import logging
+
+class Recipe:
+  def __init__(self, buildout, name, options):
+    self.buildout = buildout
+    self.name = name
+    self.options = options
+    self.logger = logging.getLogger(self.name)
+
+  def install(self):
+    """
+    Links binaries to instance's bin directory for easier exposal
+    """
+    path_list = []
+    target_directory = self.options['target-directory']
+    for linkline in self.options['link-binary'].split():
+      path, linkname = os.path.split(linkline)
+
+      link = os.path.join(target_directory, linkname)
+      if os.path.lexists(link):
+        if not os.path.islink(link):
+          raise zc.buildout.UserError(
+              'Target link already %r exists but it is not link' % link)
+        os.unlink(link)
+      os.symlink(linkline, link)
+      self.logger.debug('Created link %r -> %r' % (link, linkline))
+      path_list.append(link)
+
+    return path_list

slapos/recipe/tidstorage/__init__.py

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

slapos/recipe/tidstorage/template/tidstorage.py.in

+known_tid_storage_identifier_dict = %(known-tid-storage-identifier-dict)s
+base_url = '%(base-url)s'
+address = '%(ip)s'
+port = %(port)s
+
+#fork = False
+#setuid = None
+#setgid = None
+burst_period = 30
+full_dump_period = 300
+
+timestamp_file_path = '%(timestamp-file-path)s'
+logfile_name = '%(logfile-name)s'
+pidfile_name = '%(pidfile-name)s'
+status_file = '%(status-file)s'

slapos/recipe/zeo/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericBaseRecipe
+import os
+
+class Recipe(GenericBaseRecipe):
+  """
+  ZEO instance configuration.
+
+  wrapper-path -- location of the init script to generate
+
+  binary-path -- location of the runzeo command
+
+  ip -- ip of the zeo server
+
+  port -- port of the zeo server
+
+  log-path -- location of the log file
+
+  pid-path -- location of the pid file
+
+  conf-path -- location of the configuration file
+
+  zodb-path -- location of the zodb directory (which contains all storage)
+
+  storage -- string with list of all resquested storage
+    Example: event_module person_module
+  """
+
+  def install(self):
+    snippet_filename = self.getTemplateFilename(
+                                    'zeo-filestorage-snippet.conf.in')
+    # Prepare all filestorages
+    filestorage_snippet = ""
+    for storage_definition in self.options['storage'].splitlines():
+      storage_definition = storage_definition.strip()
+      if not storage_definition:
+        continue
+      for q in storage_definition.split():
+        if 'storage-name' in q:
+          storage_name = q.split('=')[1].strip()
+        if 'zodb-path' in q:
+          zodb_path = q.split('=')[1].strip()
+      filestorage_snippet += self.substituteTemplate(
+          snippet_filename, dict(storage_name=storage_name, path=zodb_path))
+
+    config = dict(
+      zeo_ip=self.options['ip'],
+      zeo_port=self.options['port'],
+      zeo_event_log=self.options['log-path'],
+      zeo_pid=self.options['pid-path'],
+      zeo_filestorage_snippet=filestorage_snippet,
+    )
+
+    # Create configuration file
+    template_filename = self.getTemplateFilename('zeo.conf.in')
+    configuration_path = self.createFile(
+        self.options['conf-path'],
+        self.substituteTemplate(template_filename, config))
+
+    # Create running wrapper
+    wrapper_path = self.createPythonScript(
+      self.options['wrapper-path'],
+      'slapos.recipe.librecipe.execute.execute',
+      arguments=[self.options['binary-path'].strip(), '-C',
+        self.options['conf-path']],)
+
+    return [configuration_path, wrapper_path]

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

+<filestorage %(storage_name)s>
+  path %(path)s
+</filestorage>
+

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:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib:${libXext:location}/lib:${libXinerama:location}/lib:${libxcb: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

+#############################
+#
+# Request erp5 development environnment
+#
+#############################
+[buildout]
+
+extends = ${template-zope:output}
+parts +=
+  request-mariadb
+  request-cloudooo
+  request-memcached
+  request-kumofs
+  basedirectory
+  erp5-update
+  test-runner
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[slap-parameter]
+# default site id
+site-id = erp5
+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}
+
+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
+
+[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}
+
+[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/
+
+[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}
+
+# Paths
+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}
+
+[request-common]
+recipe = slapos.cookbook:request
+software-url = $${slap-connection:software-release-url}
+sla = computer_guid
+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}
+
+[request-mariadb]
+<=request-common
+name = MariaDB DataBase
+software-type = mariadb
+
+[request-cloudooo]
+<=request-common
+name = Cloudooo
+config = cloudooo-json
+config-cloudooo-json = $${slap-parameter:cloudooo-json}
+software-type = cloudooo
+
+[request-memcached]
+<=request-common
+name = Memcached
+software-type = memcached
+
+[request-kumofs]
+<=request-common
+name = KumoFS
+software-type = kumofs
+
+# rest of parts are candidates for some generic stuff
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+services = $${rootdirectory:etc}/run/
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+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/

software/erp5/instance-erp5-production.cfg

+#############################
+#
+# Request erp5 production environnment
+#
+#############################
+[buildout]
+
+parts =
+  request-mariadb
+  request-sphinx
+  request-cloudooo
+  request-memcached
+  request-kumofs
+  request-tidstorage
+  basedirectory
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[request-common]
+recipe = slapos.cookbook:request
+software-url = $${slap-connection:software-release-url}
+sla = computer_guid
+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}
+
+[request-sphinx]
+<=request-common
+name = Sphinx Search Engine
+software-type = sphinx
+
+[request-mariadb]
+<=request-common
+name = MariaDB DataBase
+software-type = mariadb
+
+[request-cloudooo]
+<=request-common
+name = Cloudooo
+config = cloudooo-json
+config-cloudooo-json = $${slap-parameter:cloudooo-json}
+software-type = cloudooo
+
+[request-memcached]
+<=request-common
+name = Memcached
+software-type = memcached
+
+[request-kumofs]
+<=request-common
+name = KumoFS
+software-type = kumofs
+
+[request-tidstorage]
+<=request-common
+name = TidStorage
+return = url-login
+config = json mysql-url memcached-url cloudooo-url kumofs-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}
+software-type = tidstorage
+
+# rest of parts are candidates for some generic stuff
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+services = $${rootdirectory:etc}/run
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc

software/erp5/instance-kumofs.cfg

+[buildout]
+parts =
+  publish-kumofs-connection-information
+  kumofs-instance
+  logrotate
+  logrotate-entry-kumofs
+  cron
+  cron-entry-logrotate
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[publish-kumofs-connection-information]
+recipe = slapos.cookbook:publishurl
+url = memcached://$${kumofs-instance:ip}:$${kumofs-instance:gateway-port}/
+
+[kumofs-instance]
+recipe = slapos.cookbook:generic.kumofs
+
+# Network options
+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
+
+# Paths: 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
+
+# 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
+
+[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}
+
+# 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
+# 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
+
+[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
+cronoutput = $${basedirectory:log}/cron
+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
+
+[cron]
+recipe = slapos.cookbook:cron
+dcrond-binary = ${dcron:location}/sbin/crond
+cron-entries = $${directory:cron-entries}
+crontabs = $${directory:crontabs}
+cronstamps = $${directory:cronstamps}
+catcher = $${cron-simplelogger:binary}
+binary = $${basedirectory:services}/crond
+
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+binary = $${rootdirectory:bin}/cron_simplelogger
+output = $${directory:cronoutput}
+
+[cron-entry-logrotate]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = logrotate
+frequency = 0 0 * * *
+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:binary}
+binary = $${basedirectory:services}/crond
+
+[cron-simplelogger]
+recipe = slapos.cookbook:simplelogger
+binary = $${rootdirectory:bin}/cron_simplelogger
+output = $${directory:cronoutput}
+
+[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
+cronoutput = $${basedirectory:log}/cron
+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

+#############################
+#
+# Instanciate memcached
+#
+# No slapos parameter needed
+#
+#############################
+[buildout]
+parts =
+  memcached-instance
+  publish-memcached-connection-information
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+bin = $${buildout:directory}/bin
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+services = $${rootdirectory:etc}/run
+
+[memcached-instance]
+recipe = slapos.cookbook:generic.memcached
+wrapper_path = $${basedirectory:services}/memcached
+binary_path = ${memcached:location}/bin/memcached
+ip = $${slap-network-information:local-ipv4}
+port = 11000
+
+[publish-memcached-connection-information]
+recipe = slapos.cookbook:publishurl
+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/snippet-backend.cfg

+[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
+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
+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
+
+[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-%(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-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