Update Release Candidate

component/aspell/buildout.cfg

@@ -22,6 +22,8 @@ environment =
   PATH=${patch:location}/bin:${perl:location}/bin:%(PATH)s
   CPPFLAGS=-I${ncurses:location}/include
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+# aspell parallel build sometimes fail
+make-options = -j1
 
 [aspell-en-dictionary]
 <= aspell-dictionary-common

component/groonga/buildout.cfg

@@ -15,8 +15,8 @@ extends =
 [groonga]
 recipe = slapos.recipe.cmmi
 shared = false
-url = https://packages.groonga.org/source/groonga/groonga-9.0.7.tar.gz
-md5sum = a2697e46b7460fc81b418666c5abdcb4
+url = https://packages.groonga.org/source/groonga/groonga-9.0.9.tar.gz
+md5sum = 877bc3e2840e2935f606fb3d2d359a2c
 # temporary patch to respect more tokens in natural language mode.
 patches =
   ${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b

component/mariadb/buildout.cfg

@@ -29,8 +29,8 @@ parts =
 [mariadb]
 recipe = slapos.recipe.cmmi
 url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http%3A//fr.mirror.babylon.network/mariadb/?serve
-version = 10.3.18
-md5sum = b3524c0825c3a1c255496daea38304a0
+version = 10.3.19
+md5sum = de8eb9a7d45d21e2d96e46cdc7c6e036
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 pre-configure =
   set -e '\bSET(PLUGIN_AUTH_PAM YES)' cmake/build_configurations/mysql_release.cmake
@@ -84,8 +84,8 @@ post-install =
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/
 recipe = slapos.recipe.cmmi
-url = https://packages.groonga.org/source/mroonga/mroonga-9.05.tar.gz
-md5sum = d81629fc6042a44ce56cc6990d563164
+url = https://packages.groonga.org/source/mroonga/mroonga-9.09.tar.gz
+md5sum = 1b4ec3a8c6b4b459bd7a94f2bb8ad585
 pre-configure = set -e
   rm -rf fake_mariadb_source
   mkdir -p fake_mariadb_source

component/zstd/buildout.cfg

@@ -5,8 +5,8 @@ parts =
 [zstd]
 recipe = slapos.recipe.cmmi
 url = https://github.com/facebook/zstd/releases/download/v${:version}/zstd-${:version}.tar.gz
-version = 1.4.3
-md5sum = 8581c03b2f56c14ff097a737e60847b3
+version = 1.4.4
+md5sum = 487f7ee1562dee7c1c8adf85e2a63df9
 shared = true
 location = @@LOCATION@@
 configure-command = :

software/ajaxplorer/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]
+filename = instance.cfg
+md5sum = 4c7936accb3658871b635158198b7905
+
+[instance-apache]
+filename = instance-apachephp.cfg
+md5sum = a1ddbb63ffa0041b27eaea6df85cbd00
+
+[website1-template]
+filename = templates/index.html.in
+md5sum = c5695762361b801c284ee23a150cd1f1
+
+[website2-template]
+filename = templates/index.html.in
+md5sum = c5695762361b801c284ee23a150cd1f1
+
+[template-httpd-conf-hash]
+filename = templates/apache.conf.in
+md5sum = 6788381fadd8ca96f892d33df3163da0

software/ajaxplorer/software.cfg

@@ -13,6 +13,7 @@ parts =
   website2-template
 
 extends =
+  buildout.hash.cfg
   ../../stack/slapos.cfg
   ../../component/apache/buildout.cfg
   ../../component/apache-php/buildout.cfg
@@ -26,16 +27,14 @@ extends =
 
 [instance]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
+url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template.cfg
 mode = 0644
-md5sum = 4c7936accb3658871b635158198b7905
 
 [instance-apache]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-apachephp.cfg
+url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template-apachephp.cfg
-md5sum = a1ddbb63ffa0041b27eaea6df85cbd00
 mode = 0644
 
 [instance-mariadb]
@@ -61,24 +60,22 @@ paths =
 
 [website1-template]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/templates/index.html.in
+url = ${:_profile_base_location_}/${:filename}
 output = ${website:path1}/index.html
-md5sum = c5695762361b801c284ee23a150cd1f1
 mode = 0644
 
 [website2-template]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/templates/index.html.in
+url = ${:_profile_base_location_}/${:filename}
 output = ${website:path2}/index.html
-md5sum = c5695762361b801c284ee23a150cd1f1
 mode = 0644
 
 [template-httpd-conf]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/templates/${:filename}
+url = ${:_profile_base_location_}/${template-httpd-conf-hash:filename}
 mode = 0644
 filename = apache.conf.in
-md5sum = 6788381fadd8ca96f892d33df3163da0
+md5sum = ${template-httpd-conf-hash:md5sum}
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [versions]

software/backupserver/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-nginx-service]
+filename = template-nginx-service.sh.in
+md5sum = 5c94d952305552dcbeaeaeb27dd28f3b
+
+[template-nginx-configuration]
+filename = template-nginx.cfg.in
+md5sum = c54d36f55ba71c897505ed61213e104a
+
+[template-dcron-service]
+filename = template-dcron-service.sh.in
+md5sum = 1372441dac23e4fa7d2dc773a74725ea
+
+[template-backup-script]
+filename = template-backup-script.sh.in
+md5sum = 4c75f8462eaef2d8fcf24627e5f3575a
+
+[template-crontab-line]
+filename = template-crontab-line.in
+md5sum = 5cbd64f04da0601ba4286516a6161f5e
+
+[template-crontab]
+filename = template-crontab.in
+md5sum = 072be0fd04896880c931d44d8eabde37
+
+[status2rss]
+filename = status2rss.py
+md5sum = 432d22bb0f67df5203bbc5d1134a952b
+
+[template-update-rss-script]
+filename = template-update-rss.sh.in
+md5sum = 80b3746568bc8e308a1f337bdaa2441c
+
+[template-pullrdiffbackup]
+filename = instance-pullrdiffbackup.cfg.in
+md5sum = 537ab12f3885660e59d280ee40e379ac
+
+[template]
+filename = instance.cfg.in
+md5sum = 42021b325159dff29e4bd4e33b8ff2f3

software/backupserver/software.cfg

 [buildout]
 extends =
+  buildout.hash.cfg
   ../../component/dash/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/logrotate/buildout.cfg
@@ -46,58 +47,50 @@ eggs =
 ##########################################################
 [template-nginx-service]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/template-nginx-service.sh.in
-md5sum = 5c94d952305552dcbeaeaeb27dd28f3b
-output = ${buildout:directory}/template-nginx-service.sh.in
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/${:filename}
 mode = 0644
 
 [template-nginx-configuration]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/template-nginx.cfg.in
-md5sum = c54d36f55ba71c897505ed61213e104a
-output = ${buildout:directory}/template-nginx.cfg.in
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/${:filename}
 mode = 0644
 
 [template-dcron-service]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/template-dcron-service.sh.in
-md5sum = 1372441dac23e4fa7d2dc773a74725ea
-output = ${buildout:directory}/template-dcron-service.sh.in
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/${:filename}
 mode = 0644
 
 [template-backup-script]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/template-backup-script.sh.in
-md5sum = 4c75f8462eaef2d8fcf24627e5f3575a
-output = ${buildout:directory}/template-backup-script.sh.in
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/${:filename}
 mode = 0644
 
 [template-crontab-line]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/template-crontab-line.in
-md5sum = 5cbd64f04da0601ba4286516a6161f5e
-output = ${buildout:directory}/template-crontab-line.in
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/${:filename}
 mode = 0644
 
 [template-crontab]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/template-crontab.in
-md5sum = 072be0fd04896880c931d44d8eabde37
-output = ${buildout:directory}/template-crontab.in
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/${:filename}
 mode = 0644
 
 [status2rss]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/status2rss.py
-md5sum = 432d22bb0f67df5203bbc5d1134a952b
-output = ${buildout:directory}/status2rss.py
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/${:filename}
 mode = 0644
 
 [template-update-rss-script]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/template-update-rss.sh.in
-md5sum = 80b3746568bc8e308a1f337bdaa2441c
-output = ${buildout:directory}/template-update-rss.sh.in
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/${:filename}
 mode = 0644
 
 ##########################################################
@@ -105,15 +98,13 @@ mode = 0644
 ##########################################################
 [template-pullrdiffbackup]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-pullrdiffbackup.cfg.in
-md5sum = 537ab12f3885660e59d280ee40e379ac
+url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template-pullrdiffbackup.cfg
 mode = 0644
 
 [template]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 42021b325159dff29e4bd4e33b8ff2f3
+url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template.cfg
 mode = 0644
 

software/caddy-frontend/test/test.py

@@ -286,7 +286,8 @@ class TestDataMixin(object):
   def getTrimmedProcessInfo(self):
     return '\n'.join(sorted([
       '%(group)s:%(name)s %(statename)s' % q for q
-      in self.callSupervisorMethod('getAllProcessInfo')]))
+      in self.callSupervisorMethod('getAllProcessInfo')
+      if q['name'] != 'watchdog' and q['group'] != 'watchdog']))
 
   def assertTestData(self, runtime_data, hash_value_dict=None, msg=None):
     if hash_value_dict is None:
@@ -3501,10 +3502,8 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
         if pattern.match(line):
           matching_line_amount += 1
 
-    # Caddy used between ATS and the backend received only one connection
-    self.assertEqual(
-      1,
-      matching_line_amount)
+    # Caddy used between ATS and the backend received maximum one connection
+    self.assertIn(matching_line_amount, [0, 1])
 
     timeout = 5
     b = time.time()
@@ -3539,10 +3538,8 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
         break
       time.sleep(0.1)
 
-    # ATS has only one entry for this query
-    self.assertEqual(
-      1,
-      matching_line_amount)
+    # ATS has maximum one entry for this query
+    self.assertIn(matching_line_amount, [0, 1])
 
     # the result is available immediately after
     result = fakeHTTPResult(
@@ -4468,6 +4465,7 @@ class TestRe6stVerificationUrlDefaultSlave(SlaveHttpFrontendTestCase,
     )
 
 
+@skip('New test system cannot be used with failing promises')
 class TestRe6stVerificationUrlSlave(SlaveHttpFrontendTestCase,
                                     TestDataMixin):
   @classmethod
@@ -6439,6 +6437,7 @@ class TestSlaveSlapOSMasterCertificateCompatibilityUpdate(
       'apache-key': key_pem,
 
     })
+    self.requestDefaultInstance()
     self.slap.waitForInstance()
     self.runKedifaUpdater()
 

software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_supervisor_state-CADDY.txt

@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch STOPPED
 T-2:monitor-httpd-graceful STOPPED
 T-2:trafficserver-{hash-generic}-on-watch STOPPED
 T-2:trafficserver-reload STOPPED
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_supervisor_state-CADDY.txt

@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt

@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt

@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt

@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt

@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_supervisor_state-CADDY.txt

@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_etc_cron_d-CADDY.txt

@@ -6,3 +6,8 @@ T-1/etc/cron.d/logrotate
 T-1/etc/cron.d/monitor-configurator
 T-1/etc/cron.d/monitor-globalstate
 T-1/etc/cron.d/monitor_collect
+T-2/etc/cron.d/logrotate
+T-2/etc/cron.d/monitor-configurator
+T-2/etc/cron.d/monitor-globalstate
+T-2/etc/cron.d/monitor_collect
+T-2/etc/cron.d/trafficserver-logrotate
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt

@@ -2,3 +2,12 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-2/var/log/frontend-access.log
+T-2/var/log/frontend-error.log
+T-2/var/log/httpd-cache-direct/_waitforcaddyslave_access_log
+T-2/var/log/httpd-cache-direct/_waitforcaddyslave_error_log
+T-2/var/log/httpd-csr_id/expose-csr_id.log
+T-2/var/log/httpd/_waitforcaddyslave_access_log
+T-2/var/log/httpd/_waitforcaddyslave_error_log
+T-2/var/log/trafficserver/manager.log
+T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt

@@ -2,3 +2,6 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
+T-2/var/run/graceful_configuration_state_signature
+T-2/var/run/httpd.pid
+T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-CADDY.txt

@@ -14,4 +14,19 @@ T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
 T-1:monitor-httpd-{hash-generic}-on-watch EXITED
 T-1:monitor-httpd-graceful EXITED
-watchdog:watchdog RUNNING
+T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
\ No newline at end of file
+T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
+T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
+T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
+T-2:bootstrap-monitor EXITED
+T-2:certificate_authority-{hash-generic}-on-watch RUNNING
+T-2:crond-{hash-generic}-on-watch RUNNING
+T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
+T-2:frontend-caddy-safe-graceful EXITED
+T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
+T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
+T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
+T-2:monitor-httpd-{hash-generic}-on-watch EXITED
+T-2:monitor-httpd-graceful EXITED
+T-2:trafficserver-{hash-generic}-on-watch RUNNING
+T-2:trafficserver-reload EXITED
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_etc_cron_d-CADDY.txt

@@ -6,3 +6,8 @@ T-1/etc/cron.d/logrotate
 T-1/etc/cron.d/monitor-configurator
 T-1/etc/cron.d/monitor-globalstate
 T-1/etc/cron.d/monitor_collect
+T-2/etc/cron.d/logrotate
+T-2/etc/cron.d/monitor-configurator
+T-2/etc/cron.d/monitor-globalstate
+T-2/etc/cron.d/monitor_collect
+T-2/etc/cron.d/trafficserver-logrotate
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt

@@ -2,3 +2,12 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
+T-2/var/log/frontend-access.log
+T-2/var/log/frontend-error.log
+T-2/var/log/httpd-cache-direct/_waitforcaddyslave_access_log
+T-2/var/log/httpd-cache-direct/_waitforcaddyslave_error_log
+T-2/var/log/httpd-csr_id/expose-csr_id.log
+T-2/var/log/httpd/_waitforcaddyslave_access_log
+T-2/var/log/httpd/_waitforcaddyslave_error_log
+T-2/var/log/trafficserver/manager.log
+T-2/var/log/trafficserver/traffic.out
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt

@@ -2,3 +2,6 @@ T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
+T-2/var/run/graceful_configuration_state_signature
+T-2/var/run/httpd.pid
+T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt

@@ -14,4 +14,19 @@ T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
 T-1:monitor-httpd-{hash-generic}-on-watch EXITED
 T-1:monitor-httpd-graceful EXITED
