From 1710d3ae1c1907010e925b42b23bd006dac2492f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Fri, 30 Mar 2012 12:25:52 +0200 Subject: [PATCH] Simplify LAMP stack(s) again, by using slapos.cfg stack --- stack/lamp.cfg | 29 +---------------------------- stack/lamp/buildout.cfg | 22 +++------------------- 2 files changed, 4 insertions(+), 47 deletions(-) diff --git a/stack/lamp.cfg b/stack/lamp.cfg index 4545904a4..54d421ce3 100644 --- a/stack/lamp.cfg +++ b/stack/lamp.cfg @@ -1,23 +1,4 @@ [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 = diff --git a/stack/lamp/buildout.cfg b/stack/lamp/buildout.cfg index 51d91cad4..f638f55d5 100644 --- a/stack/lamp/buildout.cfg +++ b/stack/lamp/buildout.cfg @@ -1,7 +1,4 @@ [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] -- 2.30.9