Merge remote-tracking branch 'origin/master' into erp5

software/lamp-template/software.cfg

@@ -7,7 +7,6 @@ parts =
   mariadb
   eggs
   instance-recipe-egg
-  downloadcache-workaround
   
 extends =
   ../../stack/lamp.cfg
@@ -18,7 +17,6 @@ url = Student shall put here url of zipped or tarballed web page or application
 md5sum = Student may put here md5sum of this file, this is good idea
 #If provided tarball does not contain top directory, option shall be changed to false
 strip-top-level-dir = true
-#extract-directory = 
 
 [application-template]
 recipe = slapos.recipe.download
@@ -43,91 +41,7 @@ url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-[mariadb]
-keep-compile-dir = false
-
 [instance-recipe-egg]
 recipe = zc.recipe.egg
 eggs = 
   ${instance-recipe:egg}
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-003
-# Generated by buildout-versions
-Jinja2 = 2.6
-Werkzeug = 0.8.2
-buildout-versions = 1.7
-hexagonit.recipe.cmmi = 1.5.0
-meld3 = 0.6.8
-plone.recipe.command = 1.1
-slapos.cookbook = 0.20
-slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
-slapos.recipe.template = 2.2
-
-# Required by:
-# slapos.core==0.21
-Flask = 0.8
-
-# Required by:
-# slapos.cookbook==0.38
-PyXML = 0.8.4
-
-# Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
-
-# 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
-
-# Required by:
-# slapos.cookbook==0.38
-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
-recipe = plone.recipe.command
-# in hexagonit.recipe.cmmi if there is no ${buildout:download-cache} set it resolves
-# to ${buildout:directory}/downloads but this variable is available late, that's
-# why it is hardcoded only for required case
-download-cache = ${buildout:directory}/downloads
-command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
-update-command = ${:command}
-stop-on-error = True
-

stack/lamp.cfg

 [buildout]
-extensions = buildout-versions
-
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-
-# Use only quite well working sites.
-allow-hosts =
-  *.nexedi.org
-  *.python.org
-  *.sourceforge.net
-  alastairs-place.net
-  dist.repoze.org
-  effbot.org
-  github.com
-  launchpad.net
-  peak.telecommunity.com
-  psutil.googlecode.com
-  www.dabeaz.com
-
 parts =
   template
   apache-php
@@ -38,7 +19,7 @@ extends =
   ../component/stunnel/buildout.cfg  
   ../component/pycrypto-python/buildout.cfg
   ../component/mysql-python/buildout.cfg
-  shacache-client.cfg
+  ../stack/slapos.cfg
   ../component/python-2.7/buildout.cfg
 # python-2.7 component is here only for compatibility with old software.cfg.
 # It is not needed and should not be used in LAMP-based software.cfg
@@ -52,14 +33,6 @@ eggs =
 [mariadb]
 keep-compile-dir = false
 
-[application]
-#XXX-Cedric : ugly hack to work around h.r.cmmi unrespectful behavior, so that
-#             a cmmi Executes before application but after template downloading.
-#             Useful when [application] uses slapos.recipe.build or
-#             slapos.recipe.download rather than h.r.download.
-depends = ${apache-php:location}
-
-
 [networkcache]
 # Romain Courteaud + Sebastien Robin + Alain Takoudjou signature certificate
 signature-certificate-list =

stack/lamp/buildout.cfg

 [buildout]
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-
 parts =
   apache-php
   mariadb
@@ -18,21 +15,7 @@ parts =
   template-mariadb-pbsready-import
   template-mariadb-pbsready-export
 
-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
-  launchpad.net
-
 extends =
-  ../shacache-client.cfg
   ../../component/mariadb/buildout.cfg
   ../../component/apache/buildout.cfg
   ../../component/apache-php/buildout.cfg
@@ -40,7 +23,6 @@ extends =
   ../../component/git/buildout.cfg
   ../../component/glib/buildout.cfg
   ../../component/logrotate/buildout.cfg
-  ../../component/python-2.7/buildout.cfg
   ../../component/perl/buildout.cfg
   ../../component/sqlite3/buildout.cfg
   ../../component/lxml-python/buildout.cfg
@@ -52,6 +34,9 @@ extends =
   ../../component/mysql-python/buildout.cfg
   ../../component/dropbear/buildout.cfg
   ../slapos.cfg
+  ../../component/python-2.7/buildout.cfg
+# python-2.7 component is here only for compatibility with old software.cfg.
+# It is not needed and should not be used in LAMP-based software.cfg
 
 versions = versions
 
@@ -65,7 +50,6 @@ module = lamp.request
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-#python = python2.7
 eggs = ${instance-recipe:egg}
 
 [application]