-watchdog:watchdog RUNNING
+T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
\ No newline at end of file
+T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
+T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
+T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
+T-2:bootstrap-monitor EXITED
+T-2:certificate_authority-{hash-generic}-on-watch RUNNING
+T-2:crond-{hash-generic}-on-watch RUNNING
+T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
+T-2:frontend-caddy-safe-graceful EXITED
+T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
+T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
+T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
+T-2:monitor-httpd-{hash-generic}-on-watch EXITED
+T-2:monitor-httpd-graceful EXITED
+T-2:trafficserver-{hash-generic}-on-watch RUNNING
+T-2:trafficserver-reload EXITED
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt

@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-CADDY.txt

@@ -4,6 +4,8 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
+T-2/var/log/httpd-cache-direct/_default_access_log
+T-2/var/log/httpd-cache-direct/_default_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_default_access_log
 T-2/var/log/httpd/_default_error_log

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt

@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_supervisor_state-CADDY.txt

@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_supervisor_state-CADDY.txt

@@ -46,4 +46,3 @@ T-3:monitor-httpd-{hash-generic}-on-watch STOPPED
 T-3:monitor-httpd-graceful STOPPED
 T-3:trafficserver-{hash-generic}-on-watch STOPPED
 T-3:trafficserver-reload STOPPED
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-CADDY.txt

@@ -2,7 +2,6 @@ T-0/var/log/monitor-httpd-error.log
 T-0/var/log/slapgrid-T-0-error.log
 T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
-T-1/var/log/monitor-httpd-error.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_access_log

software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
 T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid

software/caddy-frontend/test/test_data/test.TestSlave.test_supervisor_state-CADDY.txt

@@ -12,7 +12,7 @@ T-1:crond-{hash-generic}-on-watch RUNNING
 T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
 T-1:kedifa-{hash-generic}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
+T-1:monitor-httpd-{hash-generic}-on-watch EXITED
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
\ No newline at end of file
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_supervisor_state-CADDY.txt

@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_log-CADDY.txt

@@ -6,6 +6,8 @@ T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-cache-direct/_default_ciphers_access_log
 T-2/var/log/httpd-cache-direct/_default_ciphers_error_log
+T-2/var/log/httpd-cache-direct/_own_ciphers_access_log
+T-2/var/log/httpd-cache-direct/_own_ciphers_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_default_ciphers_access_log
 T-2/var/log/httpd/_default_ciphers_error_log

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_supervisor_state-CADDY.txt

@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

@@ -69,6 +69,8 @@ T-2/var/log/httpd/_monitor-ipv4-test_access_log
 T-2/var/log/httpd/_monitor-ipv4-test_error_log
 T-2/var/log/httpd/_monitor-ipv6-test_access_log
 T-2/var/log/httpd/_monitor-ipv6-test_error_log
+T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_access_log
+T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_error_log
 T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_access_log
 T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_error_log
 T-2/var/log/httpd/_re6st-optimal-test_access_log
@@ -109,6 +111,8 @@ T-2/var/log/httpd/_type-zope-default-path_access_log
 T-2/var/log/httpd/_type-zope-default-path_error_log
 T-2/var/log/httpd/_type-zope-path_access_log
 T-2/var/log/httpd/_type-zope-path_error_log
+T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_access_log
+T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_error_log
 T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_access_log
 T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_error_log
 T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_access_log

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt

@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_log-CADDY.txt

@@ -4,6 +4,8 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
+T-2/var/log/httpd-cache-direct/_ssl_from_master_access_log
+T-2/var/log/httpd-cache-direct/_ssl_from_master_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log
 T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_error_log

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_supervisor_state-CADDY.txt

@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_supervisor_state-CADDY.txt

@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_log-CADDY.txt

@@ -4,6 +4,8 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
+T-2/var/log/httpd-cache-direct/_ssl_from_master_access_log
+T-2/var/log/httpd-cache-direct/_ssl_from_master_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_ssl_from_master_access_log
 T-2/var/log/httpd/_ssl_from_master_error_log

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_supervisor_state-CADDY.txt

@@ -30,4 +30,3 @@ T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-2:monitor-httpd-graceful EXITED
 T-2:trafficserver-{hash-generic}-on-watch RUNNING
 T-2:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file

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

software/helloworld/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-profile]
+filename = instance.cfg.in
+md5sum = 6567f8dedb5cdd93542dc29e96edb547

software/helloworld/software.cfg

 [buildout]
 
 extends =
+# buildout.hash.cfg is used for automated hash calculation of managed
+# instance files by calling update-hash
+  buildout.hash.cfg
 # "slapos" stack describes basic things needed for 99.9% of SlapOS Software
 # Releases
   ../../stack/slapos.cfg
@@ -25,19 +28,26 @@ parts =
   helloweb-go
 
 
+# Macro for jinja templates. The filename is set in buildout.hash.cfg
+# in the section using this template
+[jinja-template]
+recipe = slapos.recipe.template:jinja2
+template = ${:_profile_base_location_}/${:filename}
+mode = 0644
+
 # Download instance.cfg.in (buildout profile used to deployment of instance),
 # replace all ${foo:bar} parameters by real values, and change $${foo:bar} to
 # ${foo:bar}
+# The recipe, template and mode are fetched from jijna-template
 [instance-profile]
-recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/instance.cfg.in
+# The <= is buildout verb to use defined template
+<= jinja-template
 rendered = ${buildout:directory}/instance.cfg
-# MD5 checksum can be skipped for development (easier to develop), but must be filled for production
-md5sum = 6567f8dedb5cdd93542dc29e96edb547
-mode = 0644
 extensions = jinja2.ext.do
 context =
   section buildout  buildout
+# md5sum is fetched from buildout.hash.cfg and can be recalculated automatically by
+# calling update-hash
 
 # Pin versions of eggs used that are not already pinned by stack/slapos.cfg
 [versions]

software/htmlvalidatorserver/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-tomcat-configuration]
+filename = server.xml.in
+md5sum = fd2562b9ac0c52a2e9cc02e3ef3cef78
+
+[template-tomcat-service]
+filename = template-tomcat-service.sh.in
+md5sum = 09803fb71404edbccb32c44a0040dae4
+
+[template-validator]
+filename = instance-validator.cfg.in
+md5sum = 0275d7a8a021f84a1303e5c8933c07c3
+
+[template]
+filename = instance.cfg.in
+md5sum = 2b4d33e9ef1082dd4d6a53f55b391772

software/htmlvalidatorserver/software.cfg

 [buildout]
 extends =
+  buildout.hash.cfg
   ../../component/dash/buildout.cfg
   ../../component/grep/buildout.cfg
   ../../component/findutils/buildout.cfg
@@ -19,16 +20,14 @@ parts =
 ##########################################################
 [template-tomcat-configuration]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/server.xml.in
-md5sum = fd2562b9ac0c52a2e9cc02e3ef3cef78
-output = ${buildout:directory}/server.xml.in
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/${:filename}
 mode = 0644
 
 [template-tomcat-service]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/template-tomcat-service.sh.in
-md5sum = 09803fb71404edbccb32c44a0040dae4
-output = ${buildout:directory}/template-tomcat-service.sh.in
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/${:filename}
 mode = 0644
 
 ##########################################################
@@ -36,15 +35,13 @@ mode = 0644
 ##########################################################
 [template-validator]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-validator.cfg.in
-md5sum = 0275d7a8a021f84a1303e5c8933c07c3
+url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template-validator.cfg
 mode = 0644
 
 [template]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 2b4d33e9ef1082dd4d6a53f55b391772
