Commit c8f56233 authored by Marco Mariani's avatar Marco Mariani

template -> instance rename

parent 7b2441f4
...@@ -11,14 +11,14 @@ parts = ...@@ -11,14 +11,14 @@ parts =
dropbear dropbear
eggs eggs
instance-recipe-egg instance-recipe-egg
template instance
instance-apache-php instance-apache-php
template-mariadb instance-mariadb
#Contains the importer and exporter recipes for mariadb #Contains the importer and exporter recipes for mariadb
template-mariadb-import instance-mariadb-import
template-mariadb-export instance-mariadb-export
instance-default-root instance-default-root
...@@ -64,11 +64,11 @@ recipe = hexagonit.recipe.download ...@@ -64,11 +64,11 @@ recipe = hexagonit.recipe.download
#If provided tarball does not containt top directory this option shall be changed to false #If provided tarball does not containt top directory this option shall be changed to false
strip-top-level-dir = true strip-top-level-dir = true
[template] [instance]
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 = 9e6a4adaa6b5ac923ad16e637bf5170c md5sum = bf4932305b1075b632b2adf2017c0c0e
mode = 0644 mode = 0644
[instance-apache-php] [instance-apache-php]
...@@ -101,25 +101,25 @@ md5sum = 5151295af3994499e2be6d68938787d3 ...@@ -101,25 +101,25 @@ md5sum = 5151295af3994499e2be6d68938787d3
mode = 0644 mode = 0644
[template-mariadb] [instance-mariadb]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb.cfg.in url = ${:_profile_base_location_}/mariadb/instance-mariadb.cfg.in
output = ${buildout:directory}/instance-mariadb.cfg output = ${buildout:directory}/instance-mariadb.cfg
md5sum = aa33c843f04753a34154467522f0c65e md5sum = aa33c843f04753a34154467522f0c65e
mode = 0644 mode = 0644
[template-mariadb-import] [instance-mariadb-import]
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 = 24a9286f1aed04f7393c92f251cbe0c9 md5sum = ea43b8ed38a55a11b027fc283c0e718a
mode = 0644 mode = 0644
[template-mariadb-export] [instance-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 = 96e915bca045e3ff62a3f8fc6e692685 md5sum = 685c8abf0f487c72273846002ec631a0
mode = 0644 mode = 0644
......
...@@ -12,9 +12,9 @@ recipe = slapos.cookbook:softwaretype ...@@ -12,9 +12,9 @@ recipe = slapos.cookbook:softwaretype
default = ${instance-default-root:output} default = ${instance-default-root:output}
apache = ${instance-apache-php:output} apache = ${instance-apache-php:output}
resilient = ${template-resilient-lamp:rendered} resilient = ${template-resilient-lamp:rendered}
mariadb = ${template-mariadb:output} mariadb = ${instance-mariadb:output}
mariadb-import = ${template-mariadb-import:output} mariadb-import = ${instance-mariadb-import:output}
mariadb-export = ${template-mariadb-export:output} mariadb-export = ${instance-mariadb-export:output}
apache-backup = ${instance-apache-backup:output} apache-backup = ${instance-apache-backup:output}
#frozen creates a syntax error, meaning it can keep its data. #frozen creates a syntax error, meaning it can keep its data.
......
[buildout] [buildout]
extends = ${template-mariadb:output} extends = ${instance-mariadb:output}
${pbsready-export:output} ${pbsready-export:output}
parts += mariadb parts += mariadb
......
[buildout] [buildout]
extends = ${template-mariadb:output} extends = ${instance-mariadb:output}
${pbsready-import:output} ${pbsready-import:output}
parts += mariadb parts += mariadb
......
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