Update release Candidate

component/openssl/buildout.cfg

@@ -40,7 +40,7 @@ make-targets =
   -j1 install_sw install_ssldirs &&
   rm -f ${:certs}/* &&
   for i in ${ca-certificates:location}/certs/*/*.crt; do
-    ln -sv $i ${:certs}/`${:location}/bin/openssl x509 -hash -noout -in $i`.0
+    ln -sfv $i ${:certs}/`${:location}/bin/openssl x509 -hash -noout -in $i`.0
   ; done
 environment =
   PERL=${perl:location}/bin/perl

component/slapos/obs.cfg

@@ -96,6 +96,7 @@ prefix = ${buildout:rootdir}/parts/${:_buildout_section_name_}
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 make-options +=
   INSTALL_PREFIX=${buildout:destdir}
+  DESTDIR=${buildout:destdir}
  
 environment =
   PERL5LIB=${perl:location}/lib/5.26.1/

software/caddy-frontend/test/test.py

@@ -310,6 +310,9 @@ class TestDataMixin(object):
     self._test_file_list('run', [
       # run by cron from time to time
       'monitor/monitor-collect.pid',
+      # may appear or not
+      'var/run/caddy_graceful_signature.tmp',
+      'var/run/nginx_graceful_signature.tmp',
     ])
 
   def test_supervisor_state(self):

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

 TestDuplicateSiteKeyProtection-0/var/run/monitor-httpd.pid
 TestDuplicateSiteKeyProtection-0/var/run/monitor/monitor-bootstrap.pid
 TestDuplicateSiteKeyProtection-1/var/run/caddy_graceful_signature
-TestDuplicateSiteKeyProtection-1/var/run/caddy_graceful_signature.tmp
 TestDuplicateSiteKeyProtection-1/var/run/caddy_validate_signature
 TestDuplicateSiteKeyProtection-1/var/run/caddy_validate_signature.status
 TestDuplicateSiteKeyProtection-1/var/run/httpd.pid
@@ -9,6 +8,5 @@ TestDuplicateSiteKeyProtection-1/var/run/monitor-httpd.pid
 TestDuplicateSiteKeyProtection-1/var/run/monitor/monitor-bootstrap.pid
 TestDuplicateSiteKeyProtection-1/var/run/nginx.pid
 TestDuplicateSiteKeyProtection-1/var/run/nginx_graceful_signature
-TestDuplicateSiteKeyProtection-1/var/run/nginx_graceful_signature.tmp
 TestDuplicateSiteKeyProtection-1/var/run/nginx_validate_signature
 TestDuplicateSiteKeyProtection-1/var/run/nginx_validate_signature.status
\ No newline at end of file

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

 TestEnableHttp2ByDefaultDefaultSlave-0/var/run/monitor-httpd.pid
 TestEnableHttp2ByDefaultDefaultSlave-0/var/run/monitor/monitor-bootstrap.pid
 TestEnableHttp2ByDefaultDefaultSlave-1/var/run/caddy_graceful_signature
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/caddy_graceful_signature.tmp
 TestEnableHttp2ByDefaultDefaultSlave-1/var/run/caddy_validate_signature
 TestEnableHttp2ByDefaultDefaultSlave-1/var/run/caddy_validate_signature.status
 TestEnableHttp2ByDefaultDefaultSlave-1/var/run/httpd.pid
@@ -9,6 +8,5 @@ TestEnableHttp2ByDefaultDefaultSlave-1/var/run/monitor-httpd.pid
 TestEnableHttp2ByDefaultDefaultSlave-1/var/run/monitor/monitor-bootstrap.pid
 TestEnableHttp2ByDefaultDefaultSlave-1/var/run/nginx.pid
 TestEnableHttp2ByDefaultDefaultSlave-1/var/run/nginx_graceful_signature
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/nginx_graceful_signature.tmp
 TestEnableHttp2ByDefaultDefaultSlave-1/var/run/nginx_validate_signature
 TestEnableHttp2ByDefaultDefaultSlave-1/var/run/nginx_validate_signature.status
\ No newline at end of file

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

 TestEnableHttp2ByDefaultFalseSlave-0/var/run/monitor-httpd.pid
 TestEnableHttp2ByDefaultFalseSlave-0/var/run/monitor/monitor-bootstrap.pid
 TestEnableHttp2ByDefaultFalseSlave-1/var/run/caddy_graceful_signature
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/caddy_graceful_signature.tmp
 TestEnableHttp2ByDefaultFalseSlave-1/var/run/caddy_validate_signature
 TestEnableHttp2ByDefaultFalseSlave-1/var/run/caddy_validate_signature.status
 TestEnableHttp2ByDefaultFalseSlave-1/var/run/httpd.pid