+url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template.cfg
 mode = 0644
 

software/kvm/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 2cbfd6b08c65369c1d45cf3ba2ff335a
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = dc4dc40f9d950b5f963c22c62ca488a7
+md5sum = bcd3705e510da52e7ddf1e1527839642
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
@@ -27,7 +27,7 @@ md5sum = 352f18067714501c8ccee55f8930d245
 
 [template-kvm-resilient]
 filename = instance-kvm-resilient.cfg.jinja2
-md5sum = 6677ac6074f6be671fe8e8b8a6a4afe8
+md5sum = 7d4b14660b7a30084aa7e023b0db50be
 
 [template-kvm-import]
 filename = instance-kvm-import.cfg.jinja2.in

software/kvm/instance-kvm-resilient.cfg.jinja2

@@ -64,7 +64,7 @@ promises = ${:etc}/promise
 # Note: += doesn't work.
 return =
 # Resilient related parameters
-  url ssh-public-key ssh-url notification-id ip {{ monitor_return | join(' ') }}
+  url ssh-public-key resilient-ssh-url notification-id ip {{ monitor_return | join(' ') }}
 # KVM related parameters
 # XXX: return ALL parameters (like nat rules), through jinja
   backend-url url ip

software/kvm/instance-kvm.cfg.jinja2

@@ -232,7 +232,7 @@ input = inline:#!/bin/sh
     # disk device option is used, skip qemu img check
     exit 0
   fi
-  ${kvm-parameter-dict:qemu-img-path} check -U ${kvm-parameter-dict:disk-path}
+  ${kvm-parameter-dict:qemu-img-path} check -U ${kvm-parameter-dict:disk-path} > /dev/null 2>&1
   RETURN_CODE=$?
   if [ $RETURN_CODE -eq 0 ] || [ $RETURN_CODE -eq 3 ]; then
     exit 0

software/kvm/software.cfg

@@ -184,10 +184,8 @@ on-update = true
 
 [template-httpd]
 recipe = slapos.recipe.template:jinja2
-filename = template-httpd.cfg
 template = ${:_profile_base_location_}/instance-kvm-http.cfg.in
 rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/instance-kvm-http.cfg
-md5sum = 26a181a48046ce88570adb32334747ef
 context =
     key apache_location apache:location
     raw openssl_executable_location ${openssl:location}/bin/openssl

software/monitor/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 = 1b7d2d097f208f6641bf98a17df079c8
+
+[template-monitor]
+_update_hash_filename_ = instance-monitor.cfg.jinja2
+md5sum = dffe797be3a66d6838ffc70ee8f5f3ff
+
+[template-monitor-distributor]
+_update_hash_filename_ = instance-monitor-distributor.cfg.jinja2
+md5sum = 61c0bfdfc0a2b51ba15fe4a49baf6091
+
+[json-test-template]
+_update_hash_filename_ = json-test-template.json.in.jinja2
+md5sum = 2eb5596544d9c341acf653d4f7ce2680

software/monitor/software.cfg

 [buildout]
 
 extends =
+  buildout.hash.cfg
   ../../component/pycurl/buildout.cfg
   ../../component/python-cryptography/buildout.cfg
   ../../component/wget/buildout.cfg
@@ -19,30 +20,26 @@ parts =
 
 [template]
 recipe = slapos.recipe.template 
-url = ${:_profile_base_location_}/instance.cfg
+url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template.cfg
-md5sum = 1b7d2d097f208f6641bf98a17df079c8
 mode = 0644
 
 [template-monitor]
 recipe = slapos.recipe.build:download 
-url = ${:_profile_base_location_}/instance-monitor.cfg.jinja2
+url = ${:_profile_base_location_}/${:_update_hash_filename_}
 destination = ${buildout:directory}/template-base-monitor.cfg
-md5sum = dffe797be3a66d6838ffc70ee8f5f3ff
 mode = 0644
 
 [template-monitor-distributor]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-monitor-distributor.cfg.jinja2
+url = ${:_profile_base_location_}/${:_update_hash_filename_}
 destination = ${buildout:directory}/template-monitor-base-distributor.cfg
-md5sum = 61c0bfdfc0a2b51ba15fe4a49baf6091
 mode = 0644
 
 [json-test-template]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/json-test-template.json.in.jinja2
+url = ${:_profile_base_location_}/${:_update_hash_filename_}
 destination = ${buildout:directory}/json-test-template.json.in.jinja2
-md5sum = 2eb5596544d9c341acf653d4f7ce2680
 mode = 0644
 
 [network-bench-cfg]

software/nayuos/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-instance]
+filename = instance.cfg
+md5sum = 7e9deae78923ab7805c0d10d0d6fe336

software/nayuos/software.cfg

 [buildout]
 extends =
+  buildout.hash.cfg
 # basic needs
   ../../stack/slapos.cfg
   ../../component/automake/buildout.cfg
@@ -23,10 +24,9 @@ slapos.recipe.template = 4.3
 [template-instance]
 # jinja2 render instance.cfg file in the buildout directory
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/instance.cfg
-rendered = ${buildout:directory}/instance.cfg
+template = ${:_profile_base_location_}/${:filename}
+rendered = ${buildout:directory}/${:filename}
 mode = 0644
-md5sum = 7e9deae78923ab7805c0d10d0d6fe336
 context =
   key software_dir            :_profile_base_location_
   key instance_dir            buildout:directory

software/neoppod/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-common]
+filename = instance-common.cfg.in
+md5sum = 0a3a54fcc7be0bbd63cbd64f006ceebc
+
+[root-common]
+filename = root-common.cfg.in
+md5sum = ccc6e33412259415ec6c3452d37b77cc
+
+[instance-neo-admin]
+filename = instance-neo-admin.cfg.in
+md5sum = 87670ddc6b5d2007dac1b6d2ba86d168
+
+[instance-neo-master]
+filename = instance-neo-master.cfg.in
+md5sum = 9f27195d770b2f57461c60a82c851ab9
+
+[instance-neo]
+filename = instance-neo.cfg.in
+md5sum = d18e049d580720e733502b774b0d6790
+
+[template-neo-my-cnf]
+filename = my.cnf.in
+md5sum = 9f6f8f2b5f4cb0d97d50ffc1d3837e2f
+
+[template-neo]
+filename = instance.cfg.in
+md5sum = 83dc9faca482b2ddbd3d5fa968af7c33
+
+[cluster]
+filename = cluster.cfg.in
+md5sum = 5afd326de385563b5aeac81039f23341
+
+[runTestSuite.in]
+_update_hash_filename_ = runTestSuite.in
+md5sum = b656e805c5dbc7f9c73716398b3e032e

software/neoppod/software-common.cfg

@@ -6,6 +6,7 @@
 
 [buildout]
 extends =
+    buildout.hash.cfg
     ../../stack/slapos.cfg
     ../../stack/logrotate/buildout.cfg
     ../../stack/monitor/buildout.cfg
@@ -85,16 +86,15 @@ scripts =
 
 [download-base-neo]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/${:_buildout_section_name_}.cfg.in
+url = ${:_profile_base_location_}/${:filename}
 # XXX: following mode should be the default
 mode = 644
 
 # XXX: must be rendered, not just dled
 [instance-common]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/${:_buildout_section_name_}.cfg.in
+template = ${:_profile_base_location_}/${:filename}
 rendered = ${buildout:directory}/${:_buildout_section_name_}.cfg
