renamed templates -> instance*cfg.in

stack/lamp/buildout.cfg

@@ -66,29 +66,29 @@ strip-top-level-dir = true
 
 [template]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-output = ${buildout:directory}/template.cfg
-md5sum = 33dfe88c7b477ed565bee141cd09f86c
+url = ${:_profile_base_location_}/instance.cfg.in
+output = ${buildout:directory}/instance.cfg
+md5sum = e080e7d978a1a2ec78a775ee48dda1d0
 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
+url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in
+output = ${buildout:directory}/instance-apache-php.cfg
 md5sum = a5dd222b3faa4e1ef2df9b3b9bb47966
 mode = 0644
 
 [template-apache-backup]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/apache/instance-apache-backup.cfg
-output = ${buildout:directory}/template-apache-backup.cfg
+url = ${:_profile_base_location_}/apache/instance-apache-backup.cfg.in
+output = ${buildout:directory}/instance-apache-backup.cfg
 md5sum = cfb77ac8785e0d125a785f69a5339014
 mode = 0644
 
 [template-resilient-lamp]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/instance-resilient.cfg
-rendered = ${buildout:directory}/template-resilient.cfg
+template = ${:_profile_base_location_}/template-resilient.cfg.in
+rendered = ${buildout:directory}/instance-resilient.cfg
 
 context = key templateapache template-apache-php:output
           key dropbear dropbear:location
@@ -103,22 +103,22 @@ mode = 0644
 
 [template-mariadb]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/mariadb/instance-mariadb.cfg
-output = ${buildout:directory}/template-mariadb.cfg
+url = ${:_profile_base_location_}/mariadb/instance-mariadb.cfg.in
+output = ${buildout:directory}/instance-mariadb.cfg
 md5sum = fa9dc10efbcf61119f4cbab37c741322
 mode = 0644
 
 [template-mariadb-import]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/mariadb/instance-mariadb-import.cfg
-output = ${buildout:directory}/template-mariadb-import.cfg
+url = ${:_profile_base_location_}/mariadb/instance-mariadb-import.cfg.in
+output = ${buildout:directory}/instance-mariadb-import.cfg
 md5sum = fa696733db4bd5b2e3e9fb6e0b09c59b
 mode = 0644
 
 [template-mariadb-export]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/mariadb/instance-mariadb-export.cfg
-output = ${buildout:directory}/template-mariadb-export.cfg
+url = ${:_profile_base_location_}/mariadb/instance-mariadb-export.cfg.in
+output = ${buildout:directory}/instance-mariadb-export.cfg
 md5sum = 4b7dec765265b27c8235419b82ca7b02
 mode = 0644
 

stack/resilient/buildout.cfg

@@ -15,68 +15,63 @@ parts =
   template-switchsoftware
 
 
-# XXX
-# instance*.cfg and template*.cfg files should be properly named
-# respectively instance*.cfg.in, and instance*.cfg
-
-
 [template-pbsready]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-pbsready.cfg
-output = ${buildout:directory}/template-pbsready.cfg
+url = ${:_profile_base_location_}/instance-pbsready.cfg.in
+output = ${buildout:directory}/instance-pbsready.cfg
 md5sum = 45e64cfb6afbcfda1f9f85e33c73bd99
 mode = 0644
 
 [template-pbsready-import]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-pbsready-import.cfg
-output = ${buildout:directory}/template-pbsready-import.cfg
+url = ${:_profile_base_location_}/instance-pbsready-import.cfg.in
+output = ${buildout:directory}/instance-pbsready-import.cfg
 md5sum = 5ba7477f9499a7dbde5f33ca96bd6ba4
 mode = 0644
 
 [template-pbsready-export]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-pbsready-export.cfg
-output = ${buildout:directory}/template-pbsready-export.cfg
+url = ${:_profile_base_location_}/instance-pbsready-export.cfg.in
+output = ${buildout:directory}/instance-pbsready-export.cfg
 md5sum = 29d36aac2008b173cb9ce5da9e88c0fa
 mode = 0644
 
 [template-pull-backup]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-pull-backup.cfg
-output = ${buildout:directory}/template-pull-backup.cfg
+url = ${:_profile_base_location_}/instance-pull-backup.cfg.in
+output = ${buildout:directory}/instance-pull-backup.cfg
 md5sum = f88cc9192a63c88f83a9e5191075534e
 mode = 0644
 
 [template-replicated]
 recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template-replicated.cfg
+url = ${:_profile_base_location_}/template-replicated.cfg.in
 md5sum = 140beeb9193e0580e42a6004b9e3821f
 mode = 0644
-destination = ${buildout:directory}/template-replicated.cfg
+destination = ${buildout:directory}/template-replicated.cfg.in
 
 [template-parts]
 recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/template-parts.cfg
+url = ${:_profile_base_location_}/template-parts.cfg.in
 md5sum = f5fc27235725f05fdbde76a78ebc363e
 mode = 0644
-destination = ${buildout:directory}/template-parts.cfg
+destination = ${buildout:directory}/template-parts.cfg.in
 
 [template-frozen]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-frozen.cfg
-output = ${buildout:directory}/template-frozen.cfg
+url = ${:_profile_base_location_}/instance-frozen.cfg.in
+output = ${buildout:directory}/instance-frozen.cfg
 
 [template-resilient]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/resilient.cfg
+url = ${:_profile_base_location_}/resilient.cfg.in
 output = ${buildout:directory}/resilient.cfg
 md5sum = 59e74d290d623de2c1e147e48f284fba
 mode = 0644
 
 [template-switchsoftware]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/switchsoftware.cfg
+url = ${:_profile_base_location_}/switchsoftware.cfg.in
 output = ${buildout:directory}/switchsoftware.cfg
 md5sum = c94a0ed85fce2e72254ae956dce7e40d
 mode = 0644