Merge branch 'master' into erp5

CHANGES.txt

 0.10 (unreleased)
 ================
 
- * No change yet.
+ * Add PHPMyAdmin software release used in SlapOS tutorials
+ [Cedric de Saint Martin]
 
 0.9 (2011-06-24)
 ================

software/phpmyadmin/software.cfg

@@ -95,9 +95,9 @@ update-command = ${:command}
 stop-on-error = True
 
 [versions]
-slapos.cookbook = 0.11
+slapos.cookbook = 0.10
 
-# Required by slapos.cookbook==0.11
+# Required by slapos.cookbook==0.10
 slapos.core = 0.8
 collective.recipe.template = 1.8
 netaddr = 0.7.5

software/slaprunner/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}
+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

software/slaprunner/software.cfg

+[buildout]
+extends =
+  ../../stack/flask.cfg
+
+parts =
+  template
+  eggs
+  instance-recipe-egg
+
+find-links +=
+  http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+versions = versions
+
+[instance-recipe]
+egg = slapos.cookbook
+module = slaprunner
+
+[instance-recipe-egg]
+recipe = zc.recipe.egg
+python = python2.7
+eggs = ${instance-recipe:egg}
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+output = ${buildout:directory}/template.cfg
+mode = 0644
+md5sum = 04b17b8665eb4e11ce3a4661ad98e5e3
+
+[eggs]
+eggs +=
+  slapos.toolbox
+
+[versions]
+slapos.cookbook = 0.10
+
+# Required by slapos.cookbook==0.10
+slapos.core = 0.8
+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-004
\ No newline at end of file

stack/flask.cfg

@@ -4,6 +4,18 @@ extends =
   ../component/python-2.7/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
+
 parts =
   eggs
 
@@ -11,7 +23,12 @@ parts =
 unzip = true
 
 [eggs]
+python = python2.7
 recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
   Flask
+  slapos.cookbook
+
+[lxml-python]
+python = python2.7