software/powerdns: Use buildout.hash.cfg

hexagonit.recipe.download is replaced with slapos.recipe.build:download in
order to have the same approach everywhere and so _update_hash_filename_ key is
used to avoid collision with section:filename.

software/powerdns/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
+md5sum = da8be58db4255c07750f7a7583eab3ca
+
+[template-powerdns]
+filename = instance-powerdns.cfg
+md5sum = 0275136daa72e1e3ee135cf0c1fa8af3
+
+[template-pdns-configuration]
+_update_hash_filename_ = template/pdns.conf.jinja2
+md5sum = 7934b7037344678eff3031e1e73e0bb2
+
+[template-dns-replicate]
+_update_hash_filename_ = instance-powerdns-replicate.cfg.jinja2
+md5sum = 46acd4ed071df8d7139dcd0434be42eb
+
+[iso-list]
+_update_hash_filename_ = template/zz.countries.nexedi.dk.rbldnsd
+md5sum = c4dc8c141d81b92d92cdb82ca67a13ee
+
+[template-cdn-conf]
+_update_hash_filename_ = template/cdn.conf.in
+md5sum = 29c29f93b3b0bd2f71f86f7b337e4543

software/powerdns/instance-powerdns.cfg

@@ -64,7 +64,7 @@ socket-directory = $${pdns-directory:socket}
 webserver-port = 8088
 
 [geo]
-ip-map-zonefile = ${iso-list:location}/${iso-list:filename}
+ip-map-zonefile = ${iso-list:target}
 geo-maps = $${pdns-directory:geo-maps}
 
 [pdns-directory]
@@ -130,7 +130,7 @@ monitor-password = $${monitor-publish-parameters:monitor-password}
 {%     do part_list.append(slave_section_name) %}
 [{{ slave_section_name }}]
 < = jinja2-template-base
-template = ${template-cdn-conf:location}/${template-cdn-conf:filename}
+template = ${template-cdn-conf:target}
 rendered = $${geo:geo-maps}/{{ slave_reference }}
 configuration = {{ json_module.dumps(slave) }}
 extra-context =

software/powerdns/software.cfg

 [buildout]
 extends =
+  buildout.hash.cfg
   ../../stack/slapos.cfg
   ../../component/powerdns/buildout.cfg
   ../../stack/monitor/buildout.cfg
@@ -17,48 +18,34 @@ eggs =
 
 [template]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-md5sum = da8be58db4255c07750f7a7583eab3ca
+url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [template-powerdns]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-powerdns.cfg
-md5sum = f0d87be6df84f23c811638ce9d5f60ea
+url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template-powerdns.cfg
 mode = 0644
 
 [template-pdns-configuration]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/template/pdns.conf.jinja2
-md5sum = 7934b7037344678eff3031e1e73e0bb2
+url = ${:_profile_base_location_}/${:_update_hash_filename_}
 mode = 640
 
 [template-dns-replicate]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-powerdns-replicate.cfg.jinja2
-md5sum = 46acd4ed071df8d7139dcd0434be42eb
+url = ${:_profile_base_location_}/${:_update_hash_filename_}
 mode = 0644
 
 [iso-list]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/template/zz.countries.nexedi.dk.rbldnsd
-md5sum = c4dc8c141d81b92d92cdb82ca67a13ee
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-filename = zz.countries.nexedi.dk.rbldnsd
-download-only = true
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/${:_update_hash_filename_}
 mode = 0644
 
 [template-cdn-conf]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/template/cdn.conf.in
-md5sum = 29c29f93b3b0bd2f71f86f7b337e4543
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-filename = cdn.conf.in
-download-only = true
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/${:_update_hash_filename_}
 mode = 0644
 
 [versions]