-md5sum = 0a3a54fcc7be0bbd63cbd64f006ceebc
 context =
     key bin_directory buildout:bin-directory
     key develop_eggs_directory buildout:develop-eggs-directory
@@ -112,24 +112,18 @@ adapter-context =
 
 [root-common]
 <= download-base-neo
-md5sum = ccc6e33412259415ec6c3452d37b77cc
 
 [instance-neo-admin]
 <= download-base-neo
-md5sum = 87670ddc6b5d2007dac1b6d2ba86d168
 
 [instance-neo-master]
 <= download-base-neo
-md5sum = 9f27195d770b2f57461c60a82c851ab9
 
 [instance-neo]
 <= download-base-neo
-md5sum = d18e049d580720e733502b774b0d6790
 
 [template-neo-my-cnf]
 <= download-base-neo
-url = ${:_profile_base_location_}/my.cnf.in
-md5sum = 9f6f8f2b5f4cb0d97d50ffc1d3837e2f
 
 [template-mysqld-wrapper]
 recipe = slapos.recipe.template:jinja2

software/neoppod/software.cfg

 [buildout]
 extends =
+    buildout.hash.cfg
     software-common.cfg
 
 parts +=
 # NEO instanciation
-    template
+    template-neo
     runTestSuite_py
 
-[template]
+[template-neo]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 83dc9faca482b2ddbd3d5fa968af7c33
+template = ${:_profile_base_location_}/${:filename}
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 rendered = ${buildout:directory}/template.cfg
 context =
@@ -22,12 +22,10 @@ context =
 
 [cluster]
 <= download-base-neo
-md5sum = 5afd326de385563b5aeac81039f23341
 
 [runTestSuite.in]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/${:_buildout_section_name_}
-md5sum = b656e805c5dbc7f9c73716398b3e032e
+url = ${:_profile_base_location_}/${:_update_hash_filename_}
 
 [runTestSuite_py]
 recipe = zc.recipe.egg

software/neotest/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).
+[neotest-env.sh]
+filename = neotest-env.sh.in
+md5sum = 595eebbbcb56b6a8464d48833cfae57b
+
+[neotest]
+filename = neotest.in
+md5sum = fb3b4109128c1db1739ef5bb6abd1d94
+
+[neotest-runTestSuite]
+filename = neotest-runTestSuite.in
+md5sum = 6a4281730b68cdba5c873817a6754428
+
+[instance.cfg]
+filename = instance.cfg.in
+md5sum = 8a40d365c85d70f057ce997405ac3e88

software/neotest/software.cfg

@@ -4,6 +4,7 @@
 # testing/benchmarking can be run in a SlapOS WebRunner.
 [buildout]
 extends =
+    buildout.hash.cfg
     ../../stack/slapos.cfg
     ../neoppod/software-common.cfg
     ../../component/golang/buildout.cfg
@@ -62,30 +63,27 @@ setup   = ${go_lab.nexedi.com_kirr_neo:location}
 # neotest-env.sh + neotest wrapper
 [buildout-template]
 recipe  = slapos.recipe.template
-url     = ${:_profile_base_location_}/${:_buildout_section_name_}.in
+url     = ${:_profile_base_location_}/${:filename}
 output  = ${buildout:directory}/${:_buildout_section_name_}
 
 [neotest-env.sh]
 <= buildout-template
-md5sum  = 595eebbbcb56b6a8464d48833cfae57b
 
 [neotest]
 <= buildout-template
 output  = ${buildout:bin-directory}/${:_buildout_section_name_}
 mode    = 0755
-md5sum  = fb3b4109128c1db1739ef5bb6abd1d94
 
 [neotest-runTestSuite]
 <= buildout-template
 output  = ${buildout:bin-directory}/${:_buildout_section_name_}
 mode    = 0755
-md5sum  = 6a4281730b68cdba5c873817a6754428
 
 
 # instance
 [jinja2-template]
 recipe  = slapos.recipe.template:jinja2
-template= ${:_profile_base_location_}/${:_buildout_section_name_}.in
+template= ${:_profile_base_location_}/${:filename}
 rendered= ${buildout:directory}/${:_buildout_section_name_}
 mode    = 0644
 context =
@@ -93,7 +91,6 @@ context =
 
 [instance.cfg]
 <= jinja2-template
-md5sum  = 8a40d365c85d70f057ce997405ac3e88
 
 
 # eggs:

software/nextcloud/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-nextcloud-install.sh]
+filename = nextcloud-install.sh.in
+md5sum = a2281f86f6a26a8ff40a57a495505977
+
+[template-apache-httpd]
+filename = apache-httpd.conf.in
+md5sum = 839258624e273aac71a96516bf34c7e6
+
+[template-nextcloud-config.json]
+filename = nextcloud-config.json.in
+md5sum = fbc5eacda192cb02c8d9861cb628fe6f
+
+[template-nextcloud-instance]
+filename = nextcloud-instance.cfg.in
+md5sum = 59e9c65e655cf9cf144d97dd36863ede

software/nextcloud/software.cfg

 [buildout]
 extends =
+  buildout.hash.cfg
   ../../component/redis/buildout.cfg
   ../../component/python3/buildout.cfg
   ../../stack/lamp/buildout.cfg
@@ -18,25 +19,18 @@ md5sum = d81902d2dec5d547779bec6336a438be
 
 [template-nextcloud-install.sh] 
 <= nc-download-base
-filename = nextcloud-install.sh.in
-md5sum = a2281f86f6a26a8ff40a57a495505977
 
 [template-apache-httpd]
 <= nc-download-base
-filename = apache-httpd.conf.in
-md5sum = 839258624e273aac71a96516bf34c7e6
 
 [template-nextcloud-config.json]
 <= nc-download-base
-filename = nextcloud-config.json.in
-md5sum = fbc5eacda192cb02c8d9861cb628fe6f
 
 [template-nextcloud-instance]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/nextcloud-instance.cfg.in
+template = ${:_profile_base_location_}/${:filename}
 rendered = ${buildout:directory}/instance-nextcloud.cfg
 extensions = jinja2.ext.do
-md5sum = 59e9c65e655cf9cf144d97dd36863ede
 context = 
           key gzip_location          gzip:location
           key python3_location       python3.6.6:location

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]

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

software/slapos-sr-testing/software.cfg

@@ -15,8 +15,8 @@ extends =
   ./buildout.hash.cfg
 
 parts =
-  slapos-cookbook
   eggs
+  slapos-cookbook
   template
 
 [setup-develop-egg]
@@ -102,16 +102,27 @@ setup = ${slapos-repository:location}/software/nextcloud/test/
 egg = slapos.test.nextcloud
 setup = ${slapos-repository:location}/software/turnserver/test/
 
+[slapos.core-repository]
+<= git-clone-repository
+repository = https://lab.nexedi.com/nexedi/slapos.core.git
+branch = master
+
+[slapos.core-setup]
+<= setup-develop-egg
+egg = slapos.core
+setup = ${slapos.core-repository:location}
+
 [eggs]
 recipe = zc.recipe.egg
 eggs =
+  ${lxml-python:egg}
+  ${slapos.core-setup:egg}
   ${pillow-python:egg}
   erp5.util
   ${python-pynacl:egg}
   ${python-cryptography:egg}
   ${bcrypt:egg}
   slapos.libnetworkcache
