LAPP: Remove root instance.

parent 7228dbea
...@@ -15,8 +15,6 @@ parts = ...@@ -15,8 +15,6 @@ parts =
instance-postgres-import instance-postgres-import
instance-postgres-export instance-postgres-export
instance-default-root
extends = extends =
../resilient/buildout.cfg ../resilient/buildout.cfg
...@@ -50,7 +48,7 @@ strip-top-level-dir = true ...@@ -50,7 +48,7 @@ strip-top-level-dir = true
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg output = ${buildout:directory}/instance.cfg
md5sum = 7e09e857ea14fee4a43a771afeafb677 md5sum = a482fa0e72839b4bd75b169ac1460d64
mode = 0644 mode = 0644
[instance-apache-php] [instance-apache-php]
...@@ -124,12 +122,6 @@ library-dirs = ...@@ -124,12 +122,6 @@ library-dirs =
rpath = rpath =
${postgresql:location}/lib ${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
#---------------- #----------------
#-- #--
......
[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
...@@ -9,8 +9,7 @@ offline = true ...@@ -9,8 +9,7 @@ offline = true
[switch_softwaretype] [switch_softwaretype]
recipe = slapos.cookbook:softwaretype recipe = slapos.cookbook:softwaretype
default = ${instance-default-root:output} default = ${instance-apache-php:output}
apache = ${instance-apache-php:output}
resilient = ${instance-resilient:rendered} resilient = ${instance-resilient:rendered}
postgres = ${instance-postgres:output} postgres = ${instance-postgres:output}
postgres-import = ${instance-postgres-import:output} postgres-import = ${instance-postgres-import:output}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment