Merge branch 'master' into erp5

.gitignore

 *pyc
+.installed.cfg
+bin/
 build
+develop-eggs/
 dist
+downloads/
+eggs/
+parts/
 slapos.cookbook.egg-info

00.Repository.Rules.txt

-SlapOS repository rules
-=======================
-
-Short version for impatient
----------------------------
-
-'master' branch is always stable. One shall never work in this branch. One
-shall expect reversion or removal of his commits in 'master' branch, if they
-are not because of merging another branch.
-
-Everyone has to create branch, basing on 'master' or any other branch. All
-work shall be done in such branch. It is advised to review it before merging
-into 'master'. It is very good habit to tag such merges.
-
-A bit more background
----------------------
-
-SlapOS repository 'master' branch is supposed to be stable. No new work is
-accepted on this branch. Each time someone uses (clones, extends) 'master'
-branch it is supposed to work (as far as it was tested).
-
-Tags on 'master' branch are supposed to be repeatable software definitions
-forever. All versions and external links shall be setup in a way, that they
-wouldn't change in day, month, year, etc.
-
-Everyone can make his own branch to introduce new software to SlapOS. There
-are no rules about those branches, as each software is specific.
-
-It is good idea to ask for review before merging changes into 'master' branch.
-Peer review can detect issues not detected by testing, development or self
-analysis.
-
-After some software is stabilised and no more work is planned it is acceptable
-to remove such abandoned branch in order to minimise amount of branches.

CHANGES.txt

-0.8 (unreleased)
+0.10 (unreleased)
 ================
 
- * No changes yet.
+ * No change yet.
+
+0.9 (2011-06-24)
+================
+
+ * mysql recipe : Changing slapos.recipe.erp5.execute to
+   slapos.recipe.librecipe.execute [Cedric de Saint Martin]
+
+0.8 (2011-06-15)
+================
+
+ * Add MySQL and MariaDB standalone software release and recipe
+   [Cedric de Saint Martin]
+ * Fixed slapos.recipe.erp5testnode instantiation [Sebastien Robin]
 
 0.7 (2011-06-14)
 ================

component/git/buildout.cfg

@@ -13,8 +13,8 @@ parts =
 
 [git]
 recipe = hexagonit.recipe.cmmi
-url = http://kernel.org/pub/software/scm/git/git-1.7.3.4.tar.bz2
-md5sum = 3a2602016f98c529cda7b9fad1a6e216
+url = http://kernel.org/pub/software/scm/git/git-1.7.4.5.tar.bz2
+md5sum = 2fa6c4c847ed87523cf55de54af457eb
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/lxml-python/buildout.cfg

@@ -13,6 +13,9 @@ PATH = ${libxslt:location}/bin:%(PATH)s
 [lxml-python]
 recipe = zc.recipe.egg:custom
 egg = lxml
+find-links =
+  http://pypi.python.org/pypi/lxml/2.2.8
+  http://pypi.python.org/pypi/lxml/2.3
 rpath =
   ${libxml2:location}/lib/
   ${libxslt:location}/lib/

component/slapos/buildout.cfg

@@ -18,24 +18,29 @@ python = python2.7
 recipe = z3c.recipe.scripts
 python = python2.7
 eggs =
+  slapos.libnetworkcache
+  zc.buildout
   ${lxml-python:egg}
   slapos.core
 
 [versions]
-zc.buildout = 1.5.3-dev-SlapOS-001
+zc.buildout = 1.5.3-dev-SlapOS-004
 Jinja2 = 2.5.5
 Werkzeug = 0.6.2
+buildout-versions = 1.6
 hexagonit.recipe.cmmi = 1.5.0
 lxml = 2.3
 meld3 = 0.6.7
-setuptools = 0.6c12dev-r88795
-slapos.core = 0.2
+netaddr = 0.7.5
+setuptools = 0.6c12dev-r88846
+slapos.core = 0.8
+slapos.libnetworkcache = 0.1
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.2
+# slapos.core==0.8
 Flask = 0.6.1
 
 # Required by:
@@ -43,18 +48,13 @@ Flask = 0.6.1
 hexagonit.recipe.download = 1.5.0
 
 # Required by:
-# slapos.core==0.2
-netaddr = 0.7.5
-
-# Required by:
-# slapos.core==0.2
+# slapos.core==0.8
 netifaces = 0.5
 
 # Required by:
