Commit 007784c4 authored by Marco Mariani's avatar Marco Mariani

further rename-simplify-cleanup

parent da17f680
[buildout] [buildout]
extends = ${instance-apache-php:output} extends = ${instance-apache-php:output}
${instance-pbsready-export:output} ${pbsready-export:output}
parts = parts =
apache-proxy apache-proxy
......
...@@ -68,7 +68,7 @@ strip-top-level-dir = true ...@@ -68,7 +68,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 = 5b7ad4002de3e3e46fb2c3b7e44c81c0 md5sum = 9e6a4adaa6b5ac923ad16e637bf5170c
mode = 0644 mode = 0644
[instance-apache-php] [instance-apache-php]
...@@ -112,14 +112,14 @@ mode = 0644 ...@@ -112,14 +112,14 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb-import.cfg.in url = ${:_profile_base_location_}/mariadb/instance-mariadb-import.cfg.in
output = ${buildout:directory}/instance-mariadb-import.cfg output = ${buildout:directory}/instance-mariadb-import.cfg
#md5sum = 0a3f052a38298dc4153a6eca13712b28 md5sum = 24a9286f1aed04f7393c92f251cbe0c9
mode = 0644 mode = 0644
[template-mariadb-export] [template-mariadb-export]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb-export.cfg.in url = ${:_profile_base_location_}/mariadb/instance-mariadb-export.cfg.in
output = ${buildout:directory}/instance-mariadb-export.cfg output = ${buildout:directory}/instance-mariadb-export.cfg
#md5sum = 3638ea4fa57144b88562cb1bcb3531dc md5sum = 96e915bca045e3ff62a3f8fc6e692685
mode = 0644 mode = 0644
......
[buildout] [buildout]
extends =
${template-switchsoftware:output}
parts = parts =
switch_softwaretype switch_softwaretype
...@@ -18,7 +15,10 @@ resilient = ${template-resilient-lamp:rendered} ...@@ -18,7 +15,10 @@ resilient = ${template-resilient-lamp:rendered}
mariadb = ${template-mariadb:output} mariadb = ${template-mariadb:output}
mariadb-import = ${template-mariadb-import:output} mariadb-import = ${template-mariadb-import:output}
mariadb-export = ${template-mariadb-export:output} mariadb-export = ${template-mariadb-export:output}
pull-backup = ${template-pull-backup:output}
apache-backup = ${instance-apache-backup:output} apache-backup = ${instance-apache-backup:output}
#frozen creates a syntax error, meaning it can keep its data.
#It's dirty as hell, it needs to be replaced.
frozen = ${instance-frozen:output} frozen = ${instance-frozen:output}
pull-backup = ${template-pull-backup:output}
[buildout] [buildout]
extends = ${template-mariadb:output} extends = ${template-mariadb:output}
${instance-pbsready-export:output} ${pbsready-export:output}
parts += mariadb parts += mariadb
......
[buildout] [buildout]
extends = ${template-mariadb:output} extends = ${template-mariadb:output}
${instance-pbsready-import:output} ${pbsready-import:output}
parts += mariadb parts += mariadb
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
parts = parts =
#Templates needed to setup automatic backup #Templates needed to setup automatic backup
instance-pbsready pbsready
instance-pbsready-import pbsready-import
instance-pbsready-export pbsready-export
template-replicated template-replicated
template-parts template-parts
...@@ -12,35 +12,34 @@ parts = ...@@ -12,35 +12,34 @@ parts =
instance-frozen instance-frozen
template-resilient template-resilient
template-switchsoftware
[instance-pbsready] [pbsready]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pbsready.cfg.in url = ${:_profile_base_location_}/pbsready.cfg.in
output = ${buildout:directory}/instance-pbsready.cfg output = ${buildout:directory}/pbsready.cfg
md5sum = 45e64cfb6afbcfda1f9f85e33c73bd99 md5sum = 45e64cfb6afbcfda1f9f85e33c73bd99
mode = 0644 mode = 0644
[instance-pbsready-import] [pbsready-import]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pbsready-import.cfg.in url = ${:_profile_base_location_}/pbsready-import.cfg.in
output = ${buildout:directory}/instance-pbsready-import.cfg output = ${buildout:directory}/pbsready-import.cfg
#md5sum = 398e77061a904d0565db57b1ffbaf128 md5sum = 0c63d9202426c257576c14113614942d
mode = 0644 mode = 0644
[instance-pbsready-export] [pbsready-export]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pbsready-export.cfg.in url = ${:_profile_base_location_}/pbsready-export.cfg.in
output = ${buildout:directory}/instance-pbsready-export.cfg output = ${buildout:directory}/pbsready-export.cfg
#md5sum = 29d36aac2008b173cb9ce5da9e88c0fa md5sum = a82c4551efdb000dc1db18adb5b64754
mode = 0644 mode = 0644
[template-pull-backup] [template-pull-backup]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pull-backup.cfg.in url = ${:_profile_base_location_}/instance-pull-backup.cfg.in
output = ${buildout:directory}/instance-pull-backup.cfg output = ${buildout:directory}/instance-pull-backup.cfg
md5sum = f88cc9192a63c88f83a9e5191075534e md5sum = dd91dd7c1845f120eb5b1987c2689b40
mode = 0644 mode = 0644
[template-replicated] [template-replicated]
...@@ -53,7 +52,7 @@ destination = ${buildout:directory}/template-replicated.cfg.in ...@@ -53,7 +52,7 @@ destination = ${buildout:directory}/template-replicated.cfg.in
[template-parts] [template-parts]
recipe = slapos.recipe.download recipe = slapos.recipe.download
url = ${:_profile_base_location_}/template-parts.cfg.in url = ${:_profile_base_location_}/template-parts.cfg.in
md5sum = f5fc27235725f05fdbde76a78ebc363e md5sum = c942f82552fcb42fc74a5f896e0cd5f3
mode = 0644 mode = 0644
destination = ${buildout:directory}/template-parts.cfg.in destination = ${buildout:directory}/template-parts.cfg.in
...@@ -69,10 +68,3 @@ output = ${buildout:directory}/resilient.cfg ...@@ -69,10 +68,3 @@ output = ${buildout:directory}/resilient.cfg
md5sum = 59e74d290d623de2c1e147e48f284fba md5sum = 59e74d290d623de2c1e147e48f284fba
mode = 0644 mode = 0644
[template-switchsoftware]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/switchsoftware.cfg.in
output = ${buildout:directory}/switchsoftware.cfg
#md5sum = a0e895173ff33ffea97b0bbb52d7e486
mode = 0644
[buildout] [buildout]
extends = ${instance-pbsready:output} extends = ${pbsready:output}
parts += cron-entry-backup parts += cron-entry-backup
......
[buildout] [buildout]
extends = ${instance-pbsready:output} extends = ${pbsready:output}
parts += import-on-notification parts += import-on-notification
......
[buildout]
parts =
switch_softwaretype
[switch_softwaretype]
recipe = slapos.cookbook:softwaretype
pull-backup = ${template-pull-backup:output}
#frozen creates a syntax error, meaning it can keep its data.
#It's dirty as hell, it needs to be replaced.
frozen = ${instance-frozen: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