diff --git a/stack/lamp/buildout.cfg b/stack/lamp/buildout.cfg index fd11bc9eceefe66ca780f20e63ec36a3f552b88e..f48d41e6995c7ed28e2719637293c133700f6097 100644 --- a/stack/lamp/buildout.cfg +++ b/stack/lamp/buildout.cfg @@ -20,6 +20,9 @@ parts = template-mariadb-import template-mariadb-export + template-default-root + + extends = ../resilient/buildout.cfg ../../component/mariadb/buildout.cfg @@ -65,14 +68,14 @@ strip-top-level-dir = true recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg output = ${buildout:directory}/template.cfg -md5sum = 8b4660ccaccda1fa8b0e73b8ac38be11 +md5sum = 33dfe88c7b477ed565bee141cd09f86c mode = 0644 [template-apache-php] recipe = slapos.recipe.template url = ${:_profile_base_location_}/apache/instance-apache-php.cfg output = ${buildout:directory}/template-apache-php.cfg -md5sum = d22e0fbf6fad9cdc9b7584a2d0ef4b2c +md5sum = a5dd222b3faa4e1ef2df9b3b9bb47966 mode = 0644 [template-apache-backup] @@ -120,6 +123,15 @@ md5sum = 4b7dec765265b27c8235419b82ca7b02 mode = 0644 +[template-default-root] +recipe = slapos.recipe.template +url = ${:_profile_base_location_}/default-root.cfg.in +output = ${buildout:directory}/default-root.cfg +#md5sum = 48e0c1511db6786d63b1e194446b506b +mode = 0644 + + + # Dummy parts in case no application configuration file is needed [application-template] filename = diff --git a/stack/lamp/default-root.cfg.in b/stack/lamp/default-root.cfg.in new file mode 100644 index 0000000000000000000000000000000000000000..dd7df3d246102fac6be8e871bd823b2d02d9c983 --- /dev/null +++ b/stack/lamp/default-root.cfg.in @@ -0,0 +1,10 @@ +[buildout] +parts = request-apache + +[request-apache] +<= slap-connection +recipe = slapos.cookbook:request +software-url = $${slap-connection:software-release-url} +software-type = apache +name = Apache + diff --git a/stack/lamp/instance.cfg b/stack/lamp/instance.cfg index 6bb628f1cb00435d0e4081b812e40b9312f7dc35..a3d5146266f1aca0d138d1617cb0c1eb78513986 100644 --- a/stack/lamp/instance.cfg +++ b/stack/lamp/instance.cfg @@ -12,7 +12,8 @@ offline = true [switch_softwaretype] recipe = slapos.cookbook:softwaretype -default = ${template-apache-php:output} +default = ${template-default-root:output} +apache = ${template-apache-php:output} resilient = ${template-resilient-lamp:rendered} mariadb = ${template-mariadb:output} mariadb-import = ${template-mariadb-import:output}