software/slaprunner: Factorise common.cfg a bit.

Still many variants which could likely be simplified.

software/slaprunner/common.cfg

@@ -49,162 +49,128 @@ parts =
 [shellinabox]
 <= shellinabox-github
 
-[template]
+[template-base]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
+url = ${:_profile_base_location_}/${:filename}
+mode = 0644
+
+[download-base]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+mode = 0644
+
+[download-only-base]
+< = download-base
+ignore-existing = true
+download-only = true
+
+[template-download-base]
+# Downloads from template directory into current directory
+< = download-only-base
+url = ${:_profile_base_location_}/template/${:filename}
+
+[template]
+< = template-base
+filename = instance.cfg
 output = ${buildout:directory}/template.cfg
 md5sum = 06107f93ebe78905c957a4c4fc4edf16
-mode = 0644
 
 [template-runner]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-runner.cfg
+< = template-base
+filename = instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
 md5sum = 07905ec872e84bc42c6ab089f5270ac2
-mode = 0644
 
 [template-runner-import-script]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/template/runner-import.sh.jinja2
-download-only = true
+< = template-download-base
 md5sum = 5db39d7f56fd1f96ce6466e9055841a1
 filename = runner-import.sh.jinja2
-mode = 0644
 
 [instance-runner-import]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-runner-import.cfg.in
+< = template-base
+filename = instance-runner-import.cfg.in
 output = ${buildout:directory}/instance-runner-import.cfg
 md5sum = 9db9957f452bda370cb2d5cc2e833e85
-mode = 0644
 
 [template-runner-export-script]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/template/runner-export.sh.jinja2
-download-only = true
+< = template-download-base
 md5sum = 2e96b9daa5cd20fc77e9573a9ce3fe52
 filename = runner-export.sh.jinja2
-mode = 0644
 
 [instance-runner-export]
+< = download-base
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-runner-export.cfg.in
 filename = instance-runner-export.cfg.in
 md5sum = 852a2ed99af566d27e5e4403334a3376
-mode = 0644
 
 [template-resilient]
+< = download-base
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
 md5sum = a902b84ac7d1e29a7fdb06cbc7dec150
 filename = instance-resilient.cfg.jinja2
-mode = 0644
 
 [template-resilient-test]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2
-download-only = true
+< = download-only-base
 md5sum = 09a955bde79fb11565d689b0415e135c
 filename = instance-resilient-test.cfg.jinja2
-mode = 0644
 
 [template_nginx_conf]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/nginx_conf.in
-download-only = true
+< = download-only-base
 md5sum = 2b06f7eb9a1d45d250d4b92a944db925
 filename = nginx_conf.in
-mode = 0644
 
 [template_httpd_conf]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/httpd_conf.in
-download-only = true
+< = download-only-base
 md5sum = 40825ef2d259ae3b86dfd2f28f597d3a
 filename = httpd_conf.in
-mode = 0644
 
 [template_launcher]
+< = download-base
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/launcher.in
 md5sum = 525e37ea8b2acf6209869999b15071a6
 filename = launcher.in
-mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [template-slapos-cfg]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/template/${:filename}
+< = template-download-base
 md5sum = ef16446d432e1397182b1654fe920ffb
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = slapos.cfg.in
-download-only = true
-mode = 0644
 
 [template-parameters]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/${:filename}
+< = download-only-base
 md5sum = f8446fcf254b4929eb828a9a1d7e5f62
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = parameters.xml.in
-download-only = true
-mode = 0644
 
 [template-bash-profile]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/template/${:filename}
+< = template-download-base
 md5sum = 1c88cbca0c1e705eeb4b544ef4616097
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = bash_profile.in
-download-only = true
-mode = 0644
 
 [template-supervisord]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/template/${:filename}
+< = template-download-base
 md5sum = d294d0dafd265048399de6da8c96345f
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = supervisord.conf.in
-download-only = true
-mode = 0644
 
 [template-listener-slapgrid]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/template/${:filename}
+< = template-download-base
 md5sum = 49d50410cf7467175a841eb7cd0d93d4
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = listener_slapgrid.py.in
-download-only = true
-mode = 0644
 
 [monitor-check-webrunner-internal-instance]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/template/${:filename}
-download-only = true
+< = template-download-base
 #md5sum = 4c44d617d5bfd1db8695200e896480c0
 destination = ${buildout:parts-directory}/${:filename}
 filename = monitor-check-webrunner-internal-instances.py
-mode = 0644
 
 [template-resilient-software-release-information]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-download-only = true
+< = template-download-base
 md5sum = 2451072826a9ad9425d62c9e9c7f6284
-url = ${:_profile_base_location_}/template/${:filename}
 filename = resilient_software_release_information.py.in
-mode = 0644
 
 [eggs]
 recipe = zc.recipe.egg