software/gitlab: Use buildout.hash.cfg

_update_hash_filename_ key is used to avoid clash with recipe.

software/gitlab/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).
+[instance.cfg]
+filename = instance.cfg.in
+md5sum = ddadc1eda2b474d6f2349409c05476eb
+
+[watcher]
+_update_hash_filename_ = watcher.in
+md5sum = 90690e1351637f20ff2df57a6c3e85b4
+
+[gitlab-export]
+_update_hash_filename_ = gitlab-export.in
+md5sum = a7b32680e80f34276f0a32a5e22dad50
+
+[database.yml.in]
+_update_hash_filename_ = template/database.yml.in
+md5sum = 61d1d04b9347b3168a1ad7676e4681ef
+
+[gitconfig.in]
+_update_hash_filename_ = template/gitconfig.in
+md5sum = 7782f5c5d75663c2586e28d029c51e49
+
+[gitlab-parameters.cfg]
+_update_hash_filename_ = gitlab-parameters.cfg
+md5sum = 8f4537cb8a0c9a8e0058c30cb687681c
+
+[gitlab-shell-config.yml.in]
+_update_hash_filename_ = template/gitlab-shell-config.yml.in
+md5sum = 58c09b1e609f903e483a76fe9e57366c
+
+[gitlab-unicorn-startup.in]
+_update_hash_filename_ = gitlab-unicorn-startup.in
+md5sum = a9cb347f60aad3465932fd36cd4fe25d
+
+[gitlab.yml.in]
+_update_hash_filename_ = template/gitlab.yml.in
+md5sum = 0ddf4093dcf4427e5a160707e6017950
+
+[instance-gitlab.cfg.in]
+_update_hash_filename_ = instance-gitlab.cfg.in
+md5sum = bd8bccad43e7cf294af2fc9b60fb3b46
+
+[instance-gitlab-export.cfg.in]
+_update_hash_filename_ = instance-gitlab-export.cfg.in
+md5sum = 319d7dbe3ad9b260c1e292cfc0d13b11
+
+[instance-gitlab-test.cfg.in]
+_update_hash_filename_ = instance-gitlab-test.cfg.in
+md5sum = a4ad76856db98e508af7e773d9ff78f9
+
+[macrolib.cfg.in]
+_update_hash_filename_ = macrolib.cfg.in
+md5sum = a56a44e96f65f5ed20211bb6a54279f4
+
+[nginx-gitlab-http.conf.in]
+_update_hash_filename_ = template/nginx-gitlab-http.conf.in
+md5sum = abcc5eda03e10b26c74619f299a7f6a8
+
+[nginx.conf.in]
+_update_hash_filename_ = template/nginx.conf.in
+md5sum = 1374f38ab6f295b850d45ea0019ec05d
+
+[rack_attack.rb.in]
+_update_hash_filename_ = template/rack_attack.rb.in
+md5sum = 7d0e6dc6b826f6df6b20d8574a29e2f8
+
+[resque.yml.in]
+_update_hash_filename_ = template/resque.yml.in
+md5sum = 7c89a730889e3224548d9abe51a2d719
+
+[smtp_settings.rb.in]
+_update_hash_filename_ = template/smtp_settings.rb.in
+md5sum = 4e1ced687a86e4cfff2dde91237e3942
+
+[template-gitlab-resiliency-restore.sh.in]
+_update_hash_filename_ = template/template-gitlab-resiliency-restore.sh.in
+md5sum = 590fcadf26085fdd17487175bc0a469d
+
+[unicorn.rb.in]
+_update_hash_filename_ = template/unicorn.rb.in
+md5sum = 83921db1835d9e81cbbe808631cc40a9

software/gitlab/software.cfg

 # GitLab software-release
 [buildout]
 extends =
+    buildout.hash.cfg
     ../../stack/slapos.cfg
     ../../component/ruby/buildout.cfg
     ../../component/golang/buildout.cfg
@@ -244,14 +245,13 @@ eggs    =
 
 [instance.cfg]
 recipe  = slapos.recipe.template