@@ -9,6 +8,5 @@ TestEnableHttp2ByDefaultFalseSlave-1/var/run/monitor-httpd.pid
 TestEnableHttp2ByDefaultFalseSlave-1/var/run/monitor/monitor-bootstrap.pid
 TestEnableHttp2ByDefaultFalseSlave-1/var/run/nginx.pid
 TestEnableHttp2ByDefaultFalseSlave-1/var/run/nginx_graceful_signature
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/nginx_graceful_signature.tmp
 TestEnableHttp2ByDefaultFalseSlave-1/var/run/nginx_validate_signature
 TestEnableHttp2ByDefaultFalseSlave-1/var/run/nginx_validate_signature.status
\ No newline at end of file

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

 TestMalformedBackenUrlSlave-0/var/run/monitor-httpd.pid
 TestMalformedBackenUrlSlave-0/var/run/monitor/monitor-bootstrap.pid
 TestMalformedBackenUrlSlave-1/var/run/caddy_graceful_signature
-TestMalformedBackenUrlSlave-1/var/run/caddy_graceful_signature.tmp
 TestMalformedBackenUrlSlave-1/var/run/caddy_validate_signature
 TestMalformedBackenUrlSlave-1/var/run/caddy_validate_signature.status
 TestMalformedBackenUrlSlave-1/var/run/httpd.pid
@@ -9,6 +8,5 @@ TestMalformedBackenUrlSlave-1/var/run/monitor-httpd.pid
 TestMalformedBackenUrlSlave-1/var/run/monitor/monitor-bootstrap.pid
 TestMalformedBackenUrlSlave-1/var/run/nginx.pid
 TestMalformedBackenUrlSlave-1/var/run/nginx_graceful_signature
-TestMalformedBackenUrlSlave-1/var/run/nginx_graceful_signature.tmp
 TestMalformedBackenUrlSlave-1/var/run/nginx_validate_signature
 TestMalformedBackenUrlSlave-1/var/run/nginx_validate_signature.status
\ No newline at end of file

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

 TestQuicEnabled-0/var/run/monitor-httpd.pid
 TestQuicEnabled-0/var/run/monitor/monitor-bootstrap.pid
 TestQuicEnabled-1/var/run/caddy_graceful_signature
-TestQuicEnabled-1/var/run/caddy_graceful_signature.tmp
 TestQuicEnabled-1/var/run/caddy_validate_signature
 TestQuicEnabled-1/var/run/caddy_validate_signature.status
 TestQuicEnabled-1/var/run/httpd.pid
@@ -9,6 +8,5 @@ TestQuicEnabled-1/var/run/monitor-httpd.pid
 TestQuicEnabled-1/var/run/monitor/monitor-bootstrap.pid
 TestQuicEnabled-1/var/run/nginx.pid
 TestQuicEnabled-1/var/run/nginx_graceful_signature
-TestQuicEnabled-1/var/run/nginx_graceful_signature.tmp
 TestQuicEnabled-1/var/run/nginx_validate_signature
 TestQuicEnabled-1/var/run/nginx_validate_signature.status
\ No newline at end of file

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

 TestRe6stVerificationUrlDefaultSlave-0/var/run/monitor-httpd.pid
 TestRe6stVerificationUrlDefaultSlave-0/var/run/monitor/monitor-bootstrap.pid
 TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_graceful_signature
-TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_graceful_signature.tmp
 TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_validate_signature
 TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_validate_signature.status
 TestRe6stVerificationUrlDefaultSlave-1/var/run/httpd.pid
@@ -9,6 +8,5 @@ TestRe6stVerificationUrlDefaultSlave-1/var/run/monitor-httpd.pid
 TestRe6stVerificationUrlDefaultSlave-1/var/run/monitor/monitor-bootstrap.pid
 TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx.pid
 TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx_graceful_signature
-TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx_graceful_signature.tmp
 TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx_validate_signature
 TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx_validate_signature.status