-  slapos.core
   supervisor
   ${slapos.cookbook-setup:egg}
   ${slapos.test.caddy-frontend-setup:egg}
@@ -156,6 +167,8 @@ output = ${buildout:directory}/template.cfg
 mode = 640
 
 [versions]
+# slapos.core is used from the clone always
+slapos.core =
 # Various needed versions
 Pillow = 5.3.0
 PyNaCl = 1.3.0

software/slaprunner/buildout.hash.cfg

@@ -34,7 +34,7 @@ md5sum = b992bb3391de9d6d422bfa8011d8ffc4
 
 [template-resilient]
 filename = instance-resilient.cfg.jinja2
-md5sum = bed1c457aa9e54a59b64d167bdafe970
+md5sum = 0f3d75ca834839c5ae04e9c26cca289a
 
 [template_nginx_conf]
 filename = nginx_conf.in

software/slaprunner/instance-resilient.cfg.jinja2

@@ -12,7 +12,7 @@
   {% set number_of_instances = 2 %}
 {% endif %}
 
-{% set slaprunner_return = ['init-user', 'init-password', 'url', 'ssh-public-key', 'ssh-url', 'notification-id', 'ip', 'backend-url', 'url', 'ssh-command', 'webdav-url', 'public-url', 'git-public-url', 'git-private-url'] -%}
+{% set slaprunner_return = ['init-user', 'init-password', 'url', 'ssh-public-key', 'resilient-ssh-url', 'notification-id', 'ip', 'backend-url', 'url', 'ssh-url', 'ssh-command', 'webdav-url', 'public-url', 'git-public-url', 'git-private-url'] -%}
 {% set monitor_return = ['monitor-base-url', 'monitor-url', 'monitor-user', 'monitor-password'] -%}
 {% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.app.officejs.com")} -%}
 {% set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return, 'set-monitor-url': True} -%}

stack/erp5/buildout.hash.cfg

@@ -66,7 +66,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
 
 [template-run-zelenium]
 filename = run-zelenium-test.py.in
-md5sum = c64f35f825200fe35328641b2b8e0fdd
+md5sum = cc19560b9400cecbd23064d55c501eec
 
 [template]
 filename = instance.cfg.in
@@ -78,7 +78,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
 
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = ff5e0d8d1ca167399fb438e890baf370
+md5sum = 4fe42a1fe78ce9531d8e9c9837f4a784
 
 [template-zeo]
 filename = instance-zeo.cfg.in
@@ -86,7 +86,7 @@ md5sum = 10a01b85c966ad9fe13bc981f1ddabe8
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = 593a421b5de155756d5c483a2f7b9982
+md5sum = 5eba2aa53af7ee74959745e6225ea0a7
 
 [template-balancer]
 filename = instance-balancer.cfg.in

stack/erp5/instance-erp5.cfg.in

