Commit 278cbd99 authored by Łukasz Nowak's avatar Łukasz Nowak Committed by Łukasz Nowak

caddy-frontend: Restart 6tunnel services on SR upgrade

"software/caddy-frontend: auto-restart services on SR upgrade." begun
implementation of automatic restart of services on SR upgrade, but not all
services has been caught - 6tunnel was missing.

/reviewed-on !473
parent 0fe0d2e9
......@@ -30,7 +30,7 @@ md5sum = 6a86edb96b171fbd0a59d0adc9cc906b
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
md5sum = 434e00cbfee2f9c002b2a83084a48b4a
md5sum = 21d79170943678b1be1d69614a32bd92
[template-slave-configuration]
filename = templates/custom-virtualhost.conf.in
......
......@@ -340,6 +340,7 @@ ipv4 = ${slap-network-information:local-ipv4}
ipv6 = ${slap-network-information:global-ipv6}
wrapper-path = {{ service_directory}}/6tunnel-${:ipv6-port}
command-line = {{ sixtunnel_executable }} -6 -4 -d -l ${:ipv6} ${:ipv6-port} ${:ipv4} ${:ipv4-port}
hash-files = ${buildout:directory}/software_release/buildout.cfg
[tunnel-6to4-base-http_port]
<= tunnel-6to4-base
......
......@@ -7,7 +7,7 @@
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# guarantees and support are strongly advised to contract a Free Software
# Service Company
# Service Companyre
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
......@@ -4048,6 +4048,12 @@ class AutoRestartTestCase(SlaveHttpFrontendTestCase):
'trafficserver-{hash}-on-watch',
'certificate_authority-{hash}-on-watch',
'crond-{hash}',
'6tunnel-8081-{hash}-on-watch',
'6tunnel-4443-{hash}-on-watch',
'6tunnel-8080-{hash}-on-watch',
'6tunnel-9443-{hash}-on-watch',
'6tunnel-26011-{hash}-on-watch',
'6tunnel-26012-{hash}-on-watch',
]
supervisor = self.getSupervisorRPCServer().supervisor
......
......@@ -3,12 +3,12 @@ TestDefaultMonitorHttpdPort-0:certificate_authority-on-watch RUNNING
TestDefaultMonitorHttpdPort-0:crond-{hash} RUNNING
TestDefaultMonitorHttpdPort-0:monitor-httpd-{hash}-on-watch EXITED
TestDefaultMonitorHttpdPort-0:monitor-httpd-graceful EXITED
TestDefaultMonitorHttpdPort-1:6tunnel-26011-on-watch STOPPED
TestDefaultMonitorHttpdPort-1:6tunnel-26012-on-watch STOPPED
TestDefaultMonitorHttpdPort-1:6tunnel-4443-on-watch STOPPED
TestDefaultMonitorHttpdPort-1:6tunnel-8080-on-watch STOPPED
TestDefaultMonitorHttpdPort-1:6tunnel-8081-on-watch STOPPED
TestDefaultMonitorHttpdPort-1:6tunnel-9443-on-watch STOPPED
TestDefaultMonitorHttpdPort-1:6tunnel-26011-{hash}-on-watch STOPPED
TestDefaultMonitorHttpdPort-1:6tunnel-26012-{hash}-on-watch STOPPED
TestDefaultMonitorHttpdPort-1:6tunnel-4443-{hash}-on-watch STOPPED
TestDefaultMonitorHttpdPort-1:6tunnel-8080-{hash}-on-watch STOPPED
TestDefaultMonitorHttpdPort-1:6tunnel-8081-{hash}-on-watch STOPPED
TestDefaultMonitorHttpdPort-1:6tunnel-9443-{hash}-on-watch STOPPED
TestDefaultMonitorHttpdPort-1:bootstrap-monitor STOPPED
TestDefaultMonitorHttpdPort-1:certificate_authority-{hash}-on-watch STOPPED
TestDefaultMonitorHttpdPort-1:crond-{hash} STOPPED
......
......@@ -3,12 +3,12 @@ TestDuplicateSiteKeyProtection-0:certificate_authority-on-watch RUNNING
TestDuplicateSiteKeyProtection-0:crond-{hash} RUNNING
TestDuplicateSiteKeyProtection-0:monitor-httpd-{hash}-on-watch RUNNING
TestDuplicateSiteKeyProtection-0:monitor-httpd-graceful EXITED
TestDuplicateSiteKeyProtection-1:6tunnel-11080-on-watch RUNNING
TestDuplicateSiteKeyProtection-1:6tunnel-11443-on-watch RUNNING
TestDuplicateSiteKeyProtection-1:6tunnel-12080-on-watch RUNNING
TestDuplicateSiteKeyProtection-1:6tunnel-12443-on-watch RUNNING
TestDuplicateSiteKeyProtection-1:6tunnel-26011-on-watch RUNNING
TestDuplicateSiteKeyProtection-1:6tunnel-26012-on-watch RUNNING
TestDuplicateSiteKeyProtection-1:6tunnel-11080-{hash}-on-watch RUNNING
TestDuplicateSiteKeyProtection-1:6tunnel-11443-{hash}-on-watch RUNNING
TestDuplicateSiteKeyProtection-1:6tunnel-12080-{hash}-on-watch RUNNING
TestDuplicateSiteKeyProtection-1:6tunnel-12443-{hash}-on-watch RUNNING
TestDuplicateSiteKeyProtection-1:6tunnel-26011-{hash}-on-watch RUNNING
TestDuplicateSiteKeyProtection-1:6tunnel-26012-{hash}-on-watch RUNNING
TestDuplicateSiteKeyProtection-1:bootstrap-monitor EXITED
TestDuplicateSiteKeyProtection-1:certificate_authority-{hash}-on-watch RUNNING
TestDuplicateSiteKeyProtection-1:crond-{hash} RUNNING
......
......@@ -3,12 +3,12 @@ TestEnableHttp2ByDefaultDefaultSlave-0:certificate_authority-on-watch RUNNING
TestEnableHttp2ByDefaultDefaultSlave-0:crond-{hash} RUNNING
TestEnableHttp2ByDefaultDefaultSlave-0:monitor-httpd-{hash}-on-watch RUNNING
TestEnableHttp2ByDefaultDefaultSlave-0:monitor-httpd-graceful EXITED
TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-11080-on-watch RUNNING
TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-11443-on-watch RUNNING
TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-12080-on-watch RUNNING
TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-12443-on-watch RUNNING
TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-26011-on-watch RUNNING
TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-26012-on-watch RUNNING
TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-11080-{hash}-on-watch RUNNING
TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-11443-{hash}-on-watch RUNNING
TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-12080-{hash}-on-watch RUNNING
TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-12443-{hash}-on-watch RUNNING
TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-26011-{hash}-on-watch RUNNING
TestEnableHttp2ByDefaultDefaultSlave-1:6tunnel-26012-{hash}-on-watch RUNNING
TestEnableHttp2ByDefaultDefaultSlave-1:bootstrap-monitor EXITED
TestEnableHttp2ByDefaultDefaultSlave-1:certificate_authority-{hash}-on-watch RUNNING
TestEnableHttp2ByDefaultDefaultSlave-1:crond-{hash} RUNNING
......
......@@ -3,12 +3,12 @@ TestEnableHttp2ByDefaultFalseSlave-0:certificate_authority-on-watch RUNNING
TestEnableHttp2ByDefaultFalseSlave-0:crond-{hash} RUNNING
TestEnableHttp2ByDefaultFalseSlave-0:monitor-httpd-{hash}-on-watch RUNNING
TestEnableHttp2ByDefaultFalseSlave-0:monitor-httpd-graceful EXITED
TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-11080-on-watch RUNNING
TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-11443-on-watch RUNNING
TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-12080-on-watch RUNNING
TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-12443-on-watch RUNNING
TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-26011-on-watch RUNNING
TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-26012-on-watch RUNNING
TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-11080-{hash}-on-watch RUNNING
TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-11443-{hash}-on-watch RUNNING
TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-12080-{hash}-on-watch RUNNING
TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-12443-{hash}-on-watch RUNNING
TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-26011-{hash}-on-watch RUNNING
TestEnableHttp2ByDefaultFalseSlave-1:6tunnel-26012-{hash}-on-watch RUNNING
TestEnableHttp2ByDefaultFalseSlave-1:bootstrap-monitor EXITED
TestEnableHttp2ByDefaultFalseSlave-1:certificate_authority-{hash}-on-watch RUNNING
TestEnableHttp2ByDefaultFalseSlave-1:crond-{hash} RUNNING
......
......@@ -3,12 +3,12 @@ TestMalformedBackenUrlSlave-0:certificate_authority-on-watch RUNNING
TestMalformedBackenUrlSlave-0:crond-{hash} RUNNING
TestMalformedBackenUrlSlave-0:monitor-httpd-{hash}-on-watch RUNNING
TestMalformedBackenUrlSlave-0:monitor-httpd-graceful EXITED
TestMalformedBackenUrlSlave-1:6tunnel-11080-on-watch RUNNING
TestMalformedBackenUrlSlave-1:6tunnel-11443-on-watch RUNNING
TestMalformedBackenUrlSlave-1:6tunnel-12080-on-watch RUNNING
TestMalformedBackenUrlSlave-1:6tunnel-12443-on-watch RUNNING
TestMalformedBackenUrlSlave-1:6tunnel-26011-on-watch RUNNING
TestMalformedBackenUrlSlave-1:6tunnel-26012-on-watch RUNNING
TestMalformedBackenUrlSlave-1:6tunnel-11080-{hash}-on-watch RUNNING
TestMalformedBackenUrlSlave-1:6tunnel-11443-{hash}-on-watch RUNNING
TestMalformedBackenUrlSlave-1:6tunnel-12080-{hash}-on-watch RUNNING
TestMalformedBackenUrlSlave-1:6tunnel-12443-{hash}-on-watch RUNNING
TestMalformedBackenUrlSlave-1:6tunnel-26011-{hash}-on-watch RUNNING
TestMalformedBackenUrlSlave-1:6tunnel-26012-{hash}-on-watch RUNNING
TestMalformedBackenUrlSlave-1:bootstrap-monitor EXITED
TestMalformedBackenUrlSlave-1:certificate_authority-{hash}-on-watch RUNNING
TestMalformedBackenUrlSlave-1:crond-{hash} RUNNING
......
......@@ -3,12 +3,12 @@ TestQuicEnabled-0:certificate_authority-on-watch RUNNING
TestQuicEnabled-0:crond-{hash} RUNNING
TestQuicEnabled-0:monitor-httpd-{hash}-on-watch RUNNING
TestQuicEnabled-0:monitor-httpd-graceful EXITED
TestQuicEnabled-1:6tunnel-11080-on-watch RUNNING
TestQuicEnabled-1:6tunnel-11443-on-watch RUNNING
TestQuicEnabled-1:6tunnel-12080-on-watch RUNNING
TestQuicEnabled-1:6tunnel-12443-on-watch RUNNING
TestQuicEnabled-1:6tunnel-26011-on-watch RUNNING
TestQuicEnabled-1:6tunnel-26012-on-watch RUNNING
TestQuicEnabled-1:6tunnel-11080-{hash}-on-watch RUNNING
TestQuicEnabled-1:6tunnel-11443-{hash}-on-watch RUNNING
TestQuicEnabled-1:6tunnel-12080-{hash}-on-watch RUNNING
TestQuicEnabled-1:6tunnel-12443-{hash}-on-watch RUNNING
TestQuicEnabled-1:6tunnel-26011-{hash}-on-watch RUNNING
TestQuicEnabled-1:6tunnel-26012-{hash}-on-watch RUNNING
TestQuicEnabled-1:bootstrap-monitor EXITED
TestQuicEnabled-1:certificate_authority-{hash}-on-watch RUNNING
TestQuicEnabled-1:crond-{hash} RUNNING
......
......@@ -3,12 +3,12 @@ TestRe6stVerificationUrlDefaultSlave-0:certificate_authority-on-watch RUNNING
TestRe6stVerificationUrlDefaultSlave-0:crond-{hash} RUNNING
TestRe6stVerificationUrlDefaultSlave-0:monitor-httpd-{hash}-on-watch RUNNING
TestRe6stVerificationUrlDefaultSlave-0:monitor-httpd-graceful EXITED
TestRe6stVerificationUrlDefaultSlave-1:6tunnel-11080-on-watch RUNNING
TestRe6stVerificationUrlDefaultSlave-1:6tunnel-11443-on-watch RUNNING
TestRe6stVerificationUrlDefaultSlave-1:6tunnel-12080-on-watch RUNNING
TestRe6stVerificationUrlDefaultSlave-1:6tunnel-12443-on-watch RUNNING
TestRe6stVerificationUrlDefaultSlave-1:6tunnel-26011-on-watch RUNNING
TestRe6stVerificationUrlDefaultSlave-1:6tunnel-26012-on-watch RUNNING
TestRe6stVerificationUrlDefaultSlave-1:6tunnel-11080-{hash}-on-watch RUNNING
TestRe6stVerificationUrlDefaultSlave-1:6tunnel-11443-{hash}-on-watch RUNNING
TestRe6stVerificationUrlDefaultSlave-1:6tunnel-12080-{hash}-on-watch RUNNING
TestRe6stVerificationUrlDefaultSlave-1:6tunnel-12443-{hash}-on-watch RUNNING
TestRe6stVerificationUrlDefaultSlave-1:6tunnel-26011-{hash}-on-watch RUNNING
TestRe6stVerificationUrlDefaultSlave-1:6tunnel-26012-{hash}-on-watch RUNNING
TestRe6stVerificationUrlDefaultSlave-1:bootstrap-monitor EXITED
TestRe6stVerificationUrlDefaultSlave-1:certificate_authority-{hash}-on-watch RUNNING
TestRe6stVerificationUrlDefaultSlave-1:crond-{hash} RUNNING
......
......@@ -3,12 +3,12 @@ TestRe6stVerificationUrlSlave-0:certificate_authority-on-watch RUNNING
TestRe6stVerificationUrlSlave-0:crond-{hash} RUNNING
TestRe6stVerificationUrlSlave-0:monitor-httpd-{hash}-on-watch RUNNING
TestRe6stVerificationUrlSlave-0:monitor-httpd-graceful EXITED
TestRe6stVerificationUrlSlave-1:6tunnel-11080-on-watch RUNNING
TestRe6stVerificationUrlSlave-1:6tunnel-11443-on-watch RUNNING
TestRe6stVerificationUrlSlave-1:6tunnel-12080-on-watch RUNNING
TestRe6stVerificationUrlSlave-1:6tunnel-12443-on-watch RUNNING
TestRe6stVerificationUrlSlave-1:6tunnel-26011-on-watch RUNNING
TestRe6stVerificationUrlSlave-1:6tunnel-26012-on-watch RUNNING
TestRe6stVerificationUrlSlave-1:6tunnel-11080-{hash}-on-watch RUNNING
TestRe6stVerificationUrlSlave-1:6tunnel-11443-{hash}-on-watch RUNNING
TestRe6stVerificationUrlSlave-1:6tunnel-12080-{hash}-on-watch RUNNING
TestRe6stVerificationUrlSlave-1:6tunnel-12443-{hash}-on-watch RUNNING
TestRe6stVerificationUrlSlave-1:6tunnel-26011-{hash}-on-watch RUNNING
TestRe6stVerificationUrlSlave-1:6tunnel-26012-{hash}-on-watch RUNNING
TestRe6stVerificationUrlSlave-1:bootstrap-monitor EXITED
TestRe6stVerificationUrlSlave-1:certificate_authority-{hash}-on-watch RUNNING
TestRe6stVerificationUrlSlave-1:crond-{hash} RUNNING
......
......@@ -3,12 +3,12 @@ TestReplicateSlave-0:certificate_authority-on-watch RUNNING
TestReplicateSlave-0:crond-{hash} RUNNING
TestReplicateSlave-0:monitor-httpd-{hash}-on-watch RUNNING
TestReplicateSlave-0:monitor-httpd-graceful EXITED
TestReplicateSlave-1:6tunnel-11080-on-watch RUNNING
TestReplicateSlave-1:6tunnel-11443-on-watch RUNNING
TestReplicateSlave-1:6tunnel-12080-on-watch RUNNING
TestReplicateSlave-1:6tunnel-12443-on-watch RUNNING
TestReplicateSlave-1:6tunnel-26011-on-watch RUNNING
TestReplicateSlave-1:6tunnel-26012-on-watch RUNNING
TestReplicateSlave-1:6tunnel-11080-{hash}-on-watch RUNNING
TestReplicateSlave-1:6tunnel-11443-{hash}-on-watch RUNNING
TestReplicateSlave-1:6tunnel-12080-{hash}-on-watch RUNNING
TestReplicateSlave-1:6tunnel-12443-{hash}-on-watch RUNNING
TestReplicateSlave-1:6tunnel-26011-{hash}-on-watch RUNNING
TestReplicateSlave-1:6tunnel-26012-{hash}-on-watch RUNNING
TestReplicateSlave-1:bootstrap-monitor EXITED
TestReplicateSlave-1:certificate_authority-{hash}-on-watch RUNNING
TestReplicateSlave-1:crond-{hash} RUNNING
......@@ -21,12 +21,12 @@ TestReplicateSlave-1:monitor-httpd-{hash}-on-watch RUNNING
TestReplicateSlave-1:monitor-httpd-graceful EXITED
TestReplicateSlave-1:trafficserver-{hash}-on-watch RUNNING
TestReplicateSlave-1:trafficserver-reload EXITED
TestReplicateSlave-2:6tunnel-11080-on-watch STOPPED
TestReplicateSlave-2:6tunnel-11443-on-watch STOPPED
TestReplicateSlave-2:6tunnel-12080-on-watch STOPPED
TestReplicateSlave-2:6tunnel-12443-on-watch STOPPED
TestReplicateSlave-2:6tunnel-26011-on-watch STOPPED
TestReplicateSlave-2:6tunnel-26012-on-watch STOPPED
TestReplicateSlave-2:6tunnel-11080-{hash}-on-watch STOPPED
TestReplicateSlave-2:6tunnel-11443-{hash}-on-watch STOPPED
TestReplicateSlave-2:6tunnel-12080-{hash}-on-watch STOPPED
TestReplicateSlave-2:6tunnel-12443-{hash}-on-watch STOPPED
TestReplicateSlave-2:6tunnel-26011-{hash}-on-watch STOPPED
TestReplicateSlave-2:6tunnel-26012-{hash}-on-watch STOPPED
TestReplicateSlave-2:bootstrap-monitor STOPPED
TestReplicateSlave-2:certificate_authority-{hash}-on-watch STOPPED
TestReplicateSlave-2:crond-{hash} STOPPED
......
......@@ -3,12 +3,12 @@ TestSlave-0:certificate_authority-on-watch RUNNING
TestSlave-0:crond-{hash} RUNNING
TestSlave-0:monitor-httpd-{hash}-on-watch RUNNING
TestSlave-0:monitor-httpd-graceful EXITED
TestSlave-1:6tunnel-11080-on-watch RUNNING
TestSlave-1:6tunnel-11443-on-watch RUNNING
TestSlave-1:6tunnel-12080-on-watch RUNNING
TestSlave-1:6tunnel-12443-on-watch RUNNING
TestSlave-1:6tunnel-26011-on-watch RUNNING
TestSlave-1:6tunnel-26012-on-watch RUNNING
TestSlave-1:6tunnel-11080-{hash}-on-watch RUNNING
TestSlave-1:6tunnel-11443-{hash}-on-watch RUNNING
TestSlave-1:6tunnel-12080-{hash}-on-watch RUNNING
TestSlave-1:6tunnel-12443-{hash}-on-watch RUNNING
TestSlave-1:6tunnel-26011-{hash}-on-watch RUNNING
TestSlave-1:6tunnel-26012-{hash}-on-watch RUNNING
TestSlave-1:bootstrap-monitor EXITED
TestSlave-1:certificate_authority-{hash}-on-watch RUNNING
TestSlave-1:crond-{hash} RUNNING
......
......@@ -3,12 +3,12 @@ TestSlaveBadParameters-0:certificate_authority-on-watch RUNNING
TestSlaveBadParameters-0:crond-{hash} RUNNING
TestSlaveBadParameters-0:monitor-httpd-{hash}-on-watch RUNNING
TestSlaveBadParameters-0:monitor-httpd-graceful EXITED
TestSlaveBadParameters-1:6tunnel-11080-on-watch RUNNING
TestSlaveBadParameters-1:6tunnel-11443-on-watch RUNNING
TestSlaveBadParameters-1:6tunnel-12080-on-watch RUNNING
TestSlaveBadParameters-1:6tunnel-12443-on-watch RUNNING
TestSlaveBadParameters-1:6tunnel-26011-on-watch RUNNING
TestSlaveBadParameters-1:6tunnel-26012-on-watch RUNNING
TestSlaveBadParameters-1:6tunnel-11080-{hash}-on-watch RUNNING
TestSlaveBadParameters-1:6tunnel-11443-{hash}-on-watch RUNNING
TestSlaveBadParameters-1:6tunnel-12080-{hash}-on-watch RUNNING
TestSlaveBadParameters-1:6tunnel-12443-{hash}-on-watch RUNNING
TestSlaveBadParameters-1:6tunnel-26011-{hash}-on-watch RUNNING
TestSlaveBadParameters-1:6tunnel-26012-{hash}-on-watch RUNNING
TestSlaveBadParameters-1:bootstrap-monitor EXITED
TestSlaveBadParameters-1:certificate_authority-{hash}-on-watch RUNNING
TestSlaveBadParameters-1:crond-{hash} RUNNING
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment