Simplify LAMP stack(s) again, by using slapos.cfg stack

parent 9d9470b0
[buildout] [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 = parts =
template template
apache-php apache-php
...@@ -38,7 +19,7 @@ extends = ...@@ -38,7 +19,7 @@ extends =
../component/stunnel/buildout.cfg ../component/stunnel/buildout.cfg
../component/pycrypto-python/buildout.cfg ../component/pycrypto-python/buildout.cfg
../component/mysql-python/buildout.cfg ../component/mysql-python/buildout.cfg
shacache-client.cfg ../stack/slapos.cfg
../component/python-2.7/buildout.cfg ../component/python-2.7/buildout.cfg
# python-2.7 component is here only for compatibility with old software.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 # It is not needed and should not be used in LAMP-based software.cfg
...@@ -52,14 +33,6 @@ eggs = ...@@ -52,14 +33,6 @@ eggs =
[mariadb] [mariadb]
keep-compile-dir = false 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] [networkcache]
# Romain Courteaud + Sebastien Robin + Alain Takoudjou signature certificate # Romain Courteaud + Sebastien Robin + Alain Takoudjou signature certificate
signature-certificate-list = signature-certificate-list =
......
[buildout] [buildout]
find-links +=
http://www.nexedi.org/static/packages/source/slapos.buildout/
parts = parts =
apache-php apache-php
mariadb mariadb
...@@ -18,21 +15,7 @@ parts = ...@@ -18,21 +15,7 @@ parts =
template-mariadb-pbsready-import template-mariadb-pbsready-import
template-mariadb-pbsready-export 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 = extends =
../shacache-client.cfg
../../component/mariadb/buildout.cfg ../../component/mariadb/buildout.cfg
../../component/apache/buildout.cfg ../../component/apache/buildout.cfg
../../component/apache-php/buildout.cfg ../../component/apache-php/buildout.cfg
...@@ -40,7 +23,6 @@ extends = ...@@ -40,7 +23,6 @@ extends =
../../component/git/buildout.cfg ../../component/git/buildout.cfg
../../component/glib/buildout.cfg ../../component/glib/buildout.cfg
../../component/logrotate/buildout.cfg ../../component/logrotate/buildout.cfg
../../component/python-2.7/buildout.cfg
../../component/perl/buildout.cfg ../../component/perl/buildout.cfg
../../component/sqlite3/buildout.cfg ../../component/sqlite3/buildout.cfg
../../component/lxml-python/buildout.cfg ../../component/lxml-python/buildout.cfg
...@@ -52,6 +34,9 @@ extends = ...@@ -52,6 +34,9 @@ extends =
../../component/mysql-python/buildout.cfg ../../component/mysql-python/buildout.cfg
../../component/dropbear/buildout.cfg ../../component/dropbear/buildout.cfg
../slapos.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 versions = versions
...@@ -65,7 +50,6 @@ module = lamp.request ...@@ -65,7 +50,6 @@ module = lamp.request
[instance-recipe-egg] [instance-recipe-egg]
recipe = zc.recipe.egg recipe = zc.recipe.egg
#python = python2.7
eggs = ${instance-recipe:egg} eggs = ${instance-recipe:egg}
[application] [application]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment