Merge branch 'master' into lamp

Conflicts:
	software/lamp-template-static/software.cfg

component/slapos/buildout.cfg

@@ -122,7 +122,7 @@ meld3 = 0.6.7
 netaddr = 0.7.6
 setuptools = 0.6c12dev-r88846
 slapos.core = 0.20
-slapos.libnetworkcache = 0.10
+slapos.libnetworkcache = 0.11
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2

component/stunnel/buildout.cfg

@@ -17,8 +17,8 @@ filename = stunnel-4-hooks.py
 
 [stunnel-4]
 recipe = hexagonit.recipe.cmmi
-url = http://mirror.bit.nl/stunnel/stunnel-4.50.tar.gz
-md5sum = d68b4565294496a8bdf23c728a679f53
+url = http://mirror.bit.nl/stunnel/stunnel-4.52.tar.gz
+md5sum = f5e713dda0e8efa659f372832ecd0c2c
 pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook
 configure-options =
   --enable-ipv6

software/kumofs/software.cfg

 [buildout]
+extensions =
+  buildout-versions
+
 find-links +=
     http://www.nexedi.org/static/packages/source/slapos.buildout/
 
 extends =
-  ../../component/git/buildout.cfg
   ../../component/kumo/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/stunnel/buildout.cfg
   ../../component/rdiff-backup/buildout.cfg
@@ -17,20 +18,24 @@ allow-hosts =
   *.nexedi.org
   *.python.org
   *.sourceforge.net
+  alastairs-place.net
   dist.repoze.org
   effbot.org
   github.com
   peak.telecommunity.com
   psutil.googlecode.com
   www.dabeaz.com
+  www.owlfish.com
 
 versions = versions
 
-parts +=
+parts =
 # Create instance template
-#TODO : list here all parts.
   template
-  libxslt
+  rdiff-backup
+  dcron
+  kumo
+  stunnel
   eggs
   instance-recipe-egg
 
@@ -45,12 +50,10 @@ module = kumofs
 
 [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}
 
@@ -63,18 +66,89 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-slapos.cookbook = 0.13
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.6.0-dev-SlapOS-003
 
-erp5.recipe.cmmiforcei686 = 0.1.1
+Jinja2 = 2.6
+Werkzeug = 0.8.2
+buildout-versions = 1.7
+erp5.recipe.cmmiforcei686 = 0.1.3
 hexagonit.recipe.cmmi = 1.5.0
+meld3 = 0.6.8
+rdiff-backup = 1.0.5
+slapos.cookbook = 0.38
+slapos.recipe.template = 2.2
+
+# Required by:
+# slapos.core==0.21
+Flask = 0.8
+
+# Required by:
+# slapos.cookbook==0.38
+PyXML = 0.8.5
+
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
 hexagonit.recipe.download = 1.5.0
 
-# Required by slapos.cookbook==0.13
-slapos.core = 0.2
-collective.recipe.template = 1.8
-netaddr = 0.7.5
+# Required by:
+# slapos.cookbook==0.38
+# slapos.core==0.21
+# xml-marshaller==0.9.7
+lxml = 2.3.3
+
+# Required by:
+# slapos.cookbook==0.38
+netaddr = 0.7.6
+
+# Required by:
+# slapos.core==0.21
+netifaces = 0.6
+
+# Required by:
+# slapos.cookbook==0.38
+# slapos.core==0.21
+# zc.buildout==1.6.0-dev-SlapOS-003
+# zc.recipe.egg==1.3.2
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.38
+slapos.core = 0.21
+
+# Required by:
+# slapos.core==0.21
+supervisor = 3.0a12
+
+# Required by:
+# slapos.cookbook==0.38
 xml-marshaller = 0.9.7
