From c8f5623333caa407f7895e5e9f7d78a918f10de1 Mon Sep 17 00:00:00 2001
From: Marco Mariani <marco.mariani@nexedi.com>
Date: Wed, 21 Nov 2012 14:39:26 +0100
Subject: [PATCH] template -> instance rename
---
stack/lamp/buildout.cfg | 22 +++++++++----------
stack/lamp/instance.cfg.in | 6 ++---
.../mariadb/instance-mariadb-export.cfg.in | 2 +-
.../mariadb/instance-mariadb-import.cfg.in | 2 +-
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/stack/lamp/buildout.cfg b/stack/lamp/buildout.cfg
index dc145eb67..66eaf92ea 100644
--- a/stack/lamp/buildout.cfg
+++ b/stack/lamp/buildout.cfg
@@ -11,14 +11,14 @@ parts =
dropbear
eggs
instance-recipe-egg
- template
+ instance
instance-apache-php
- template-mariadb
+ instance-mariadb
#Contains the importer and exporter recipes for mariadb
- template-mariadb-import
- template-mariadb-export
+ instance-mariadb-import
+ instance-mariadb-export
instance-default-root
@@ -64,11 +64,11 @@ recipe = hexagonit.recipe.download
#If provided tarball does not containt top directory this option shall be changed to false
strip-top-level-dir = true
-[template]
+[instance]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
-md5sum = 9e6a4adaa6b5ac923ad16e637bf5170c
+md5sum = bf4932305b1075b632b2adf2017c0c0e
mode = 0644
[instance-apache-php]
@@ -101,25 +101,25 @@ md5sum = 5151295af3994499e2be6d68938787d3
mode = 0644
-[template-mariadb]
+[instance-mariadb]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb.cfg.in
output = ${buildout:directory}/instance-mariadb.cfg
md5sum = aa33c843f04753a34154467522f0c65e
mode = 0644
-[template-mariadb-import]
+[instance-mariadb-import]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb-import.cfg.in
output = ${buildout:directory}/instance-mariadb-import.cfg
-md5sum = 24a9286f1aed04f7393c92f251cbe0c9
+md5sum = ea43b8ed38a55a11b027fc283c0e718a
mode = 0644
-[template-mariadb-export]
+[instance-mariadb-export]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb-export.cfg.in
output = ${buildout:directory}/instance-mariadb-export.cfg
-md5sum = 96e915bca045e3ff62a3f8fc6e692685
+md5sum = 685c8abf0f487c72273846002ec631a0
mode = 0644
diff --git a/stack/lamp/instance.cfg.in b/stack/lamp/instance.cfg.in
index f0cddf052..4fe109cf3 100644
--- a/stack/lamp/instance.cfg.in
+++ b/stack/lamp/instance.cfg.in
@@ -12,9 +12,9 @@ recipe = slapos.cookbook:softwaretype
default = ${instance-default-root:output}
apache = ${instance-apache-php:output}
resilient = ${template-resilient-lamp:rendered}
-mariadb = ${template-mariadb:output}
-mariadb-import = ${template-mariadb-import:output}
-mariadb-export = ${template-mariadb-export:output}
+mariadb = ${instance-mariadb:output}
+mariadb-import = ${instance-mariadb-import:output}
+mariadb-export = ${instance-mariadb-export:output}
apache-backup = ${instance-apache-backup:output}
#frozen creates a syntax error, meaning it can keep its data.
diff --git a/stack/lamp/mariadb/instance-mariadb-export.cfg.in b/stack/lamp/mariadb/instance-mariadb-export.cfg.in
index 7d8ba7167..5bdeea81d 100644
--- a/stack/lamp/mariadb/instance-mariadb-export.cfg.in
+++ b/stack/lamp/mariadb/instance-mariadb-export.cfg.in
@@ -1,5 +1,5 @@
[buildout]
-extends = ${template-mariadb:output}
+extends = ${instance-mariadb:output}
${pbsready-export:output}
parts += mariadb
diff --git a/stack/lamp/mariadb/instance-mariadb-import.cfg.in b/stack/lamp/mariadb/instance-mariadb-import.cfg.in
index a30cc0ad6..42c06973a 100644
--- a/stack/lamp/mariadb/instance-mariadb-import.cfg.in
+++ b/stack/lamp/mariadb/instance-mariadb-import.cfg.in
@@ -1,5 +1,5 @@
[buildout]
-extends = ${template-mariadb:output}
+extends = ${instance-mariadb:output}
${pbsready-import:output}
parts += mariadb
--
2.30.9