Commit ac0d8b20 authored by Marco Mariani's avatar Marco Mariani

renamed templates and sections

parent bf845eb4
......@@ -64,7 +64,7 @@ strip-top-level-dir = true
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
md5sum = 38bdcf0a8263d4a19bd6a35c0cd00340
md5sum = b997c019109d386c119a70bd53d34acb
mode = 0644
[instance-apache-php]
......@@ -81,9 +81,9 @@ output = ${buildout:directory}/instance-apache-backup.cfg
md5sum = 48f969d82319a9d145570f5f0fd27672
mode = 0644
[template-resilient-lamp]
[instance-resilient]
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/template-resilient.cfg.in
template = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
rendered = ${buildout:directory}/instance-resilient.cfg
context = key templateapache instance-apache-php:output
......@@ -93,7 +93,7 @@ context = key templateapache instance-apache-php:output
import-list = file parts template-parts:destination
file replicated template-replicated:destination
md5sum = 5605ad8896c2718854bf26148c4ae940
md5sum = 15697876aefa8ec504e91b122b58ec19
mode = 0644
......
# vim: set ft=cfg:
{% import 'parts' as parts %}
{% import 'replicated' as replicated %}
......
......@@ -10,7 +10,7 @@ offline = true
[switch_softwaretype]
recipe = slapos.cookbook:softwaretype
default = ${instance-apache-php:output}
resilient = ${template-resilient-lamp:rendered}
resilient = ${instance-resilient:rendered}
mariadb = ${instance-mariadb:output}
mariadb-import = ${instance-mariadb-import:output}
mariadb-export = ${instance-mariadb-export:output}
......
......@@ -50,7 +50,7 @@ strip-top-level-dir = true
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
md5sum = 1aaf3ea7b14e09e66904bdb80e3cfe2f
md5sum = 7e09e857ea14fee4a43a771afeafb677
mode = 0644
[instance-apache-php]
......@@ -67,9 +67,9 @@ output = ${buildout:directory}/instance-apache-backup.cfg
md5sum = db879141c0b6a77ef8b3b7e699f5583a
mode = 0644
[template-resilient-lapp]
[instance-resilient]
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/template-resilient.cfg.in
template = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
rendered = ${buildout:directory}/instance-resilient.cfg
context = key templateapache instance-apache-php:output
......@@ -79,7 +79,7 @@ context = key templateapache instance-apache-php:output
import-list = file parts template-parts:destination
file replicated template-replicated:destination
md5sum = 525f50e60d0a96557a552de6afa4ab88
md5sum = 46c7d8f691bd37d84e0bd03b83e51d14
mode = 0644
......
# vim: set ft=cfg:
{% import 'parts' as parts %}
{% import 'replicated' as replicated %}
......
......@@ -11,7 +11,7 @@ offline = true
recipe = slapos.cookbook:softwaretype
default = ${instance-default-root:output}
apache = ${instance-apache-php:output}
resilient = ${template-resilient-lapp:rendered}
resilient = ${instance-resilient:rendered}
postgres = ${instance-postgres:output}
postgres-import = ${instance-postgres-import:output}
postgres-export = ${instance-postgres-export: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