Separate egg from instance-egg

46bf5e65 · Cédric de Saint Martin · 544e1162 · 46bf5e65 · 46bf5e65
Commit 46bf5e65 authored Nov 16, 2011 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 13 additions and 1 deletion

software/apache/software.cfg software/apache/software.cfg +6 -0

stack/apache.cfg stack/apache.cfg +7 -1

No files found.
--- a/software/apache/software.cfg
+++ b/software/apache/software.cfg
@@ -16,6 +16,7 @@ parts =
  rdiff-backup

 # Buildoutish
+  eggs
  instance-recipe-egg

  template
@@ -31,6 +32,11 @@ unzip = true
 egg = slapos.cookbook
 module = apache

+[instance-recipe-egg]
+recipe = zc.recipe.egg
+python = python2.7
+eggs = ${instance-recipe:egg}
+
 [template]
 # Default template for apache instance.
 recipe = slapos.recipe.template

--- a/stack/apache.cfg
+++ b/stack/apache.cfg
@@ -36,6 +36,7 @@ parts =
  rdiff-backup

 # Buildoutish
+  eggs
  instance-recipe-egg

 [lxml-python]
@@ -45,9 +46,14 @@ python = python2.7
 recipe = zc.recipe.egg
 python = python2.7
 eggs =
-  ${lxml-python:egg}
  ${instance-recipe:egg}

+[eggs]
+recipe = zc.recipe.egg
+python = python2.7
+eggs =
+  ${lxml-python:egg}
+
 [rebootstrap]
 # Default first version of rebootstrapped python
 version = 2