Commit 43836db7 authored by Marco Mariani's avatar Marco Mariani

root instance for default software_type

parent c6489887
......@@ -8,8 +8,8 @@ parts =
apache-php-postgres
pear-modules
eggs
template
template-apache-php
instance
instance-apache-php
#----------------
......
......@@ -7,6 +7,8 @@ parts =
instance-apache-php
instance-postgres
instance-default-root
extends =
../../component/apache/buildout.cfg
../../component/apache-php/buildout.cfg
......@@ -36,7 +38,7 @@ strip-top-level-dir = true
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
md5sum = fad4fe349039b9bac5f95322af1b8f5a
md5sum = 35d440866b4253dfa9f5ff291835fa50
mode = 0644
[instance-apache-php]
......@@ -75,6 +77,12 @@ 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 = 53c9020f7a0b5203f976e069e455787b
mode = 0644
#----------------
#--
......
[buildout]
parts = request-apache
[request-apache]
<= slap-connection
recipe = slapos.cookbook:request
software-url = $${slap-connection:software-release-url}
software-type = apache
name = Apache
......@@ -8,5 +8,6 @@ offline = true
[switch_softwaretype]
recipe = slapos.cookbook:softwaretype
default = ${template-apache-php:output}
postgres = ${template-postgres:output}
default = ${instance-default-root:output}
apache = ${instance-apache-php:output}
postgres = ${instance-postgres: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