From 35d12299601743fb7fb56efe577b1232531c13ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Tue, 12 Feb 2013 16:59:03 +0100
Subject: [PATCH] LAPP: Remove root instance.
---
stack/lapp/buildout.cfg | 10 +---------
stack/lapp/instance-default-root.cfg.in | 14 --------------
stack/lapp/instance.cfg.in | 3 +--
3 files changed, 2 insertions(+), 25 deletions(-)
delete mode 100644 stack/lapp/instance-default-root.cfg.in
diff --git a/stack/lapp/buildout.cfg b/stack/lapp/buildout.cfg
index 2192e5185..d638fd40e 100644
--- a/stack/lapp/buildout.cfg
+++ b/stack/lapp/buildout.cfg
@@ -15,8 +15,6 @@ parts =
instance-postgres-import
instance-postgres-export
- instance-default-root
-
extends =
../resilient/buildout.cfg
@@ -50,7 +48,7 @@ strip-top-level-dir = true
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
-md5sum = 7e09e857ea14fee4a43a771afeafb677
+md5sum = a482fa0e72839b4bd75b169ac1460d64
mode = 0644
[instance-apache-php]
@@ -124,12 +122,6 @@ library-dirs =
rpath =
${postgresql:location}/lib
-[instance-default-root]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-default-root.cfg.in
-output = ${buildout:directory}/instance-default-root.cfg
-md5sum = 27c15556e7a8b14ae78123fe36b9afc3
-mode = 0644
#----------------
#--
diff --git a/stack/lapp/instance-default-root.cfg.in b/stack/lapp/instance-default-root.cfg.in
deleted file mode 100644
index 381702966..000000000
--- a/stack/lapp/instance-default-root.cfg.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[buildout]
-parts = request-apache
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[request-apache]
-<= slap-connection
-recipe = slapos.cookbook:request
-software-url = $${slap-connection:software-release-url}
-software-type = apache
-name = Apache
-
diff --git a/stack/lapp/instance.cfg.in b/stack/lapp/instance.cfg.in
index 02e4808f7..596a9dfb0 100644
--- a/stack/lapp/instance.cfg.in
+++ b/stack/lapp/instance.cfg.in
@@ -9,8 +9,7 @@ offline = true
[switch_softwaretype]
recipe = slapos.cookbook:softwaretype
-default = ${instance-default-root:output}
-apache = ${instance-apache-php:output}
+default = ${instance-apache-php:output}
resilient = ${instance-resilient:rendered}
postgres = ${instance-postgres:output}
postgres-import = ${instance-postgres-import:output}
--
2.30.9