Separate egg from instance-egg

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

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