@@ -187,7 +187,7 @@ config-cloudooo-url = {{ dumps(slapparameter_dict.get('cloudooo-url', default_cl
 config-caucase-url = {{ dumps(caucase_url) }}
 config-deadlock-debugger-password = ${publish-early:deadlock-debugger-password}
 config-developer-list = {{ dumps(slapparameter_dict.get('developer-list', [inituser_login])) }}
-config-saucelabs-dict = {{ dumps(slapparameter_dict.get('saucelabs-dict', {})) }}
+config-selenium-server-configuration-dict = {{ dumps(slapparameter_dict.get('selenium-server-configuration-dict', {})) }}
 config-hosts-dict = {{ dumps(slapparameter_dict.get('hosts-dict', {})) }}
 config-hostalias-dict = {{ dumps(slapparameter_dict.get('hostalias-dict', {})) }}
 config-id-store-interval = {{ dumps(slapparameter_dict.get('id-store-interval')) }}

stack/erp5/instance-zope.cfg.in

@@ -6,7 +6,7 @@
 {% set zodb_dict = slapparameter_dict['zodb-dict'] -%}
 {% set instance_index_list = range(slapparameter_dict['instance-count']) -%}
 {% set node_id_base = slapparameter_dict['name'] -%}
-{% set saucelabs_dict = slapparameter_dict.get('saucelabs-dict', None) -%}
+{% set selenium_server_configuration_dict = slapparameter_dict.get('selenium-server-configuration-dict', None) -%}
 {% set node_id_index_format = '-%%0%ii' % (len(str(instance_index_list[-1])), ) -%}
 {% set part_list = [] -%}
 {% set publish_list = [] -%}
@@ -405,9 +405,9 @@ wrapper-path = ${buildout:bin-directory}/${:_buildout_section_name_}
 {%   do test_runner_address_list.append((ipv4, next_port())) %}
 {% endfor %}
 
-{% if saucelabs_dict -%}
+{% if selenium_server_configuration_dict -%}
 [test-zelenium-runner-parameter]
-configuration = {{ dumps(saucelabs_dict) }}
+configuration = {{ dumps(selenium_server_configuration_dict) }}
 user = {{ dumps(slapparameter_dict['inituser-login']) }}
 password = {{ dumps(slapparameter_dict['inituser-password']) }}
 bin-path = {{ bin_directory }}/{{ parameter_dict['egg-interpreter'] }}

stack/erp5/run-zelenium-test.py.in

@@ -26,94 +26,35 @@ def main():
   parser.add_argument('--node_quantity', help='ignored', type=int)
   parser.add_argument('--master_url',
                       help='The Url of Master controling many suites')
-  parser.add_argument('--remote_access_url',
-                      help='The access url',
-                      default = parser_configuration.get('remote-access-url')
-                     )
-  parser.add_argument('--target',
-                      help='Target OS to run tests on',
-                      default = parser_configuration.get('target')
-                     )
-  parser.add_argument('--target_version',
-                      help='Target OS version to use',
-                      default = parser_configuration.get('target-version')
-                     )
-  parser.add_argument('--target_browser',
-                      help='The desired browser of the target OS to be used. Example: Firefox if target is Android.',
-                      default = parser_configuration.get('target-browser')
-                     )
-  parser.add_argument('--target_device',
-                      help='The desired device running the target OS. Example: iPad Simulator, if target is iOS.',
-                      default = parser_configuration.get('target-device')
-                     )
-  parser.add_argument('--appium_server_auth',
-                      help='Combination of user and token to access SauceLabs service. (i.e. user:token)',
-                      default = parser_configuration.get('appium-server-auth')
-                     )
-  parser.add_argument('--run_only',
-                      help='zuite to run',
-                      default = parser_configuration.get('run-only')
-                     )
-  parser.add_argument('--max_duration',
-                      type=int,
-                      help='max duration for running test en second',
-                      default = parser_configuration.get('max-duration', 1800)
-                     )
   args = parser.parse_args()
   test_line_dict = {}
   test_suite_title = args.test_suite_title or args.test_suite
   test_suite = args.test_suite
   revision = args.revision
 
-  # curl https://saucelabs.com/rest/v1/info/platforms/all
-  # https://wiki.saucelabs.com/display/DOCS/Platform+Configurator#/
-  if args.target in ['iOS', 'Android']:
-    # parameters for mobile emulators have different names then parameters for
-    # desktop OSes
-    capabilities = {
-      'platformName': args.target,
-      'platformVersion': args.target_version,
-      'deviceName': args.target_device,
-      'browserName': args.target_browser,
-      'maxDuration': args.max_duration,
-      'name': test_suite_title
-    }
-  elif 'Windows' in args.target or 'OS X' in args.target:
-    capabilities = {
-      'browserName': args.target_browser,
-      'platform': args.target,
-      'version': args.target_version,
-      'maxDuration': args.max_duration,
-      'name': test_suite_title
-    }
  
-  if not args.appium_server_auth or not args.remote_access_url:
+  if not parser_configuration['server-url'] or not parser_configuration['remote-access-url']:
     sys.exit(-1)
 
-  #Authentication over HTTPS is not supported in saucelab
-  #https://wiki.saucelabs.com/display/DOCS/Instant+Selenium+Python+Tests
-  appium_url = "http://%s@ondemand.saucelabs.com/wd/hub" % (args.appium_server_auth)
-  # adjust make path to access url
-  # Do not store any test result in the ZMI
-  if args.run_only:
+  if parser_configuration['run-only']:
     url = "%s/erp5/portal_tests/%s/core/TestRunner.html" \
       "?test=../test_suite_html" \
       "&auto=on" \
       "&resultsUrl=../getId" \
       "&__ac_name=%s" \
-      "&__ac_password=%s" % (args.remote_access_url, args.run_only, {{ repr(user) }}, {{ repr(password) }})
+      "&__ac_password=%s" % (parser_configuration['remote-access-url'], parser_configuration['run-only'], {{ repr(user) }}, {{ repr(password) }})
   else:
     url = "%s/erp5/portal_tests/core/TestRunner.html" \
       "?test=../test_suite_html" \
       "&auto=on" \
       "&resultsUrl=../getId" \
       "&__ac_name=%s" \
-      "&__ac_password=%s" % (args.remote_access_url, {{ repr(user) }}, {{ repr(password) }})
+      "&__ac_password=%s" % (parser_configuration['remote-access-url'], {{ repr(user) }}, {{ repr(password) }})
     
   # Wait until all activities are finished...
   wait_url = "%s/erp5/ActivityTool_getSqlStatisticList" \
       "?__ac_name=%s" \
-      "&__ac_password=%s" % (args.remote_access_url,  {{ repr(user) }}, {{ repr(password) }})
+      "&__ac_password=%s" % (parser_configuration['remote-access-url'],  {{ repr(user) }}, {{ repr(password) }})
   while 1:
     try:
       response = urlopen(wait_url)
@@ -136,7 +77,7 @@ def main():
     time.sleep(600)
  
   tool = taskdistribution.TaskDistributor(portal_url=args.master_url)
-  browser = webdriver.Remote(appium_url, capabilities)
+  browser = webdriver.Remote(parser_configuration['server-url'] , parser_configuration['desired-capabilities'] )
   
   try:
     agent = browser.execute_script("return navigator.userAgent")
@@ -158,7 +99,7 @@ def main():
     # Wait for test to be executed
     while 1:
       try:
-        WebDriverWait(browser, args.max_duration).until(EC.presence_of_element_located((
+        WebDriverWait(browser, parser_configuration['max-duration']).until(EC.presence_of_element_located((
           By.XPATH, '//td[@id="testRuns" and contains(text(), "%i")]' % test_count
         )))
         break
@@ -214,28 +155,21 @@ def main():
         'command': url,
         'stdout': agent,
         'stderr': '',
-        'html_test_result': 'Not Executed due to saucelabs related error'
+        'html_test_result': 'Not Executed due to selenium server related error'
       }
       else:
-        skip_count = success_count = error_count = 0
+        skip_count = error_count = 0
         test_table = tr[1].xpath('.//table')[0]
-        test_tbody = tr[1].xpath('.//tbody')[0]
-
-        tr_count = len(test_tbody)
-        for tr in test_tbody:
-          # print etree.tostring(tr).split('\n')[0]
         status = tr.attrib.get('class')
         if status is None or 'status_done' in status:
-            skip_count += 1
-          elif 'status_passed' in status:
-            success_count += 1
+          skip_count = 1
         elif 'status_failed' in status:
-            error_count += 1
+          error_count = 1
 
         test_line_dict[test_name] = {
-          'test_count': tr_count,
+          'test_count': 1,
           'error_count': error_count,
-          'failure_count': tr_count - (skip_count + success_count + error_count),
+          'failure_count': 0,
           'skip_count': skip_count,
           'duration': test_execution_duration,
           'command': url,

stack/lamp/buildout.cfg

@@ -19,6 +19,7 @@ parts =
   instance-lamp
 
 extends =
+  buildout.hash.cfg
   ../../component/apache-php/buildout.cfg
   ../../component/apache/buildout.cfg
   ../../component/curl/buildout.cfg
@@ -77,8 +78,7 @@ part-list =
 [instance]
 recipe = slapos.recipe.template:jinja2
 rendered = ${buildout:directory}/instance.cfg
-template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = b4fbd7dc8d7fda7dbd1b80f3de273ecf
+template = ${:_profile_base_location_}/${:filename}
 mode = 0644
 context =
     key application_location application:location
@@ -118,27 +118,19 @@ context =
 
 [instance-apache-php]
 <= template-download-base
-filename = instance-apache-php.cfg.in
 output = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
-md5sum = 9d3eb7fcc44ac25bef8ee9df6eac8974
 
 [instance-lamp]
 <= template-download-base
-filename = instance-lamp.cfg.jinja2.in
 output = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
-md5sum = cefe97d3a80d10655212d64ced180b2a
 
 [template-apache.conf]
 <= template-download-base
-filename = apache.conf.in
 output = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
-md5sum = 04080510698732d84122b464fdb08c6a
 
 [template-php.ini]
 <= template-download-base
-filename = php.ini.in
 output = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
-md5sum = 7de35e3f8619324119ff296580d2880f
 
 [erp5]
 # lamp stack reuses erp5 stack to have mariadb, but we don't need to checkout erp5 here.

stack/lamp/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]
+filename = instance.cfg.in
+md5sum = b4fbd7dc8d7fda7dbd1b80f3de273ecf
+
+[instance-apache-php]
+filename = instance-apache-php.cfg.in
+md5sum = 9d3eb7fcc44ac25bef8ee9df6eac8974
+
+[instance-lamp]
+filename = instance-lamp.cfg.jinja2.in
+md5sum = cefe97d3a80d10655212d64ced180b2a
+
+[template-apache.conf]
+filename = apache.conf.in
+md5sum = 04080510698732d84122b464fdb08c6a
+
+[template-php.ini]
+filename = php.ini.in
+md5sum = 7de35e3f8619324119ff296580d2880f

stack/lapp/apache/instance-apache-export.cfg.jinja2

@@ -55,4 +55,4 @@ path = ${directory:www}
 # XXX-Cedric: change the request method to return everything from
 #             getConnectionParameterDict()
 [request-postgres]
-return = ssh-public-key ssh-url notification-id ip url
+return = ssh-public-key resilient-ssh-url notification-id ip url

stack/lapp/buildout.cfg

@@ -86,7 +86,7 @@ context = key templateapache instance-apache-php:output
 import-list = file parts template-parts:destination
               file replicated template-replicated:destination
 
-md5sum = dca811871e293cf3ce1bfc52dd8dab64
+md5sum = e679cbe62f17bb320a22444425e1401a
 mode = 0644
 
 [instance-resilient]
@@ -102,7 +102,7 @@ context = key buildout buildout:bin-directory
 import-list = file parts template-parts:destination
               file replicated template-replicated:destination
 
-md5sum = e8fd20a32c87853ecba2846f50cd0898
+md5sum = 20b4f2d8125a4f9cab5b9145be6b47b5
 mode = 0644
 
 [instance-postgres]

stack/lapp/instance-resilient.cfg.jinja2

@@ -17,7 +17,7 @@ parts +=
 
 # Bubble up the parameters
 [request-apache]
-return = url ssh-public-key ssh-url notification-id ip url backend_url
+return = url ssh-public-key resilient-ssh-url notification-id ip url backend_url
 # XXX: hardcoded values
 config-postgres1-computer-guid = ${slap-parameter:postgres1-computer-guid}
 config-pbs-postgres1-computer-guid = ${slap-parameter:pbs-postgres1-computer-guid}

stack/monitor/buildout.cfg

@@ -21,13 +21,9 @@ parts =
 recipe = hexagonit.recipe.download
 ignore-existing = true
 download-only = true
-url = ${:_profile_base_location_}/${:filename}
+url = ${:_profile_base_location_}/${:_update_hash_filename_}
 mode = 0644
 
-[monitor-template-base]
-<= monitor-download-base
-url = ${:_profile_base_location_}/templates/${:filename}
-
 [monitor-template-script]
 <= monitor-download-base
 url = ${:_profile_base_location_}/scripts/${:filename}
@@ -61,24 +57,20 @@ eggs =
 
 # Monitor templates files
 [monitor-httpd-conf]
-<= monitor-template-base
-md5sum = b5f42503799e7e770afce4097d3b75ae
+<= monitor-download-base
 filename = monitor-httpd.conf.in
 
 [monitor-template-wrapper]
-<= monitor-template-base
+<= monitor-download-base
 filename = wrapper.in
-md5sum = 1695c9a06a2b11ccfe893d7a224e489d
 
 [monitor-conf]
-<= monitor-template-base
+<= monitor-download-base
 filename = monitor.conf.in
-md5sum = 91c4c9bba1f7df788b9b7a059ed89ac2
 
 [monitor-httpd-cors]
-<= monitor-template-base
+<= monitor-download-base
 filename = httpd-cors.cfg.in
-md5sum = 683ea85fc054094248baf5752dd089bf
 # End templates files
 
 # XXX keep compatibility (with software/ipython_notebook/software.cfg )

stack/monitor/buildout.hash.cfg

@@ -15,3 +15,19 @@
 [monitor2-template]
 filename = instance-monitor.cfg.jinja2.in
 md5sum = d3d5a44db790f2bdf4fcbe6ebffe261f
+
+[monitor-httpd-conf]
+_update_hash_filename_ = templates/monitor-httpd.conf.in
+md5sum = b5f42503799e7e770afce4097d3b75ae
+
+[monitor-template-wrapper]
+_update_hash_filename_ = templates/wrapper.in
+md5sum = 1695c9a06a2b11ccfe893d7a224e489d
+
+[monitor-conf]
+_update_hash_filename_ = templates/monitor.conf.in
+md5sum = 91c4c9bba1f7df788b9b7a059ed89ac2
+
+[monitor-httpd-cors]
+_update_hash_filename_ = templates/httpd-cors.cfg.in
+md5sum = 683ea85fc054094248baf5752dd089bf

stack/resilient/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [pbsready]
 filename = pbsready.cfg.in
-md5sum = 516482f89d7a3ebe4458a404eb4a575b
+md5sum = f3bf5e1d8bbfbb428c5bbe3a57d8cbe5
 
 [pbsready-import]
 filename = pbsready-import.cfg.in
@@ -30,7 +30,7 @@ md5sum = 57b9b421d233402e6d5177c69cf9567e
 
 [template-replicated]
 filename = template-replicated.cfg.in
-md5sum = 5369b039600e1df8b471ac4b41d5de60
+md5sum = dba869ed13e001f2188c466673df4bbf
 
 [template-parts]
 filename = template-parts.cfg.in

stack/resilient/pbsready.cfg.in

@@ -273,5 +273,5 @@ recipe = slapos.cookbook:userinfo
 [resilient-publish-connection-parameter]
 recipe = slapos.cookbook:publish
 ssh-public-key = $${sshkeys-sshd:public-key-value}
-ssh-url = ssh://$${user-info:pw-name}@[$${sshd-raw-server:host}]:$${sshd-port:port}/$${rdiff-backup-server:path}
+resilient-ssh-url = ssh://$${user-info:pw-name}@[$${sshd-raw-server:host}]:$${sshd-port:port}/$${rdiff-backup-server:path}
 ip = $${slap-network-information:global-ipv6}

stack/resilient/template-replicated.cfg.in

@@ -33,7 +33,7 @@ software-url = ${slap-connection:software-release-url}
    {{heriteLeader}}
 software-type = {{typeexport}}
 name = {{namebase}}0
-return = ssh-public-key ssh-url notification-id ip {{ monitor_return }}
+return = ssh-public-key resilient-ssh-url notification-id ip {{ monitor_return }}
 
 config-number = 0
 config-authorized-key = {% for id in range(1,nbbackup|int) %} ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}{% endfor %}
@@ -87,7 +87,7 @@ name = {{namebase}}{{id}}
 
 software-url = ${slap-connection:software-release-url}
 software-type = {{typeimport}}
-return = ssh-public-key ssh-url notification-url ip takeover-url takeover-password  {{ monitor_return }}
+return = ssh-public-key resilient-ssh-url notification-url ip takeover-url takeover-password  {{ monitor_return }}
 
 pbs-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-{{id}}-push
 
@@ -229,7 +229,7 @@ mode = 700
 [request-pull-backup-server-{{namebase}}-{{id}}]
 <= request-pbs-common
 name = PBS {{id}} pulling from ${request-{{namebase}}:name}
-config-url = ${request-{{namebase}}:connection-ssh-url}
+config-url = ${request-{{namebase}}:connection-resilient-ssh-url}
 config-type = pull
 config-server-key = ${request-{{namebase}}:connection-ssh-public-key}
 config-on-notification = ${request-{{namebase}}:connection-notification-id}
@@ -259,7 +259,7 @@ monitor-url-list = {{ monitor_url_list | join(' ') }}
 [request-pull-backup-server-{{namebase}}-backup-{{id}}]
 <= request-pbs-common
 name = PBS pushing on ${request-{{namebase}}-pseudo-replicating-{{id}}:name}
-config-url = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-ssh-url}
+config-url = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-resilient-ssh-url}
 config-type = push
 config-server-key = ${request-{{namebase}}-pseudo-replicating-{{id}}:connection-ssh-public-key}
 config-on-notification = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}${request-pull-backup-server-{{namebase}}-{{id}}:config-notification-id}

update-hash

@@ -44,7 +44,7 @@ import tempfile
 # ConfigParser syntax in order to be strictly validated, to prevent misuse
 # and allow easy extension (ex: to other hashes).
 
-FILENAME_KEY = 'filename'
+FILENAME_KEY_LIST = ['filename', '_update_hash_filename_']
 HASH_MAP = {
     'md5sum': hashlib.md5,
 }
@@ -97,7 +97,7 @@ def main():
                         name, value = line.split('=', 1)
                         name = name.strip()
                         value = value.strip()
-                        if name == FILENAME_KEY:
+                        if name in FILENAME_KEY_LIST:
                             hash_file_path = value
                             current_section.append(line)
                         else: