From 1022d0f1d655e042c6afecb3d368c26d327a8b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Tue, 28 Feb 2012 16:02:59 +0100 Subject: [PATCH] Apache is not a stack --- software/apache/software.cfg | 28 ++++++++++++---- stack/apache.cfg | 65 ------------------------------------ 2 files changed, 21 insertions(+), 72 deletions(-) delete mode 100644 stack/apache.cfg diff --git a/software/apache/software.cfg b/software/apache/software.cfg index 82087ef6a..47d53ba06 100644 --- a/software/apache/software.cfg +++ b/software/apache/software.cfg @@ -1,6 +1,17 @@ [buildout] +versions = versions + extends = - ../../stack/apache.cfg + ../../component/binutils/buildout.cfg + ../../component/gcc/buildout.cfg + ../../component/lxml-python/buildout.cfg + ../../component/apache/buildout.cfg + ../../component/stunnel/buildout.cfg + ../../component/varnish/buildout.cfg + ../../component/dcron/buildout.cfg + ../../component/logrotate/buildout.cfg + ../../component/rdiff-backup/buildout.cfg + ../../stack/slapos.cfg parts = template @@ -20,11 +31,6 @@ parts = eggs instance-recipe-egg -# XXX: Workaround of SlapOS limitation -# Unzippig of eggs is required, as SlapOS do not yet provide nicely working -# development / fast switching environment for whole software -unzip = true - [instance-recipe] # Note: In case if specific instantiation recipe is used this is the place to # put its name @@ -33,9 +39,13 @@ module = apache [instance-recipe-egg] recipe = zc.recipe.egg -python = python2.7 eggs = ${instance-recipe:egg} +[eggs] +recipe = zc.recipe.egg +eggs = + ${lxml-python:egg} + [template] # Default template for apache instance. recipe = slapos.recipe.template @@ -44,6 +54,10 @@ md5sum = 17180caef7d1c477fbb037d28b705e8b output = ${buildout:directory}/template.cfg mode = 0644 +[versions] +# Use SlapOS patched zc.buildout +zc.buildout = 1.5.3-dev-SlapOS-010 + [networkcache] # Cedric de Saint Martin signature certificate signature-certificate-list = diff --git a/stack/apache.cfg b/stack/apache.cfg deleted file mode 100644 index bcc012335..000000000 --- a/stack/apache.cfg +++ /dev/null @@ -1,65 +0,0 @@ -[buildout] -extensions = - slapos.zcbworkarounds - -find-links = - http://www.nexedi.org/static/packages/source/slapos.buildout/ - http://dist.repoze.org - http://www.nexedi.org/static/packages/source/ - -extends = - ../component/binutils/buildout.cfg - ../component/gcc/buildout.cfg - ../component/lxml-python/buildout.cfg - ../component/apache/buildout.cfg - ../component/stunnel/buildout.cfg - ../component/varnish/buildout.cfg - ../component/dcron/buildout.cfg - ../component/logrotate/buildout.cfg - ../component/python-2.7/buildout.cfg - shacache-client.cfg - ../component/rdiff-backup/buildout.cfg - -versions = versions - -parts = - binutils - gcc-java-minimal - apache - apache-antiloris - - stunnel - varnish-2.1 - - dcron - logrotate - rdiff-backup - -# Buildoutish - eggs - instance-recipe-egg - -[lxml-python] -python = python2.7 - -[instance-recipe-egg] -recipe = zc.recipe.egg -python = python2.7 -eggs = - ${instance-recipe:egg} - -[eggs] -recipe = zc.recipe.egg -python = python2.7 -eggs = - ${lxml-python:egg} - -[rebootstrap] -# Default first version of rebootstrapped python -version = 2 -section = python2.7 - -[versions] -# Use SlapOS patched zc.buildout -zc.buildout = 1.5.3-dev-SlapOS-010 -rdiff-backup = 1.0.5 -- 2.30.9