\ No newline at end of file

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

 TestRe6stVerificationUrlSlave-0/var/run/monitor-httpd.pid
 TestRe6stVerificationUrlSlave-0/var/run/monitor/monitor-bootstrap.pid
 TestRe6stVerificationUrlSlave-1/var/run/caddy_graceful_signature
-TestRe6stVerificationUrlSlave-1/var/run/caddy_graceful_signature.tmp
 TestRe6stVerificationUrlSlave-1/var/run/caddy_validate_signature
 TestRe6stVerificationUrlSlave-1/var/run/caddy_validate_signature.status
 TestRe6stVerificationUrlSlave-1/var/run/httpd.pid
@@ -9,6 +8,5 @@ TestRe6stVerificationUrlSlave-1/var/run/monitor-httpd.pid
 TestRe6stVerificationUrlSlave-1/var/run/monitor/monitor-bootstrap.pid
 TestRe6stVerificationUrlSlave-1/var/run/nginx.pid
 TestRe6stVerificationUrlSlave-1/var/run/nginx_graceful_signature
-TestRe6stVerificationUrlSlave-1/var/run/nginx_graceful_signature.tmp
 TestRe6stVerificationUrlSlave-1/var/run/nginx_validate_signature
 TestRe6stVerificationUrlSlave-1/var/run/nginx_validate_signature.status

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

 TestReplicateSlave-0/var/run/monitor-httpd.pid
 TestReplicateSlave-0/var/run/monitor/monitor-bootstrap.pid
 TestReplicateSlave-1/var/run/caddy_graceful_signature
-TestReplicateSlave-1/var/run/caddy_graceful_signature.tmp
 TestReplicateSlave-1/var/run/caddy_validate_signature
 TestReplicateSlave-1/var/run/caddy_validate_signature.status
 TestReplicateSlave-1/var/run/httpd.pid
@@ -9,6 +8,5 @@ TestReplicateSlave-1/var/run/monitor-httpd.pid
 TestReplicateSlave-1/var/run/monitor/monitor-bootstrap.pid
 TestReplicateSlave-1/var/run/nginx.pid
 TestReplicateSlave-1/var/run/nginx_graceful_signature
-TestReplicateSlave-1/var/run/nginx_graceful_signature.tmp
 TestReplicateSlave-1/var/run/nginx_validate_signature
 TestReplicateSlave-1/var/run/nginx_validate_signature.status
\ No newline at end of file

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

 TestSlave-0/var/run/monitor-httpd.pid
 TestSlave-0/var/run/monitor/monitor-bootstrap.pid
 TestSlave-1/var/run/caddy_graceful_signature
-TestSlave-1/var/run/caddy_graceful_signature.tmp
 TestSlave-1/var/run/caddy_validate_signature
 TestSlave-1/var/run/caddy_validate_signature.status
 TestSlave-1/var/run/httpd.pid
@@ -9,6 +8,5 @@ TestSlave-1/var/run/monitor-httpd.pid
 TestSlave-1/var/run/monitor/monitor-bootstrap.pid
 TestSlave-1/var/run/nginx.pid
 TestSlave-1/var/run/nginx_graceful_signature
-TestSlave-1/var/run/nginx_graceful_signature.tmp
 TestSlave-1/var/run/nginx_validate_signature
 TestSlave-1/var/run/nginx_validate_signature.status
\ No newline at end of file

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

 TestSlaveBadParameters-0/var/run/monitor-httpd.pid
 TestSlaveBadParameters-0/var/run/monitor/monitor-bootstrap.pid
 TestSlaveBadParameters-1/var/run/caddy_graceful_signature
-TestSlaveBadParameters-1/var/run/caddy_graceful_signature.tmp
 TestSlaveBadParameters-1/var/run/caddy_validate_signature
 TestSlaveBadParameters-1/var/run/caddy_validate_signature.status
 TestSlaveBadParameters-1/var/run/httpd.pid
@@ -9,6 +8,5 @@ TestSlaveBadParameters-1/var/run/monitor-httpd.pid
 TestSlaveBadParameters-1/var/run/monitor/monitor-bootstrap.pid
 TestSlaveBadParameters-1/var/run/nginx.pid
 TestSlaveBadParameters-1/var/run/nginx_graceful_signature
-TestSlaveBadParameters-1/var/run/nginx_graceful_signature.tmp
 TestSlaveBadParameters-1/var/run/nginx_validate_signature
 TestSlaveBadParameters-1/var/run/nginx_validate_signature.status
\ No newline at end of file