software/re6stnet: Use buildout.hash.cfg

software/re6stnet/buildout.hash.cfg

+# THIS IS NOT A BUILDOUT FILE, despite purposedly using a compatible syntax.
+# The only allowed lines here are (regexes):
+# - "^#" comments, copied verbatim
+# - "^[" section beginings, copied verbatim
+# - lines containing an "=" sign which must fit in the following categorie.
+#   - "^\s*filename\s*=\s*path\s*$" where "path" is relative to this file
+#     Copied verbatim.
+#   - "^\s*hashtype\s*=.*" where "hashtype" is one of the values supported
+#     by the re-generation script.
+#     Re-generated.
+# - other lines are copied verbatim
+# Substitution (${...:...}), extension ([buildout] extends = ...) and
+# section inheritance (< = ...) are NOT supported (but you should really
+# not need these here).
+[template]
+filename = instance.cfg.in
+md5sum = 610fc6fd0444d3bab3fca4478572749a
+
+[template-re6stnet]
+filename = instance-re6stnet.cfg.in
+md5sum = 73c8fad6db7c711b0822891aba574564
+
+[template-apache-conf]
+filename = apache.conf.in
+md5sum = d64cafda1139b740a49a9f5e30a1b57b
+
+[template-re6st-registry-conf]
+filename = re6st-registry.conf.in
+md5sum = b0f0facfea82a4481f4fb5b0b263e09a
+
+[template-wrapper]
+filename = wrapper.in
+md5sum = 69e63cb58267335e21da772bd867657e
+
+[template-registry-run]
+filename = registry-run.in
+md5sum = 0bf4f2c03e06b55c6c6cc55fa33e65d6

software/re6stnet/software.cfg

 [buildout]
 
 extends =
+  buildout.hash.cfg
   ../../component/dash/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/gzip/buildout.cfg
@@ -50,26 +51,14 @@ recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
 mode = 644
 
-[template-jinja2-base]
+[template]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/${:filename}.in
-rendered = ${buildout:directory}/${:filename}
-# XXX: extra-context is needed because we cannot append to a key of an extended
-# section.
-extra-context =
+rendered = ${buildout:directory}/instance.cfg
+template = ${:_profile_base_location_}/${:filename}
 context =
     key bin_directory buildout:bin-directory
     key develop_eggs_directory buildout:develop-eggs-directory
     key eggs_directory buildout:eggs-directory
-    ${:extra-context}
-
-
-[template]
-< = template-jinja2-base
-filename = template.cfg
-template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 610fc6fd0444d3bab3fca4478572749a
-extra-context =
     key apache_location apache:location
     key dash_location dash:location
     key logrotate_location logrotate:location
@@ -85,28 +74,18 @@ extra-context =
 
 [template-re6stnet]
 < = download-base
-filename = instance-re6stnet.cfg.in
-md5sum = 73c8fad6db7c711b0822891aba574564
 
 [template-apache-conf]
 < = download-base
-filename = apache.conf.in
-md5sum = d64cafda1139b740a49a9f5e30a1b57b
 
 [template-re6st-registry-conf]
 < = download-base
-filename = re6st-registry.conf.in
-md5sum = b0f0facfea82a4481f4fb5b0b263e09a
 
 [template-wrapper]
 < = download-base
-filename = wrapper.in
-md5sum = 69e63cb58267335e21da772bd867657e
 
 [template-registry-run]
 < = download-base
-filename = registry-run.in
-md5sum = 0bf4f2c03e06b55c6c6cc55fa33e65d6
 
 [versions]
 re6stnet = 0.533