-setuptools = 0.6c12dev-r88795
 
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
+# Required by:
+# erp5.recipe.cmmiforcei686==0.1.3
+# slapos.cookbook==0.38
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.21
+zope.interface = 3.8.0
+
+[networkcache]
+# Cedric de Saint Martin signature certificate
+signature-certificate-list =
+  -----BEGIN PRIVATE KEY-----
+  MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBANqRqW69hpRtqjuX
+  maEl9cwKPSb/Vu170OUqaNrZYaMnAv1T3pTU8cob5IjuC/HUZiiX/OEIxIsRZuKO
+  H8visw4PQEqSbSKvqOmJONirzXDHyye0Sf9yDRyEubAzbRjsP7wQabAkHhvsUGTK
+  dALIIhoAVTGkDBMryxqMJ9MHzyLjAgMBAAECgYEAmtszIUvUqxsbzob1iTBc+wiS
+  FSw6CZ58/bDTg6Mawz6jppqii+5ntRuYCtAl1Fv5WW998m6E2kclDwVFT+45j0AO
+  JroHGY74Egy54Wl7D2hE5ldJKy4LL6bPdM+FQy3S46Ekc7OyStU2LmMmWHdVMlzx
+  p7UQJ8UeE/UiBj5hUBkCQQD23HriV7cuYqJLzP689CWvWFjjJFtpuJBtYve7aqNb
+  DsL5i64H0eMkDyQzYavZfZg7lO9KAy0PbofInXI9owPHAkEA4qkN5MUZQcNb3zRd
+  TtPdA8WWRuArnAN4U3BZPMHu2UQ9U9gWedY2NzzqYGLw4Hx7XH54fRExG2L35LyA
+  zD9wBQJAS42rZn7mJ6I0ffKdvIMUzZfCjLJh7/d27KOvooK+wG3CKtIfT3FjjXO8
+  5qTsDcKsxv+MRSC3t9NiZ3oYrtinnQJBAJBrozynEYbDkaBQ3ztA50xl83DJmT/Z
+  Piv8JAAAmc26G1F3GCsdgIIFwFkV8eE3r+qpcuBNufp3Pvhx26dIrHkCQQDzFZp4
+  VDhTCQQoEBrGXoz6TRzmGfu8VpQZMXdL7O6aGNVqQGfsWQS7Sh+8iXsOi2APTAjr
+  xUL3fZnXAjr6AnZC
+  -----END PRIVATE KEY-----

software/lamp-template-static/software.cfg

 [buildout]
+extensions += buildout-versions
+
 versions = versions
 
 parts =
@@ -37,9 +39,68 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
+zc.buildout = 1.6.0-dev-SlapOS-003
 slapos.cookbook = 0.20
 
+# Generated by buildout-versions
+Jinja2 = 2.6
+Werkzeug = 0.8.2
+buildout-versions = 1.7
+hexagonit.recipe.cmmi = 1.5.0
+hexagonit.recipe.download = 1.5.0
+meld3 = 0.6.8
+plone.recipe.command = 1.1
+slapos.recipe.template = 2.2
+
+# Required by:
+# slapos.core==0.21
+Flask = 0.8
+
+# Required by:
+# slapos.cookbook==0.20
+PyXML = 0.8.4
+
+# Required by:
+# slapos.cookbook==0.20
+# slapos.core==0.21
+# xml-marshaller==0.9.7
+lxml = 2.3.3
+
+# Required by:
+# slapos.cookbook==0.20
+netaddr = 0.7.6
+
+# Required by:
+# slapos.core==0.21
+netifaces = 0.6
+
+# Required by:
+# slapos.cookbook==0.20
+# slapos.core==0.21
+# zc.buildout==1.6.0-dev-SlapOS-003
+# zc.recipe.egg==1.3.2
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.20
+slapos.core = 0.21
+
+# Required by:
+# slapos.core==0.21
+supervisor = 3.0a12
+
+# Required by:
+# slapos.cookbook==0.20
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.cookbook==0.20
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.21
+zope.interface = 3.8.0
+
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
 # creates download cache, which in turn switches builout to "semi-offline" mode

software/mysql-5.1/software.cfg

 [buildout]
+extensions =
+  buildout-versions
 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/lxml-python/buildout.cfg
+  ../../component/mysql-5.1/buildout.cfg
   ../../component/perl/buildout.cfg
-  ../../component/xtrabackup/buildout.cfg
   ../../component/rdiff-backup/buildout.cfg
-  ../../component/lxml-python/buildout.cfg
+  ../../component/stunnel/buildout.cfg
+  ../../component/xtrabackup/buildout.cfg
   ../../stack/shacache-client.cfg
 
 # Use only quite well working sites.
@@ -19,23 +20,27 @@ allow-hosts =
   *.nexedi.org
   *.python.org
   *.sourceforge.net
+  alastairs-place.net
   dist.repoze.org
   effbot.org
   github.com
   peak.telecommunity.com
   psutil.googlecode.com
   www.dabeaz.com
+  www.owlfish.com
 
 versions = versions
 
-parts +=
-#TODO : list here all parts.
-# Create instance template
+parts =
   template
-  libxslt
+  rdiff-backup
+  stunnel
+  logrotate
+  xtrabackup
+  dcron
+  mysql-5.1
   eggs
   instance-recipe-egg
-  rdiff-backup
 
 # XXX: Workaround of SlapOS limitation
 # Unzippig of eggs is required, as SlapOS do not yet provide nicely working
@@ -48,12 +53,10 @@ 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}
 