-# slapos.core==0.2
+# slapos.core==0.8
 supervisor = 3.0a10
 
 # Required by:
-# slapos.core==0.2
+# slapos.core==0.8
 zope.interface = 3.6.3
-

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.8-dev'
+version = '0.10dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
@@ -49,6 +49,7 @@ setup(name=name,
           'libcloud = slapos.recipe.libcloud:Recipe',
           'libcloudrequest = slapos.recipe.libcloudrequest:Recipe',
           'memcached = slapos.recipe.memcached:Recipe',
+          'mysql = slapos.recipe.mysql:Recipe',
           'nbdserver = slapos.recipe.nbdserver:Recipe',
           'nosqltestbed = slapos.recipe.nosqltestbed:NoSQLTestBed',
           'proactive = slapos.recipe.proactive:Recipe',

slapos/recipe/README.mysql.txt

+mysql
+=========
+
+Instantiates MySQL instance.

slapos/recipe/erp5testnode/__init__.py

@@ -98,7 +98,7 @@ class Recipe(BaseSlapRecipe):
               partition_reference=CONFIG['partition_reference'],
               environment=dict(PATH=os.environ['PATH']),
               vcs_authentication_list=eval(self.parameter_dict.get(
-                     'vcs_authentication_list')),
+                     'vcs_authentication_list', 'None')),
             )
           ]))
 

slapos/recipe/mysql/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/mysql/mysql.py