-url     = ${:_profile_base_location_}/instance.cfg.in
+url     = ${:_profile_base_location_}/${:filename}
 output  = ${buildout:directory}/instance.cfg
-md5sum  = ddadc1eda2b474d6f2349409c05476eb
 
 # macro: download a shell script and put it rendered into <software>/bin/
 [binsh]
 recipe  = slapos.recipe.template:jinja2
-template= ${:_profile_base_location_}/${:_buildout_section_name_}.in
+template= ${:_profile_base_location_}/${:_update_hash_filename_}
 rendered= ${buildout:bin-directory}/${:_buildout_section_name_}
 mode    = 0755
 context =
@@ -259,97 +259,71 @@ context =
 
 [watcher]
 <= binsh
-md5sum  = 90690e1351637f20ff2df57a6c3e85b4
 
 [gitlab-export]
 <= binsh
-md5sum  = a7b32680e80f34276f0a32a5e22dad50
 
 
 
-# macro: download a file named as section name
+# macro: download a file named in buildout.hash.cfg via _update_hash_filename_
 #
 #   [filename]
 #   <= download-file
-#   md5sum = ...
 [download-file]
 recipe  = slapos.recipe.build:download
-url     = ${:_profile_base_location_}/${:_buildout_section_name_}
+url     = ${:_profile_base_location_}/${:_update_hash_filename_}
 destination = ${buildout:directory}/${:_buildout_section_name_}
 
-# like download-file, but download from template/<filename>
-[download-template]
-<= download-file
-url     = ${:_profile_base_location_}/template/${:_buildout_section_name_}
-
-
 [database.yml.in]
-<= download-template
-md5sum  = 61d1d04b9347b3168a1ad7676e4681ef
+<= download-file
 
 [gitconfig.in]
-<= download-template
-md5sum  = 7782f5c5d75663c2586e28d029c51e49
+<= download-file
 
 [gitlab-parameters.cfg]
 <= download-file
-md5sum  = 8f4537cb8a0c9a8e0058c30cb687681c
 
 [gitlab-shell-config.yml.in]
-<= download-template
-md5sum  = 58c09b1e609f903e483a76fe9e57366c
+<= download-file
 
 [gitlab-unicorn-startup.in]
 <= download-file
-md5sum  = a9cb347f60aad3465932fd36cd4fe25d
 
 [gitlab.yml.in]
-<= download-template
-md5sum  = 0ddf4093dcf4427e5a160707e6017950
+<= download-file
 
 [instance-gitlab.cfg.in]
 <= download-file
-md5sum  = bd8bccad43e7cf294af2fc9b60fb3b46
 
 [instance-gitlab-export.cfg.in]
 <= download-file
-md5sum  = 319d7dbe3ad9b260c1e292cfc0d13b11
 
 [instance-gitlab-test.cfg.in]
 <= download-file
-md5sum  = a4ad76856db98e508af7e773d9ff78f9
 
 [macrolib.cfg.in]
 <= download-file
-md5sum  = a56a44e96f65f5ed20211bb6a54279f4
 
 [nginx-gitlab-http.conf.in]
-<= download-template
-md5sum  = abcc5eda03e10b26c74619f299a7f6a8
+<= download-file
 
 [nginx.conf.in]
-<= download-template
-md5sum  = 1374f38ab6f295b850d45ea0019ec05d
+<= download-file
 
 [rack_attack.rb.in]
-<= download-template
-md5sum  = 7d0e6dc6b826f6df6b20d8574a29e2f8
+<= download-file
 
 [resque.yml.in]
-<= download-template
-md5sum  = 7c89a730889e3224548d9abe51a2d719
+<= download-file
 
 [smtp_settings.rb.in]
-<= download-template
-md5sum  = 4e1ced687a86e4cfff2dde91237e3942
+<= download-file
 
 [template-gitlab-resiliency-restore.sh.in]
-<= download-template
-md5sum  = 590fcadf26085fdd17487175bc0a469d
+<= download-file
 
 [unicorn.rb.in]
-<= download-template
-md5sum  = 83921db1835d9e81cbbe808631cc40a9
+<= download-file
 
 [gitlab-demo-backup.git]
 recipe = hexagonit.recipe.download