@@ -66,60 +69,55 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-zc.buildout = 1.5.3-dev-SlapOS-009
+zc.buildout = 1.6.0-dev-SlapOS-003
+# Use old cookbook version
 slapos.cookbook = 0.13
 
 Jinja2 = 2.6
-Werkzeug = 0.7.1
+Werkzeug = 0.8.2
+buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
-meld3 = 0.6.7
+hexagonit.recipe.download = 1.5.0
+meld3 = 0.6.8
 rdiff-backup = 1.0.5
-slapos.recipe.template = 1.1
+slapos.recipe.template = 2.2
 
 # Required by:
-# slapos.core==0.14
-Flask = 0.7.2
+# slapos.core==0.21
+Flask = 0.8
 
 # Required by:
 # slapos.cookbook==0.13
 PyXML = 0.8.4
 
-# Required by:
-# slapos.recipe.template==1.1
-collective.recipe.template = 1.9
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
 # Required by:
 # slapos.cookbook==0.13
-# slapos.core==0.14
+# slapos.core==0.21
 # xml-marshaller==0.9.7
-lxml = 2.3
+lxml = 2.3.3
 
 # Required by:
 # slapos.cookbook==0.13
 netaddr = 0.7.6
 
 # Required by:
-# slapos.core==0.14
-netifaces = 0.4
+# slapos.core==0.21
+netifaces = 0.6
 
 # Required by:
 # slapos.cookbook==0.13
-# slapos.core==0.14
-# zc.buildout==1.5.3-dev-SlapOS-009
+# slapos.core==0.21
+# zc.buildout==1.6.0-dev-SlapOS-003
 # zc.recipe.egg==1.3.2
 setuptools = 0.6c12dev-r88846
 
 # Required by:
 # slapos.cookbook==0.13
-slapos.core = 0.14
+slapos.core = 0.21
 
 # Required by:
-# slapos.core==0.14
-supervisor = 3.0a10
+# slapos.core==0.21
+supervisor = 3.0a12
 
 # Required by:
 # slapos.cookbook==0.13
@@ -130,5 +128,26 @@ xml-marshaller = 0.9.7
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.14
-zope.interface = 3.7.0
\ No newline at end of file
+# slapos.core==0.21
+zope.interface = 3.8.0
+
+[networkcache]
+# Cedric de Saint Martin signature certificate
+signature-certificate-list =
+  -----BEGIN PRIVATE KEY-----
+  MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBANqRqW69hpRtqjuX
+  maEl9cwKPSb/Vu170OUqaNrZYaMnAv1T3pTU8cob5IjuC/HUZiiX/OEIxIsRZuKO
+  H8visw4PQEqSbSKvqOmJONirzXDHyye0Sf9yDRyEubAzbRjsP7wQabAkHhvsUGTK
+  dALIIhoAVTGkDBMryxqMJ9MHzyLjAgMBAAECgYEAmtszIUvUqxsbzob1iTBc+wiS
+  FSw6CZ58/bDTg6Mawz6jppqii+5ntRuYCtAl1Fv5WW998m6E2kclDwVFT+45j0AO
+  JroHGY74Egy54Wl7D2hE5ldJKy4LL6bPdM+FQy3S46Ekc7OyStU2LmMmWHdVMlzx
+  p7UQJ8UeE/UiBj5hUBkCQQD23HriV7cuYqJLzP689CWvWFjjJFtpuJBtYve7aqNb
+  DsL5i64H0eMkDyQzYavZfZg7lO9KAy0PbofInXI9owPHAkEA4qkN5MUZQcNb3zRd
+  TtPdA8WWRuArnAN4U3BZPMHu2UQ9U9gWedY2NzzqYGLw4Hx7XH54fRExG2L35LyA
+  zD9wBQJAS42rZn7mJ6I0ffKdvIMUzZfCjLJh7/d27KOvooK+wG3CKtIfT3FjjXO8
+  5qTsDcKsxv+MRSC3t9NiZ3oYrtinnQJBAJBrozynEYbDkaBQ3ztA50xl83DJmT/Z
+  Piv8JAAAmc26G1F3GCsdgIIFwFkV8eE3r+qpcuBNufp3Pvhx26dIrHkCQQDzFZp4
+  VDhTCQQoEBrGXoz6TRzmGfu8VpQZMXdL7O6aGNVqQGfsWQS7Sh+8iXsOi2APTAjr
+  xUL3fZnXAjr6AnZC
+  -----END PRIVATE KEY-----
+

software/slaprunner/software.cfg

@@ -49,7 +49,7 @@ buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
 meld3 = 0.6.7
 slapos.cookbook = 0.31
-slapos.libnetworkcache = 0.10
+slapos.libnetworkcache = 0.11
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.8