+import os
+import subprocess
+import time
+import sys
+
+
+def runMysql(args):
+  sleep = 60
+  conf = args[0]
+  mysqld_wrapper_list = [conf['mysqld_binary'], '--defaults-file=%s' %
+      conf['configuration_file']]
+  # we trust mysql_install that if mysql directory is available mysql was
+  # correctly initalised
+  if not os.path.isdir(os.path.join(conf['data_directory'], 'mysql')):
+    while True:
+      # XXX: Protect with proper root password
+      # XXX: Follow http://dev.mysql.com/doc/refman/5.0/en/default-privileges.html
+      popen = subprocess.Popen([conf['mysql_install_binary'],
+        '--skip-name-resolve', '--no-defaults', '--datadir=%s' %
+        conf['data_directory']],
+        stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+      result = popen.communicate()[0]
+      if popen.returncode is None or popen.returncode != 0:
+        print "Failed to initialise server.\nThe error was: %s" % result
+        print "Waiting for %ss and retrying" % sleep
+        time.sleep(sleep)
+      else:
+        print "Mysql properly initialised"
+        break
+  else:
+    print "MySQL already initialised"
+  print "Starting %r" % mysqld_wrapper_list[0]
+  sys.stdout.flush()
+  sys.stderr.flush()
+  os.execl(mysqld_wrapper_list[0], *mysqld_wrapper_list)
+
+
+def updateMysql(args):
+  conf = args[0]
+  sleep = 30
+  is_succeed = False
+  while True:
+    if not is_succeed:
+      mysql_upgrade_list = [conf['mysql_upgrade_binary'], '--no-defaults', '--user=root', '--socket=%s' % conf['socket']]
+      mysql_upgrade = subprocess.Popen(mysql_upgrade_list, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+      result = mysql_upgrade.communicate()[0]
+      if mysql_upgrade.returncode is None:
+        mysql_upgrade.kill()
+      if mysql_upgrade.returncode != 0 and not 'is already upgraded' in result:
+        print "Command %r failed with result:\n%s" % (mysql_upgrade_list, result)
+        print 'Sleeping for %ss and retrying' % sleep
+      else:
+        if mysql_upgrade.returncode == 0:
+          print "MySQL database upgraded with result:\n%s" % result
+        else:
+          print "No need to upgrade MySQL database"
+        mysql_list = [conf['mysql_binary'].strip(), '--no-defaults', '-B', '--user=root', '--socket=%s' % conf['socket']]
+        mysql = subprocess.Popen(mysql_list, stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        result = mysql.communicate(conf['mysql_script'])[0]
+        if mysql.returncode is None:
+          mysql.kill()
+        if mysql.returncode != 0:
+          print 'Command %r failed with:\n%s' % (mysql_list, result)
+          print 'Sleeping for %ss and retrying' % sleep
+        else:
+          is_succeed = True
+          print 'SlapOS initialisation script succesfully applied on database.'
+    sys.stdout.flush()
+    sys.stderr.flush()
+    time.sleep(sleep)

slapos/recipe/mysql/template/initmysql.sql.in

+CREATE DATABASE IF NOT EXISTS %(mysql_database)s;
+GRANT ALL PRIVILEGES ON %(mysql_database)s.* TO %(mysql_user)s@'%%' IDENTIFIED BY '%(mysql_password)s';
+#GRANT ALL PRIVILEGES ON %(mysql_database)s.* TO %(mysql_user)s@* IDENTIFIED BY '%(mysql_password)s';

slapos/recipe/mysql/template/logrotate_entry.in

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

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

+# ERP5 buildout my.cnf template based on my-huge.cnf shipped with mysql
+# The MySQL server
+[mysqld]
+# ERP5 by default requires InnoDB storage. MySQL by default fallbacks to using
+# different engine, like MyISAM. Such behaviour generates problems only, when
+# tables requested as InnoDB are silently created with MyISAM engine.
+#
+# Loud fail is really required in such case.
+sql-mode="NO_ENGINE_SUBSTITUTION"
+
+skip-show-database
+port = %(tcp_port)s
+bind-address = %(ip)s
+socket = %(socket)s
+datadir = %(data_directory)s
+pid-file = %(pid_file)s
+log-error = %(error_log)s
+#log-slow-file = %(slow_query_log)s
+long_query_time = 5
+max_allowed_packet = 128M
+query_cache_size = 32M
+
+plugin-load = ha_innodb_plugin.so
+
+# The following are important to configure and depend a lot on to the size of
+# your database and the available resources.
+#innodb_buffer_pool_size = 4G
+#innodb_log_file_size = 256M
+#innodb_log_buffer_size = 8M
+
+# Some dangerous settings you may want to uncomment if you only want
+# performance or less disk access. Useful for unit tests.
+#innodb_flush_log_at_trx_commit = 0
+#innodb_flush_method = nosync
+#innodb_doublewrite = 0
+#sync_frm = 0
+
+# Uncomment the following if you need binary logging, which is recommended
+# on production instances (either for replication or incremental backups).
+#log-bin=mysql-bin
+
+# Force utf8 usage
+collation_server = utf8_unicode_ci
+character_set_server = utf8
+skip-character-set-client-handshake
+
+[mysql]
+no-auto-rehash
+socket = %(socket)s
+
+[mysqlhotcopy]
+interactive-timeout

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

+foreground = yes
+output = %(log)s
+pid = %(pid_file)s
+syslog = no
+CApath = %(ca_path)s
+key = %(key)s
+CRLpath = %(ca_crl)s
+cert = %(cert)s
+
+[service]
+accept = %(public_ip)s:%(public_port)s
+connect = %(private_ip)s:%(private_port)s

software/erp5testnode/software.cfg

@@ -38,6 +38,10 @@ arguments = sys.argv[1:] + ["bootstrap"]
 section = python2.6
 version = 1
 
+[versions]
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-001
+
 [eggs]
 recipe = zc.recipe.egg
 eggs =
@@ -50,429 +54,3 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-002
-
-[versions]
-AccessControl = 2.13.4
-Jinja2 = 2.5.5
-Products.OFSP = 2.13.2
-Werkzeug = 0.6.2
-hexagonit.recipe.cmmi = 1.5.0
-lxml = 2.3
-manuel = 1.5.0
-mechanize = 0.2.5
-meld3 = 0.6.7
-mr.developer = 1.17
-slapos.cookbook = 0.4
-slapos.core = 0.2
-slapos.recipe.template = 1.1
-zope.i18n = 3.7.4
-zope.tales = 3.5.1
-
-#Required by:
-#Products.ExternalMethod 2.13.0
-#Products.PythonScripts 2.13.0
-#DocumentTemplate 2.13.1
-#Products.ZCTextIndex 2.13.2
-#Products.BTreeFolder2 2.13.3
-#Zope2 2.13.7
-#Products.ZCatalog 2.13.14
-Acquisition = 2.13.7nxd001
-
-#Required by:
-#Products.PythonScripts 2.13.0
-#Zope2 2.13.7
-#Products.ZCatalog 2.13.14
-DateTime = 3.0b1
-
-#Required by:
-#Products.MIMETools 2.13.0
-#Products.PythonScripts 2.13.0
-#Zope2 2.13.7
-#Products.ZCatalog 2.13.14
-DocumentTemplate = 2.13.1
-
-#Required by:
-#MultiMapping 2.13.0
-#Products.ExternalMethod 2.13.0
-#Record 2.13.0
-#Missing 2.13.1
-#Persistence 2.13.2
-#Zope2 2.13.7
-#Products.ZCatalog 2.13.14
-ExtensionClass = 2.13.2
-
-#Required by:
-#slapos.core 0.2
-Flask = 0.6.1
-
-#Required by:
-#Zope2 2.13.7
-#Products.ZCatalog 2.13.14
-Missing = 2.13.1
-
-#Required by:
-#Zope2 2.13.7
-MultiMapping = 2.13.0
-
-#Required by:
-#Products.ExternalMethod 2.13.0
-#Products.OFSP 2.13.2
-#Products.ZCTextIndex 2.13.2
-#Products.BTreeFolder2 2.13.3
-#Zope2 2.13.7
-#Products.ZCatalog 2.13.14
-Persistence = 2.13.2
-
-#Required by:
-#Zope2 2.13.7
-Products.BTreeFolder2 = 2.13.3
-
-#Required by:
-#Zope2 2.13.7
-Products.ExternalMethod = 2.13.0
-
-#Required by:
-#Zope2 2.13.7
-Products.MIMETools = 2.13.0
-
-#Required by:
-#Zope2 2.13.7
-Products.MailHost = 2.13.1
-
-#Required by:
-#Zope2 2.13.7
-Products.PythonScripts = 2.13.0
-
-#Required by:
-#Zope2 2.13.7
-Products.StandardCacheManagers = 2.13.0
-
-#Required by:
-#Zope2 2.13.7
-Products.ZCTextIndex = 2.13.2
-
-#Required by:
-#Zope2 2.13.7
-Products.ZCatalog = 2.13.14
-
-#Required by:
-#slapos.cookbook 0.4
-PyXML = 0.8.5
-
-#Required by:
-#Zope2 2.13.7
-Record = 2.13.0
-
-#Required by:
-#Products.PythonScripts 2.13.0
-#Zope2 2.13.7
-RestrictedPython = 3.6.0
-
-#Required by:
-#zdaemon 2.0.4
-#zLOG 2.11.1
-#Zope2 2.13.7
-#ZODB3 3.10.3
-ZConfig = 2.9.0
-
-#Required by:
-#Products.ExternalMethod 2.13.0
-#Products.BTreeFolder2 2.13.3
-#Zope2 2.13.7
-#zope.container 3.12.0
-ZODB3 = 3.10.3
-
-#Required by:
-#slapos.cookbook 0.4
-Zope2 = 2.13.7
-
-#Required by:
-#Zope2 2.13.7
-ZopeUndo = 2.12.0
-
-#Required by:
-#mr.developer 1.17
-#slapos.core 0.2
-argparse = 1.2.1
-
-#Required by:
-#slapos.recipe.template 1.1
-collective.recipe.template = 1.8
-
-#Required by:
-#Zope2 2.13.7
-docutils = 0.7
-
-#Required by:
-#hexagonit.recipe.cmmi 1.5.0
-hexagonit.recipe.download = 1.5.0
-
-#Required by:
-#Zope2 2.13.7
-initgroups = 2.13.0
-
-#Required by:
-#slapos.core 0.2
-#slapos.cookbook 0.4
-netaddr = 0.7.5
-
-#Required by:
-#slapos.core 0.2
-netifaces = 0.5
-
-#Required by:
-#Zope2 2.13.7
-#zope.i18n 3.7.4
-#zope.testbrowser 4.0.2
-pytz = 2011g
-
-#Required by:
-#zc.buildout 1.5.3-dev-SlapOS-001
-setuptools = 0.6c12dev-r88846
-
-#Required by:
-#slapos.core 0.2
-supervisor = 3.0a10
-
-#Required by:
-#Zope2 2.13.7
-tempstorage = 2.12.1
-
-#Required by:
-#Products.StandardCacheManagers 2.13.0
-#Zope2 2.13.7
-#zope.sendmail 3.7.4
-transaction = 1.1.1
-
-#Required by:
-#slapos.cookbook 0.4
-xml-marshaller = 0.9.7
-
-#Required by:
-#Products.PythonScripts 2.13.0
-#Zope2 2.13.7
-zExceptions = 2.13.0
-
-#Required by:
-#Zope2 2.13.7
-zLOG = 2.11.1
-
-#Required by:
-#ZODB3 3.10.3
-zc.lockfile = 1.0.0
-
-#Required by:
-#slapos.cookbook 0.4
-zc.recipe.egg = 1.3.2
-
-#Required by:
-#Zope2 2.13.7
-zdaemon = 2.0.4
-
-#Required by:
-#zope.site 3.9.2
-zope.annotation = 3.5.0
-
-#Required by:
-#zope.container 3.12.0
-zope.broken = 3.6.0
-
-#Required by:
-#Zope2 2.13.7
-#zope.browsermenu 3.9.1
-#zope.publisher 3.12.6
-zope.browser = 1.3
-
-#Required by:
-#Zope2 2.13.7
-zope.browsermenu = 3.9.1
-
-#Required by:
-#Zope2 2.13.7
-zope.browserpage = 3.12.2
-
-#Required by:
-#Zope2 2.13.7
-#zope.ptresource 3.9.0
-zope.browserresource = 3.12.0
-
-#Required by:
-#Products.StandardCacheManagers 2.13.0
-#Zope2 2.13.7
-#zope.pagetemplate 3.5.2
-#zope.lifecycleevent 3.7.0
-#zope.contentprovider 3.7.2
-#zope.viewlet 3.7.2
-#zope.i18n 3.7.4
-#zope.security 3.8.2
-#zope.container 3.12.0
-#zope.publisher 3.12.6
-#zope.traversing 3.14.0
-zope.component = 3.10.0
-
-#Required by:
-#Zope2 2.13.7
-#zope.viewlet 3.7.2
-#zope.sendmail 3.7.4
-#zope.publisher 3.12.6
-zope.configuration = 3.7.4
-
-#Required by:
-#Products.BTreeFolder2 2.13.3
-#Zope2 2.13.7
-#zope.site 3.9.2
-zope.container = 3.12.0
-
-#Required by:
-#Zope2 2.13.7
-#zope.viewlet 3.7.2
-zope.contentprovider = 3.7.2
-
-#Required by:
-#Zope2 2.13.7
-zope.contenttype = 3.5.3
-
-#Required by:
-#Zope2 2.13.7
-zope.deferredimport = 3.5.3
-
-#Required by:
-#Products.ZCatalog 2.13.14
-#zope.container 3.12.0
-zope.dottedname = 3.4.6
-
-#Required by:
-#Products.BTreeFolder2 2.13.3
-#Zope2 2.13.7
-#zope.lifecycleevent 3.7.0
-#zope.viewlet 3.7.2
-#zope.schema 3.8.0
-#zope.site 3.9.2
-#zope.publisher 3.12.6
-zope.event = 3.5.0-1
-
-#Required by:
-#Zope2 2.13.7
-#zope.testing 3.10.2
-#zope.publisher 3.12.6
-zope.exceptions = 3.6.1
-
-#Required by:
-#zope.container 3.12.0
-zope.filerepresentation = 3.6.0
-
-#Required by:
-#Zope2 2.13.7
-#zope.size 3.4.1
-#zope.pagetemplate 3.5.2
-#zope.tal 3.5.2
-#zope.viewlet 3.7.2
-#zope.sendmail 3.7.4
-#zope.security 3.8.2
-#zope.traversing 3.14.0
-zope.i18nmessageid = 3.5.3
-
-#Required by:
-#slapos.core 0.2
-#Zope2 2.13.7
-zope.interface = 3.6.3
-
-#Required by:
-#Products.BTreeFolder2 2.13.3
-#Zope2 2.13.7
-#zope.site 3.9.2
-zope.lifecycleevent = 3.7.0
-
-#Required by:
-#Zope2 2.13.7
-#zope.viewlet 3.7.2
-#zope.security 3.8.2
-#zope.publisher 3.12.6
-zope.location = 3.9.0
-
-#Required by:
-#Zope2 2.13.7
-#zope.ptresource 3.9.0
-zope.pagetemplate = 3.5.2
-
-#Required by:
-#Zope2 2.13.7
-zope.processlifetime = 1.0
-
-#Required by:
-#Zope2 2.13.7
-#zope.publisher 3.12.6
-#zope.traversing 3.14.0
-zope.proxy = 3.6.1
-
-#Required by:
-#Zope2 2.13.7
-zope.ptresource = 3.9.0
-
-#Required by:
-#Zope2 2.13.7
-#zope.viewlet 3.7.2
-#zope.traversing 3.14.0
-zope.publisher = 3.12.6
-
-#Required by:
-#Zope2 2.13.7
-#zope.viewlet 3.7.2
-#zope.sendmail 3.7.4
-#zope.security 3.8.2
-#zope.testbrowser 4.0.2
-zope.schema = 3.8.0
-
-#Required by:
-#Zope2 2.13.7
-#zope.viewlet 3.7.2
-#zope.site 3.9.2
-#zope.traversing 3.14.0
-zope.security = 3.8.2
-
-#Required by:
-#Zope2 2.13.7
-zope.sendmail = 3.7.4
-
-#Required by:
-#Zope2 2.13.7
-zope.sequencesort = 3.4.0
-
-#Required by:
-#Zope2 2.13.7
-zope.site = 3.9.2
-
-#Required by:
-#Zope2 2.13.7
-zope.size = 3.4.1
-
-#Required by:
-#Zope2 2.13.7
-zope.structuredtext = 3.5.1
-
-#Required by:
-#Zope2 2.13.7
-#zope.tales 3.5.1
-zope.tal = 3.5.2
-
-#Required by:
-#Zope2 2.13.7
-zope.testbrowser = 4.0.2
-
-#Required by:
-#Zope2 2.13.7
-zope.testing = 3.10.2
-
-#Required by:
-#Zope2 2.13.7
-#zope.viewlet 3.7.2
-zope.traversing = 3.14.0
-
-#Required by:
-#Zope2 2.13.7
-zope.viewlet = 3.7.2
-

software/kumofs/software.cfg

@@ -16,6 +16,18 @@ extends =
   ../../component/rdiff-backup/buildout.cfg
   ../../component/lxml-python/buildout.cfg
 
+# Use only quite well working sites.
+allow-hosts =
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  dist.repoze.org
+  effbot.org
+  github.com
+  peak.telecommunity.com
+  psutil.googlecode.com
+  www.dabeaz.com
+
 versions = versions
 
 parts +=
@@ -60,13 +72,13 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-slapos.cookbook = 0.4
+slapos.cookbook = 0.7
 
 erp5.recipe.cmmiforcei686 = 0.1.1
 hexagonit.recipe.cmmi = 1.5.0
 hexagonit.recipe.download = 1.5.0
 
-# Required by slapos.cookbook==0.4
+# Required by slapos.cookbook==0.7
 slapos.core = 0.2
 collective.recipe.template = 1.8
 netaddr = 0.7.5

software/mariadb/instance.cfg

+[buildout]
+parts =
+  instance
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+[instance]
+recipe = ${instance-recipe:egg}:${instance-recipe:module}
+dcrond_binary = ${dcron:location}/sbin/crond
+innobackupex_binary = ${xtrabackup:location}/bin/innobackupex
+logrotate_binary = ${logrotate:location}/usr/sbin/logrotate
+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
+openssl_binary = ${openssl:location}/bin/openssl
+perl_binary = ${perl:location}/bin/perl
+rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
+stunnel_binary = ${stunnel:location}/bin/stunnel

software/mariadb/software.cfg

+[buildout]
+
+extensions =
+  slapos.zcbworkarounds
+  slapos.rebootstrap
+
+find-links +=
+    http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+extends =
+  ../../component/mariadb/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/stunnel/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/perl/buildout.cfg
+  ../../component/xtrabackup/buildout.cfg
+  ../../component/rdiff-backup/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+
+# Use only quite well working sites.
+allow-hosts =
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  dist.repoze.org
+  effbot.org
+  github.com
+  peak.telecommunity.com
+  psutil.googlecode.com
+  www.dabeaz.com
+
+versions = versions
+
+parts +=
+# Create instance template
+#TODO : list here all parts.
+  template
+  libxslt
+  eggs
+  instance-recipe-egg
+
+# XXX: Workaround of SlapOS limitation
+# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
+# development / fast switching environment for whole software
+unzip = true
+
+[rebootstrap]
+# Default first version of rebootstrapped python
+version = 2
+section = python2.7
+
+[instance-recipe]
+egg = slapos.cookbook
+module = mysql
+
+[instance-recipe-egg]
+recipe = zc.recipe.egg
+python = python2.7
+eggs = ${instance-recipe:egg}
+
+[eggs]
+recipe = zc.recipe.egg
+python = python2.7
+eggs =
+  ${lxml-python:egg}
+
+[template]
+# Default template for the instance.
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = 69c32a67c5640d36ee042d2cfc35843d
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[versions]
+slapos.cookbook = 0.9
+
+# Required by slapos.cookbook==0.9
+slapos.core = 0.4
+collective.recipe.template = 1.8
+netaddr = 0.7.5
+xml-marshaller = 0.9.7
+setuptools = 0.6c12dev-r88795
+
+hexagonit.recipe.cmmi = 1.5.0
+hexagonit.recipe.download = 1.5.0
+plone.recipe.command = 1.1
+
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-001

software/memcached/software.cfg

@@ -15,6 +15,18 @@ extends =
   ../../component/rdiff-backup/buildout.cfg
   ../../component/lxml-python/buildout.cfg
 
+# Use only quite well working sites.
+allow-hosts =
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  dist.repoze.org
+  effbot.org
+  github.com
+  peak.telecommunity.com
+  psutil.googlecode.com
+  www.dabeaz.com
+
 versions = versions
 
 parts =
@@ -59,9 +71,9 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-slapos.cookbook = 0.4
+slapos.cookbook = 0.7
 
-# Required by slapos.cookbook==0.4
+# Required by slapos.cookbook==0.7
 slapos.core = 0.2
 collective.recipe.template = 1.8
 netaddr = 0.7.5

software/mysql-5.1/instance.cfg

+[buildout]
+parts =
+  instance
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+[instance]
+recipe = ${instance-recipe:egg}:${instance-recipe:module}
+dcrond_binary = ${dcron:location}/sbin/crond
+innobackupex_binary = ${xtrabackup:location}/bin/innobackupex
+logrotate_binary = ${logrotate:location}/usr/sbin/logrotate
+mysql_binary = ${mysql-5.1:location}/bin/mysql
+mysql_install_binary = ${mysql-5.1:location}/bin/mysql_install_db
+mysql_upgrade_binary = ${mysql-5.1:location}/bin/mysql_upgrade
+mysqld_binary = ${mysql-5.1:location}/libexec/mysqld
+openssl_binary = ${openssl:location}/bin/openssl
+perl_binary = ${perl:location}/bin/perl
+rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
+stunnel_binary = ${stunnel:location}/bin/stunnel

software/mysql-5.1/software.cfg

+[buildout]
+
+extensions =
+  slapos.zcbworkarounds
+  slapos.rebootstrap
+
+find-links +=
+    http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+extends =
+  ../../component/mysql-5.1/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/stunnel/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/perl/buildout.cfg
+  ../../component/xtrabackup/buildout.cfg
+  ../../component/rdiff-backup/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+
+# Use only quite well working sites.
+allow-hosts =
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  dist.repoze.org
+  effbot.org
+  github.com
+  peak.telecommunity.com
+  psutil.googlecode.com
+  www.dabeaz.com
+
+versions = versions
+
+parts +=
+#TODO : list here all parts.
+# Create instance template
+  template
+  libxslt
+  eggs
+  instance-recipe-egg
+  rdiff-backup
+
+# XXX: Workaround of SlapOS limitation
+# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
+# development / fast switching environment for whole software
+unzip = true
+
+[rebootstrap]
+# Default first version of rebootstrapped python
+version = 2
+section = python2.7
+
+[instance-recipe]
+egg = slapos.cookbook
+module = mysql
+
+[instance-recipe-egg]
+recipe = zc.recipe.egg
+python = python2.7
+eggs = ${instance-recipe:egg}
+
+[eggs]
+recipe = zc.recipe.egg
+python = python2.7
+eggs =
+  ${lxml-python:egg}
+
+[template]
+# Default template for the instance.
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = 2764597a6e4fe243cdf6e37b6535e767
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[versions]
+slapos.cookbook = 0.9
+
+# Required by slapos.cookbook==0.9
+slapos.core = 0.4
+collective.recipe.template = 1.8
+netaddr = 0.7.5
+xml-marshaller = 0.9.7
+setuptools = 0.6c12dev-r88795
+
+hexagonit.recipe.cmmi = 1.5.0
+hexagonit.recipe.download = 1.5.0
+plone.recipe.command = 1.1
+
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-001