Merge branch 'master' into slapos

CHANGES.txt

-0.11 (not yet released)
-================
+0.12 (unreleased)
+=================
+
+ * No changes yet.
 
- * No change yet.
+0.11 (2011-07-07)
+=================
+
+ * Enable test suite runner for vifib.
 
 0.10 (2011-07-01)
-================
+=================
 
  * Add PHPMyAdmin software release used in SlapOS tutorials
  [Cedric de Saint Martin]

component/stunnel/buildout.cfg

@@ -17,8 +17,8 @@ filename = stunnel-4-hooks.py
 
 [stunnel-4]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.stunnel.org/stunnel/stunnel-4.38.tar.gz
-md5sum = de5c0478303da746f946d9c112fa7f4b
+url = ftp://ftp.stunnel.org/stunnel/stunnel-4.39.tar.gz
+md5sum = 853739119a8364daea750154af6d7e79
 pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook
 configure-options =
   --enable-ipv6

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.11dev'
+version = '0.12dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"

slapos/recipe/vifib.py

@@ -224,6 +224,8 @@ SSLCARevocationPath %(ca_crl)s"""
     kumo_conf = self.installKumo(self.getLocalIPv4Address())
     self.installTestRunner(ca_conf, mysql_conf, conversion_server_conf,
         memcached_conf, kumo_conf)
+    self.installTestSuiteRunner(ca_conf, mysql_conf, conversion_server_conf,
+                           memcached_conf, kumo_conf)
     self.linkBinary()
     self.setConnectionDict(dict(
       development_zope='http://%s:%s/' % (ip, zope_port),

software/erp5testnode/software.cfg

@@ -8,6 +8,11 @@ find-links = http://www.nexedi.org/static/packages/source/slapos.buildout/
     http://dist.repoze.org
     http://www.nexedi.org/static/packages/source/
 
+# Separate from site eggs
+allowed-eggs-from-site-packages =
+include-site-packages = false
+exec-sitecustomize = false
+
 versions = versions
 rebootstrap-section = python2.6
 

software/phpmyadmin/software.cfg

@@ -18,7 +18,6 @@ versions = versions
 
 parts =
   template
-  downloadcache-workaround
   apache-php
   mariadb
   eggs
@@ -57,8 +56,7 @@ strip-top-level-dir = true
 
 [application-template]
 recipe = slapos.recipe.download
-#url = https://docs.google.com/a/lnowak.com/uc?id=0B_lVQSQ57Cz7Yzg3MjFiYTgtNmJlYy00YjhhLWE4ZGEtYThlOWM2NzA3YWQ0&export=download&hl=en
-url = ${:_profile_base_location_}/phpmyadmin-configuration-template.php.ini
+url = ${:_profile_base_location_}/phpmyadmin.inc.php.in
 #md5sum = Student may put here md5sum of this file, this is good idea
 download-only = True
 filename = template.in

software/slaprunner/instance.cfg

@@ -11,4 +11,4 @@ slaprunner = ${buildout:directory}/bin/slaprunner
 slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
 slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
 slapproxy = ${buildout:directory}/bin/slapproxy
-supervisor = ${buildout:directory}/bin/slapgrid-supervisor
+supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl

stack/erp5.cfg

@@ -215,7 +215,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 stop-on-error = true
 repository = http://git.erp5.org/repos/erp5.git
 branch = master
-revision = 0c37bafcc688c022d710f04ffafa226e3543a2cd
+revision = 336a8d63bdcabd92bfe3d9466685e5cd47fad716
 command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
 update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi