From 53536a57fac52d51c89a43eef9680aec340f1d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= Date: Thu, 20 Feb 2020 19:01:15 +0100 Subject: [PATCH 1/5] caddy-frontend/test: Fix file formatting --- software/caddy-frontend/test/test.py | 9 ++++++--- ...tp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt | 2 +- ...ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt | 2 +- ...tSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt | 2 +- ...aveGlobalDisableHttp2.test_supervisor_state-CADDY.txt | 2 +- ...Http2ByDefaultFalseSlave.test_file_list_run-CADDY.txt | 2 +- ...p2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt | 2 +- ...eSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt | 2 +- ...aveGlobalDisableHttp2.test_supervisor_state-CADDY.txt | 2 +- .../test.TestMasterRequest.test_file_list_run-CADDY.txt | 1 + ....TestMasterRequestDomain.test_file_list_run-CADDY.txt | 1 + .../test.TestQuicEnabled.test_file_list_run-CADDY.txt | 2 +- .../test.TestQuicEnabled.test_supervisor_state-CADDY.txt | 2 +- ...ificationUrlDefaultSlave.test_file_list_run-CADDY.txt | 2 +- ...cationUrlDefaultSlave.test_supervisor_state-CADDY.txt | 2 +- .../test.TestSlave.test_file_list_run-CADDY.txt | 2 +- .../test.TestSlaveCiphers.test_file_list_run-CADDY.txt | 2 +- ...test.TestSlaveCiphers.test_supervisor_state-CADDY.txt | 2 +- ...tSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt | 2 +- ...aveGlobalDisableHttp2.test_supervisor_state-CADDY.txt | 2 +- ...CertificateCompatibility.test_file_list_run-CADDY.txt | 2 +- ...tificateCompatibility.test_supervisor_state-CADDY.txt | 2 +- ...patibilityOverrideMaster.test_file_list_run-CADDY.txt | 2 +- ...ibilityOverrideMaster.test_supervisor_state-CADDY.txt | 2 +- ...icateCompatibilityUpdate.test_file_list_run-CADDY.txt | 2 +- ...teCompatibilityUpdate.test_supervisor_state-CADDY.txt | 2 +- 26 files changed, 31 insertions(+), 26 deletions(-) diff --git a/software/caddy-frontend/test/test.py b/software/caddy-frontend/test/test.py index 984572777b..45de605b3e 100644 --- a/software/caddy-frontend/test/test.py +++ b/software/caddy-frontend/test/test.py @@ -559,9 +559,12 @@ class SlaveHttpFrontendTestCase(SlapOSInstanceTestCase): cls.waitForCaddy() except BaseException: cls.logger.exception("Error during setUpClass") - # "{}.{}.setUpClass".format(cls.__module__, cls.__name__) is already used by SlapOSInstanceTestCase.setUpClass - # so we use another name for snapshot, to make sure we don't store another snapshot in same directory. - cls._cleanup("{}.SlaveHttpFrontendTestCase.{}.setUpClass".format(cls.__module__, cls.__name__)) + # "{}.{}.setUpClass".format(cls.__module__, cls.__name__) is already used + # by SlapOSInstanceTestCase.setUpClass so we use another name for + # snapshot, to make sure we don't store another snapshot in same + # directory. + cls._cleanup("{}.SlaveHttpFrontendTestCase.{}.setUpClass".format( + cls.__module__, cls.__name__)) cls.setUp = lambda self: self.fail('Setup Class failed.') raise diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt index 08d574af72..d1277b1e56 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt @@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid -T-2/var/run/monitor-httpd.pid +T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt index 8bd47d92f2..12be88f193 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt @@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING 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 +T-2:trafficserver-reload EXITED \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt index 08d574af72..d1277b1e56 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt @@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid -T-2/var/run/monitor-httpd.pid +T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt index 8bd47d92f2..12be88f193 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt @@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING 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 +T-2:trafficserver-reload EXITED \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt index 08d574af72..d1277b1e56 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt @@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid -T-2/var/run/monitor-httpd.pid +T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt index 8bd47d92f2..12be88f193 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt @@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING 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 +T-2:trafficserver-reload EXITED \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt index 08d574af72..d1277b1e56 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt @@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid -T-2/var/run/monitor-httpd.pid +T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt index 8bd47d92f2..12be88f193 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt @@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING 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 +T-2:trafficserver-reload EXITED \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt index 6dcfcfeda7..d1277b1e56 100644 --- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt @@ -2,3 +2,4 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid +T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt index 6dcfcfeda7..d1277b1e56 100644 --- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt @@ -2,3 +2,4 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid +T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt index 08d574af72..d1277b1e56 100644 --- a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt @@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid -T-2/var/run/monitor-httpd.pid +T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt index 8bd47d92f2..12be88f193 100644 --- a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt @@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING 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 +T-2:trafficserver-reload EXITED \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt index 08d574af72..d1277b1e56 100644 --- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt @@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid -T-2/var/run/monitor-httpd.pid +T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt index 8bd47d92f2..12be88f193 100644 --- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt @@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING 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 +T-2:trafficserver-reload EXITED \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt index 08d574af72..d1277b1e56 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt @@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid -T-2/var/run/monitor-httpd.pid +T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_run-CADDY.txt index 08d574af72..d1277b1e56 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_run-CADDY.txt @@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid -T-2/var/run/monitor-httpd.pid +T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_supervisor_state-CADDY.txt index 8bd47d92f2..12be88f193 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_supervisor_state-CADDY.txt @@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING 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 +T-2:trafficserver-reload EXITED \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt index 08d574af72..d1277b1e56 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt @@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid -T-2/var/run/monitor-httpd.pid +T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt index 8bd47d92f2..12be88f193 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt @@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING 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 +T-2:trafficserver-reload EXITED \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_run-CADDY.txt index 08d574af72..d1277b1e56 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_run-CADDY.txt @@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid -T-2/var/run/monitor-httpd.pid +T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_supervisor_state-CADDY.txt index 8bd47d92f2..12be88f193 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_supervisor_state-CADDY.txt @@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING 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 +T-2:trafficserver-reload EXITED \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_run-CADDY.txt index 08d574af72..d1277b1e56 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_run-CADDY.txt @@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid -T-2/var/run/monitor-httpd.pid +T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_supervisor_state-CADDY.txt index 8bd47d92f2..12be88f193 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_supervisor_state-CADDY.txt @@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING 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 +T-2:trafficserver-reload EXITED \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_run-CADDY.txt index 08d574af72..d1277b1e56 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_run-CADDY.txt @@ -2,4 +2,4 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid -T-2/var/run/monitor-httpd.pid +T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_supervisor_state-CADDY.txt index 8bd47d92f2..12be88f193 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_supervisor_state-CADDY.txt @@ -30,4 +30,4 @@ T-2:kedifa-updater-{hash-generic}-on-watch RUNNING 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 +T-2:trafficserver-reload EXITED \ No newline at end of file -- 2.30.9 From eb2ee5a3f0db79839406222f4f0d09731ae7d570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= Date: Thu, 20 Feb 2020 17:06:03 +0100 Subject: [PATCH 2/5] caddy-frontend: Publish monitor-base-url in kedifa --- software/caddy-frontend/buildout.hash.cfg | 2 +- software/caddy-frontend/instance-kedifa.cfg.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg index b4858beff5..615c01ce09 100644 --- a/software/caddy-frontend/buildout.hash.cfg +++ b/software/caddy-frontend/buildout.hash.cfg @@ -118,4 +118,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8 [template-kedifa] filename = instance-kedifa.cfg.in -md5sum = d5efd74d80a1df3d5386758c9f13e190 +md5sum = 8c85dcf1e96a05b7272a6100fe8496a2 diff --git a/software/caddy-frontend/instance-kedifa.cfg.in b/software/caddy-frontend/instance-kedifa.cfg.in index a7c52f67b2..e520bc8655 100644 --- a/software/caddy-frontend/instance-kedifa.cfg.in +++ b/software/caddy-frontend/instance-kedifa.cfg.in @@ -288,4 +288,5 @@ master-key-upload-url = https://[${kedifa-config:ip}]:${kedifa-config:port}/${ma master-key-download-url = https://[${kedifa-config:ip}]:${kedifa-config:port}/${master-auth-random:passwd} csr_id-url = https://[${expose-csr_id-configuration:ip}]:${expose-csr_id-configuration:port}/csr_id.txt csr_id-certificate = ${get-csr_id-certificate:certificate} +monitor-base-url = ${monitor-instance-parameter:monitor-base-url} {%- endif -%} {# if slap_software_type in software_type #} -- 2.30.9 From 42c08cd42574031c10135c48971f94764599c2f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= Date: Thu, 20 Feb 2020 17:08:03 +0100 Subject: [PATCH 3/5] caddy-frontend: Switch monitor ports to internal use Instead of forcing to set monitor port in some cases, just generate them, so it's possible to correctly instantiate caddy-frontend on one partition scenario like in webrunner or tests. --- software/caddy-frontend/buildout.hash.cfg | 8 +-- .../instance-apache-frontend.cfg.in | 5 +- .../instance-apache-replicate.cfg.in | 15 +++-- .../caddy-frontend/instance-kedifa.cfg.in | 6 ++ software/caddy-frontend/instance.cfg.in | 1 - software/caddy-frontend/test/test.py | 55 +++---------------- ...tDefaultSlave.test_file_list_log-CADDY.txt | 1 + ...tDefaultSlave.test_file_list_run-CADDY.txt | 1 + ...faultSlave.test_supervisor_state-CADDY.txt | 2 +- ...lDisableHttp2.test_file_list_log-CADDY.txt | 1 + ...lDisableHttp2.test_file_list_run-CADDY.txt | 1 + ...sableHttp2.test_supervisor_state-CADDY.txt | 2 +- ...ultFalseSlave.test_file_list_log-CADDY.txt | 1 + ...ultFalseSlave.test_file_list_run-CADDY.txt | 1 + ...FalseSlave.test_supervisor_state-CADDY.txt | 2 +- ...lDisableHttp2.test_file_list_log-CADDY.txt | 1 + ...lDisableHttp2.test_file_list_run-CADDY.txt | 1 + ...sableHttp2.test_supervisor_state-CADDY.txt | 2 +- ...MasterRequest.test_file_list_log-CADDY.txt | 2 + ...MasterRequest.test_file_list_run-CADDY.txt | 1 + ...terRequest.test_supervisor_state-CADDY.txt | 4 +- ...RequestDomain.test_file_list_log-CADDY.txt | 2 + ...RequestDomain.test_file_list_run-CADDY.txt | 1 + ...uestDomain.test_supervisor_state-CADDY.txt | 4 +- ...stQuicEnabled.test_file_list_log-CADDY.txt | 1 + ...stQuicEnabled.test_file_list_run-CADDY.txt | 1 + ...uicEnabled.test_supervisor_state-CADDY.txt | 2 +- ...lDefaultSlave.test_file_list_log-CADDY.txt | 1 + ...lDefaultSlave.test_file_list_run-CADDY.txt | 1 + ...faultSlave.test_supervisor_state-CADDY.txt | 2 +- ...est.TestSlave.test_file_list_log-CADDY.txt | 1 + ...est.TestSlave.test_file_list_run-CADDY.txt | 1 + ....TestSlave.test_supervisor_state-CADDY.txt | 2 +- ...tSlaveCiphers.test_file_list_log-CADDY.txt | 1 + ...tSlaveCiphers.test_file_list_run-CADDY.txt | 1 + ...aveCiphers.test_supervisor_state-CADDY.txt | 2 +- ...lDisableHttp2.test_file_list_log-CADDY.txt | 1 + ...lDisableHttp2.test_file_list_run-CADDY.txt | 1 + ...sableHttp2.test_supervisor_state-CADDY.txt | 2 +- ...Compatibility.test_file_list_log-CADDY.txt | 1 + ...Compatibility.test_file_list_run-CADDY.txt | 1 + ...patibility.test_supervisor_state-CADDY.txt | 2 +- ...verrideMaster.test_file_list_log-CADDY.txt | 1 + ...verrideMaster.test_file_list_run-CADDY.txt | 1 + ...rideMaster.test_supervisor_state-CADDY.txt | 2 +- ...ibilityUpdate.test_file_list_log-CADDY.txt | 1 + ...ibilityUpdate.test_file_list_run-CADDY.txt | 1 + ...lityUpdate.test_supervisor_state-CADDY.txt | 2 +- 48 files changed, 76 insertions(+), 76 deletions(-) diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg index 615c01ce09..529d335bd0 100644 --- a/software/caddy-frontend/buildout.hash.cfg +++ b/software/caddy-frontend/buildout.hash.cfg @@ -14,7 +14,7 @@ # not need these here). [template] filename = instance.cfg.in -md5sum = 8f0cd544851aaf4c819c4858e056ce24 +md5sum = 816bc8179cf4195a35e07f22c36679fa [template-common] filename = instance-common.cfg.in @@ -22,11 +22,11 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b [template-apache-frontend] filename = instance-apache-frontend.cfg.in -md5sum = 378f6da53a02b2bfe7777a493fc95585 +md5sum = 7dbceb62d845b7951c3c9efa8c3d5bf6 [template-caddy-replicate] filename = instance-apache-replicate.cfg.in -md5sum = 95a4a388d0731f06c084efbdd8a56e66 +md5sum = 3ada9a41527c6d457798890422b67176 [template-slave-list] filename = templates/apache-custom-slave-list.cfg.in @@ -118,4 +118,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8 [template-kedifa] filename = instance-kedifa.cfg.in -md5sum = 8c85dcf1e96a05b7272a6100fe8496a2 +md5sum = e8d3d7dfe78682f8bcf4b308165d2971 diff --git a/software/caddy-frontend/instance-apache-frontend.cfg.in b/software/caddy-frontend/instance-apache-frontend.cfg.in index 7fa9252829..1a9f6fb665 100644 --- a/software/caddy-frontend/instance-apache-frontend.cfg.in +++ b/software/caddy-frontend/instance-apache-frontend.cfg.in @@ -682,10 +682,7 @@ config-port = ${caddy-configuration:ssl-cache-through-port} # Note: Workaround for monitor stack, which uses monitor-httpd-port parameter # directly, and in our case it can come from the network, thus resulting # with need to strip !py!'u' -{% set monitor_httpd_port = instance_parameter.get('configuration.monitor-httpd-port') %} -{% if monitor_httpd_port %} -monitor-httpd-port = {{ monitor_httpd_port | int }} -{% endif -%} +monitor-httpd-port = {{ instance_parameter['configuration.monitor-httpd-port'] | int }} [monitor-conf-parameters] private-path-list += diff --git a/software/caddy-frontend/instance-apache-replicate.cfg.in b/software/caddy-frontend/instance-apache-replicate.cfg.in index e7f958ebe6..a91d491ca6 100644 --- a/software/caddy-frontend/instance-apache-replicate.cfg.in +++ b/software/caddy-frontend/instance-apache-replicate.cfg.in @@ -5,6 +5,10 @@ {%- set TRUE_VALUES = ['y', 'yes', '1', 'true'] -%} {%- set GOOD_CIPHER_LIST = ['ECDHE-ECDSA-AES256-GCM-SHA384', 'ECDHE-RSA-AES256-GCM-SHA384', 'ECDHE-ECDSA-AES128-GCM-SHA256', 'ECDHE-RSA-AES128-GCM-SHA256', 'ECDHE-ECDSA-WITH-CHACHA20-POLY1305', 'ECDHE-RSA-WITH-CHACHA20-POLY1305', 'ECDHE-RSA-AES256-CBC-SHA', 'ECDHE-RSA-AES128-CBC-SHA', 'ECDHE-ECDSA-AES256-CBC-SHA', 'ECDHE-ECDSA-AES128-CBC-SHA', 'RSA-AES256-CBC-SHA', 'RSA-AES128-CBC-SHA', 'ECDHE-RSA-3DES-EDE-CBC-SHA', 'RSA-3DES-EDE-CBC-SHA'] %} {% set aikc_enabled = slapparameter_dict.get('automatic-internal-kedifa-caucase-csr', 'true').lower() in TRUE_VALUES %} +{# Ports 8401, 8402 and 8410+1..N are reserved for monitor ports on various partitions #} +{% set master_partition_monitor_monitor_httpd_port = 8401 %} +{% set kedifa_partition_monitor_httpd_port = 8402 %} +{% set frontend_monitor_httpd_base_port = 8410 %} [jinja2-template-base] recipe = slapos.recipe.template:jinja2 rendered = ${buildout:directory}/${:filename} @@ -59,6 +63,7 @@ context = {% do config_dict.__setitem__(key[config_key_length:], slapparameter_dict.pop(key)) %} {% endif %} {% endfor %} +{% do config_dict.__setitem__('monitor-httpd-port', frontend_monitor_httpd_base_port + i) %} {% do frontend_list.append(frontend_name) %} {% do frontend_section_list.append(request_section_title) %} {% do part_list.append(request_section_title) %} @@ -203,7 +208,7 @@ context = {% do authorized_slave_list.sort() %} [monitor-instance-parameter] -monitor-httpd-port = {{ slapparameter_dict.get('monitor-httpd-port', '8196') }} +monitor-httpd-port = {{ master_partition_monitor_monitor_httpd_port }} [replicate] <= slap-connection @@ -306,6 +311,7 @@ recipe = slapos.cookbook:requestoptional.serialised config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }} config-monitor-username = ${monitor-instance-parameter:username} config-monitor-password = ${monitor-htpasswd:passwd} +config-monitor-httpd-port = {{ kedifa_partition_monitor_httpd_port }} {% for key in ['kedifa_port', 'caucase_port'] -%} {%- if key in slapparameter_dict %} config-{{ key }} = {{ dumps(slapparameter_dict[key]) }} @@ -370,11 +376,10 @@ extra-context = section warning_slave_information warning-slave-information key slave_kedifa_information request-kedifa:connection-slave-kedifa-information -[monitor-conf-parameters] -monitor-url-list += - ${request-kedifa:connection-monitor-base-url} +[monitor-base-url-dict] +kedifa = ${request-kedifa:connection-monitor-base-url} {% for frontend in frontend_section_list %} -{{ ' ${' + frontend + ':connection-monitor-base-url}' }} +{{ frontend }} = {{ '${' + frontend + ':connection-monitor-base-url}' }} {% endfor %} {% if aikc_enabled %} diff --git a/software/caddy-frontend/instance-kedifa.cfg.in b/software/caddy-frontend/instance-kedifa.cfg.in index e520bc8655..0aa77fbe96 100644 --- a/software/caddy-frontend/instance-kedifa.cfg.in +++ b/software/caddy-frontend/instance-kedifa.cfg.in @@ -20,6 +20,12 @@ parts = expose-csr_id promise-expose-csr_id-ip-port +[monitor-instance-parameter] +# Note: Workaround for monitor stack, which uses monitor-httpd-port parameter +# directly, and in our case it can come from the network, thus resulting +# with need to strip !py!'u' +monitor-httpd-port = {{ instance_parameter['configuration.monitor-httpd-port'] | int }} + [caucased] hash-existing-files = ${buildout:directory}/software_release/buildout.cfg diff --git a/software/caddy-frontend/instance.cfg.in b/software/caddy-frontend/instance.cfg.in index cea2d60e98..1aee236db1 100644 --- a/software/caddy-frontend/instance.cfg.in +++ b/software/caddy-frontend/instance.cfg.in @@ -122,7 +122,6 @@ configuration.ciphers = configuration.request-timeout = 600 configuration.enable-quic = false configuration.mpm-graceful-shutdown-timeout = 5 -configuration.monitor-httpd-port = 8072 configuration.frontend-name = configuration.proxy-try-duration = 5 configuration.proxy-try-interval = 250 diff --git a/software/caddy-frontend/test/test.py b/software/caddy-frontend/test/test.py index 45de605b3e..6635507100 100644 --- a/software/caddy-frontend/test/test.py +++ b/software/caddy-frontend/test/test.py @@ -73,9 +73,6 @@ setUpModule, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass( # ports chosen to not collide with test systems HTTP_PORT = '11080' HTTPS_PORT = '11443' -MONITOR_HTTPD_PORT = '13000' -MONITOR_F1_HTTPD_PORT = '13001' -MONITOR_F2_HTTPD_PORT = '13002' CAUCASE_PORT = '15090' KEDIFA_PORT = '15080' @@ -947,7 +944,6 @@ class TestMasterRequestDomain(SlaveHttpFrontendTestCase, TestDataMixin): 'domain': 'example.com', 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, } @@ -967,7 +963,7 @@ class TestMasterRequestDomain(SlaveHttpFrontendTestCase, TestDataMixin): self.assertEqual( { - 'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address, + 'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address, 'domain': 'example.com', 'accepted-slave-amount': '1', 'rejected-slave-amount': '0', @@ -984,7 +980,6 @@ class TestMasterRequest(SlaveHttpFrontendTestCase, TestDataMixin): return { 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, } @@ -1003,7 +998,7 @@ class TestMasterRequest(SlaveHttpFrontendTestCase, TestDataMixin): self.assertRejectedSlavePromiseWithPop(parameter_dict) self.assertEqual( { - 'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address, + 'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address, 'domain': 'None', 'accepted-slave-amount': '1', 'rejected-slave-amount': '0', @@ -1083,8 +1078,6 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s { '_apache_custom_http_s-accepted _caddy_custom_http_s-accepted', 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, - '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT, 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, 'mpm-graceful-shutdown-timeout': 2, @@ -1447,7 +1440,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s { self.assertRejectedSlavePromiseWithPop(parameter_dict) expected_parameter_dict = { - 'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address, + 'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address, 'domain': 'example.com', 'accepted-slave-amount': '54', 'rejected-slave-amount': '0', @@ -4121,9 +4114,6 @@ class TestReplicateSlave(SlaveHttpFrontendTestCase, TestDataMixin): '-frontend-2-state': 'stopped', 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, - '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT, - '-frontend-config-2-monitor-httpd-port': MONITOR_F2_HTTPD_PORT, 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, } @@ -4192,9 +4182,6 @@ class TestReplicateSlaveOtherDestroyed(SlaveHttpFrontendTestCase): '-frontend-2-state': 'destroyed', 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, - '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT, - '-frontend-config-2-monitor-httpd-port': MONITOR_F2_HTTPD_PORT, 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, } @@ -4234,8 +4221,6 @@ class TestEnableHttp2ByDefaultFalseSlave(SlaveHttpFrontendTestCase, 'enable-http2-by-default': 'false', 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, - '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT, 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, } @@ -4328,8 +4313,6 @@ class TestEnableHttp2ByDefaultDefaultSlave(SlaveHttpFrontendTestCase, 'public-ipv4': cls._ipv4_address, 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, - '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT, 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, } @@ -4420,8 +4403,6 @@ class TestRe6stVerificationUrlDefaultSlave(SlaveHttpFrontendTestCase, return { 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, - '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT, 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, } @@ -4480,8 +4461,6 @@ class TestRe6stVerificationUrlSlave(SlaveHttpFrontendTestCase, return { 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, - '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT, 're6st-verification-url': 'some-re6st-verification-url', 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, @@ -4543,8 +4522,6 @@ class TestMalformedBackenUrlSlave(SlaveHttpFrontendTestCase, 'public-ipv4': cls._ipv4_address, 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, - '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT, 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, } @@ -4569,7 +4546,7 @@ class TestMalformedBackenUrlSlave(SlaveHttpFrontendTestCase, self.assertRejectedSlavePromiseWithPop(parameter_dict) expected_parameter_dict = { - 'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address, + 'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address, 'domain': 'example.com', 'accepted-slave-amount': '1', 'rejected-slave-amount': '2', @@ -4694,8 +4671,6 @@ class TestQuicEnabled(SlaveHttpFrontendTestCase, TestDataMixin): 'enable-quic': 'true', 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, - '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT, 'mpm-graceful-shutdown-timeout': 2, 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, @@ -4795,8 +4770,6 @@ class TestSlaveBadParameters(SlaveHttpFrontendTestCase, TestDataMixin): 'public-ipv4': cls._ipv4_address, 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, - '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT, 'mpm-graceful-shutdown-timeout': 2, 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, @@ -4855,7 +4828,7 @@ class TestSlaveBadParameters(SlaveHttpFrontendTestCase, TestDataMixin): self.assertRejectedSlavePromiseWithPop(parameter_dict) expected_parameter_dict = { - 'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address, + 'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address, 'domain': 'example.com', 'accepted-slave-amount': '8', 'rejected-slave-amount': '3', @@ -5206,8 +5179,6 @@ class TestDuplicateSiteKeyProtection(SlaveHttpFrontendTestCase, TestDataMixin): 'public-ipv4': cls._ipv4_address, 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, - '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT, 'mpm-graceful-shutdown-timeout': 2, 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, @@ -5238,7 +5209,7 @@ class TestDuplicateSiteKeyProtection(SlaveHttpFrontendTestCase, TestDataMixin): self.assertRejectedSlavePromiseWithPop(parameter_dict) expected_parameter_dict = { - 'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address, + 'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address, 'domain': 'example.com', 'accepted-slave-amount': '1', 'rejected-slave-amount': '3', @@ -5463,8 +5434,6 @@ class TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster( 'apache-key': cls.key_pem, 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, - '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT, 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, 'mpm-graceful-shutdown-timeout': 2, @@ -5604,8 +5573,6 @@ class TestSlaveSlapOSMasterCertificateCompatibility( 'apache-key': cls.key_pem, 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, - '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT, 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, 'mpm-graceful-shutdown-timeout': 2, @@ -5696,7 +5663,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility( self.assertRejectedSlavePromiseWithPop(parameter_dict) expected_parameter_dict = { - 'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address, + 'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address, 'domain': 'example.com', 'accepted-slave-amount': '12', 'rejected-slave-amount': '0', @@ -6355,8 +6322,6 @@ class TestSlaveSlapOSMasterCertificateCompatibilityUpdate( 'domain': 'example.com', 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, - '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT, 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, 'mpm-graceful-shutdown-timeout': 2, @@ -6389,7 +6354,7 @@ class TestSlaveSlapOSMasterCertificateCompatibilityUpdate( self.assertRejectedSlavePromiseWithPop(parameter_dict) expected_parameter_dict = { - 'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address, + 'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address, 'domain': 'example.com', 'accepted-slave-amount': '1', 'rejected-slave-amount': '0', @@ -6468,8 +6433,6 @@ class TestSlaveCiphers(SlaveHttpFrontendTestCase, TestDataMixin): '_apache_custom_http_s-accepted _caddy_custom_http_s-accepted', 'port': HTTPS_PORT, 'plain_http_port': HTTP_PORT, - 'monitor-httpd-port': MONITOR_HTTPD_PORT, - '-frontend-config-1-monitor-httpd-port': MONITOR_F1_HTTPD_PORT, 'kedifa_port': KEDIFA_PORT, 'caucase_port': CAUCASE_PORT, 'mpm-graceful-shutdown-timeout': 2, @@ -6498,7 +6461,7 @@ class TestSlaveCiphers(SlaveHttpFrontendTestCase, TestDataMixin): self.assertRejectedSlavePromiseWithPop(parameter_dict) expected_parameter_dict = { - 'monitor-base-url': 'https://[%s]:13000' % self._ipv6_address, + 'monitor-base-url': 'https://[%s]:8401' % self._ipv6_address, 'domain': 'example.com', 'accepted-slave-amount': '2', 'rejected-slave-amount': '0', diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-CADDY.txt index 9130ac82c8..a12b4f8349 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-CADDY.txt @@ -2,6 +2,7 @@ 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/_dummy-cached_access_log diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt index d1277b1e56..5056c32858 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt @@ -1,5 +1,6 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid +T-1/var/run/monitor-httpd.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt index 12be88f193..8c189f4fe9 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt @@ -13,7 +13,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 EXITED +T-1:monitor-httpd-{hash-generic}-on-watch RUNNING T-1:monitor-httpd-graceful EXITED T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt index 9130ac82c8..a12b4f8349 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt @@ -2,6 +2,7 @@ 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/_dummy-cached_access_log diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt index d1277b1e56..5056c32858 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt @@ -1,5 +1,6 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid +T-1/var/run/monitor-httpd.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt index 12be88f193..8c189f4fe9 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt @@ -13,7 +13,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 EXITED +T-1:monitor-httpd-{hash-generic}-on-watch RUNNING T-1:monitor-httpd-graceful EXITED T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-CADDY.txt index 9130ac82c8..a12b4f8349 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-CADDY.txt @@ -2,6 +2,7 @@ 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/_dummy-cached_access_log diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt index d1277b1e56..5056c32858 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt @@ -1,5 +1,6 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid +T-1/var/run/monitor-httpd.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt index 12be88f193..8c189f4fe9 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt @@ -13,7 +13,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 EXITED +T-1:monitor-httpd-{hash-generic}-on-watch RUNNING T-1:monitor-httpd-graceful EXITED T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt index 9130ac82c8..a12b4f8349 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt @@ -2,6 +2,7 @@ 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/_dummy-cached_access_log diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt index d1277b1e56..5056c32858 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt @@ -1,5 +1,6 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid +T-1/var/run/monitor-httpd.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt index 12be88f193..8c189f4fe9 100644 --- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt @@ -13,7 +13,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 EXITED +T-1:monitor-httpd-{hash-generic}-on-watch RUNNING T-1:monitor-httpd-graceful EXITED T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt index 58eea5e107..90bdbcdad5 100644 --- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt @@ -2,6 +2,7 @@ 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/_waitforcaddyslave_access_log @@ -9,5 +10,6 @@ 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/monitor-httpd-error.log T-2/var/log/trafficserver/manager.log T-2/var/log/trafficserver/traffic.out \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt index d1277b1e56..5056c32858 100644 --- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt @@ -1,5 +1,6 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid +T-1/var/run/monitor-httpd.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-CADDY.txt index 7fedcf6a37..8c189f4fe9 100644 --- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-CADDY.txt @@ -13,7 +13,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 EXITED +T-1:monitor-httpd-{hash-generic}-on-watch RUNNING T-1:monitor-httpd-graceful EXITED T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING @@ -27,7 +27,7 @@ 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-{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 diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt index 58eea5e107..90bdbcdad5 100644 --- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt @@ -2,6 +2,7 @@ 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/_waitforcaddyslave_access_log @@ -9,5 +10,6 @@ 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/monitor-httpd-error.log T-2/var/log/trafficserver/manager.log T-2/var/log/trafficserver/traffic.out \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt index d1277b1e56..5056c32858 100644 --- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt @@ -1,5 +1,6 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid +T-1/var/run/monitor-httpd.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt index 7fedcf6a37..8c189f4fe9 100644 --- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt @@ -13,7 +13,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 EXITED +T-1:monitor-httpd-{hash-generic}-on-watch RUNNING T-1:monitor-httpd-graceful EXITED T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING @@ -27,7 +27,7 @@ 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-{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 diff --git a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_log-CADDY.txt index b02482ee4c..6a68483bae 100644 --- a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_log-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_log-CADDY.txt @@ -2,6 +2,7 @@ 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/_url_access_log diff --git a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt index d1277b1e56..5056c32858 100644 --- a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt @@ -1,5 +1,6 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid +T-1/var/run/monitor-httpd.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt index 12be88f193..8c189f4fe9 100644 --- a/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt @@ -13,7 +13,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 EXITED +T-1:monitor-httpd-{hash-generic}-on-watch RUNNING T-1:monitor-httpd-graceful EXITED T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-CADDY.txt index af1ed209e3..9937038226 100644 --- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-CADDY.txt @@ -2,6 +2,7 @@ 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/_default_access_log diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt index d1277b1e56..5056c32858 100644 --- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt @@ -1,5 +1,6 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid +T-1/var/run/monitor-httpd.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt index 12be88f193..8c189f4fe9 100644 --- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt @@ -13,7 +13,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 EXITED +T-1:monitor-httpd-{hash-generic}-on-watch RUNNING T-1:monitor-httpd-graceful EXITED T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-CADDY.txt index 5d90ca227f..4760eed284 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-CADDY.txt @@ -2,6 +2,7 @@ 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 diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt index d1277b1e56..5056c32858 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt @@ -1,5 +1,6 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid +T-1/var/run/monitor-httpd.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlave.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlave.test_supervisor_state-CADDY.txt index 12be88f193..8c189f4fe9 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlave.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_supervisor_state-CADDY.txt @@ -13,7 +13,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 EXITED +T-1:monitor-httpd-{hash-generic}-on-watch RUNNING T-1:monitor-httpd-graceful EXITED T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_log-CADDY.txt index a0c7f3c9ef..e1a6ae0193 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_log-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_log-CADDY.txt @@ -2,6 +2,7 @@ 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/_default_ciphers_access_log diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_run-CADDY.txt index d1277b1e56..5056c32858 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_run-CADDY.txt @@ -1,5 +1,6 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid +T-1/var/run/monitor-httpd.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_supervisor_state-CADDY.txt index 12be88f193..8c189f4fe9 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_supervisor_state-CADDY.txt @@ -13,7 +13,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 EXITED +T-1:monitor-httpd-{hash-generic}-on-watch RUNNING T-1:monitor-httpd-graceful EXITED T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt index 5d90ca227f..4760eed284 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt @@ -2,6 +2,7 @@ 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 diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt index d1277b1e56..5056c32858 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt @@ -1,5 +1,6 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid +T-1/var/run/monitor-httpd.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt index 12be88f193..8c189f4fe9 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt @@ -13,7 +13,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 EXITED +T-1:monitor-httpd-{hash-generic}-on-watch RUNNING T-1:monitor-httpd-graceful EXITED T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_log-CADDY.txt index 385ee4df10..0880da3cc3 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_log-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_log-CADDY.txt @@ -2,6 +2,7 @@ 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/_ssl_from_master_access_log diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_run-CADDY.txt index d1277b1e56..5056c32858 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_run-CADDY.txt @@ -1,5 +1,6 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid +T-1/var/run/monitor-httpd.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_supervisor_state-CADDY.txt index 12be88f193..8c189f4fe9 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_supervisor_state-CADDY.txt @@ -13,7 +13,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 EXITED +T-1:monitor-httpd-{hash-generic}-on-watch RUNNING T-1:monitor-httpd-graceful EXITED T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_log-CADDY.txt index 5711a4603d..dce32d9c56 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_log-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_log-CADDY.txt @@ -2,6 +2,7 @@ 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/_ssl_from_master_kedifa_overrides_master_certificate_access_log diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_run-CADDY.txt index d1277b1e56..5056c32858 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_run-CADDY.txt @@ -1,5 +1,6 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid +T-1/var/run/monitor-httpd.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_supervisor_state-CADDY.txt index 12be88f193..8c189f4fe9 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_supervisor_state-CADDY.txt @@ -13,7 +13,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 EXITED +T-1:monitor-httpd-{hash-generic}-on-watch RUNNING T-1:monitor-httpd-graceful EXITED T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_log-CADDY.txt index 43768d8f83..e932449c0e 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_log-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_log-CADDY.txt @@ -2,6 +2,7 @@ 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/_ssl_from_master_access_log diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_run-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_run-CADDY.txt index d1277b1e56..5056c32858 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_run-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_run-CADDY.txt @@ -1,5 +1,6 @@ T-0/var/run/monitor-httpd.pid T-1/var/run/kedifa.pid +T-1/var/run/monitor-httpd.pid T-2/var/run/graceful_configuration_state_signature T-2/var/run/httpd.pid T-2/var/run/monitor-httpd.pid \ No newline at end of file diff --git a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_supervisor_state-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_supervisor_state-CADDY.txt index 12be88f193..8c189f4fe9 100644 --- a/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_supervisor_state-CADDY.txt +++ b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_supervisor_state-CADDY.txt @@ -13,7 +13,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 EXITED +T-1:monitor-httpd-{hash-generic}-on-watch RUNNING T-1:monitor-httpd-graceful EXITED T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING -- 2.30.9 From 3e6eca2e6b309dbb2c506fa28a70bf877d4bba16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= Date: Fri, 28 Feb 2020 09:56:51 +0100 Subject: [PATCH 4/5] caddy-frontend: Set same monitor password on all instances This allows to use monitor-setup-url correctly. --- software/caddy-frontend/buildout.hash.cfg | 4 ++-- software/caddy-frontend/instance-apache-frontend.cfg.in | 1 + software/caddy-frontend/instance-kedifa.cfg.in | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg index 529d335bd0..eb3472e45e 100644 --- a/software/caddy-frontend/buildout.hash.cfg +++ b/software/caddy-frontend/buildout.hash.cfg @@ -22,7 +22,7 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b [template-apache-frontend] filename = instance-apache-frontend.cfg.in -md5sum = 7dbceb62d845b7951c3c9efa8c3d5bf6 +md5sum = 48fb25df53d1465f4c95d1d9c39c40d2 [template-caddy-replicate] filename = instance-apache-replicate.cfg.in @@ -118,4 +118,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8 [template-kedifa] filename = instance-kedifa.cfg.in -md5sum = e8d3d7dfe78682f8bcf4b308165d2971 +md5sum = 7814a48cc05d25c8f2d7b527ef2485b5 diff --git a/software/caddy-frontend/instance-apache-frontend.cfg.in b/software/caddy-frontend/instance-apache-frontend.cfg.in index 1a9f6fb665..067c4941c0 100644 --- a/software/caddy-frontend/instance-apache-frontend.cfg.in +++ b/software/caddy-frontend/instance-apache-frontend.cfg.in @@ -683,6 +683,7 @@ config-port = ${caddy-configuration:ssl-cache-through-port} # directly, and in our case it can come from the network, thus resulting # with need to strip !py!'u' monitor-httpd-port = {{ instance_parameter['configuration.monitor-httpd-port'] | int }} +password = {{ instance_parameter['configuration.monitor-password'] | string }} [monitor-conf-parameters] private-path-list += diff --git a/software/caddy-frontend/instance-kedifa.cfg.in b/software/caddy-frontend/instance-kedifa.cfg.in index 0aa77fbe96..e35cc67b1a 100644 --- a/software/caddy-frontend/instance-kedifa.cfg.in +++ b/software/caddy-frontend/instance-kedifa.cfg.in @@ -25,6 +25,7 @@ parts = # directly, and in our case it can come from the network, thus resulting # with need to strip !py!'u' monitor-httpd-port = {{ instance_parameter['configuration.monitor-httpd-port'] | int }} +password = {{ instance_parameter['configuration.monitor-password'] | string }} [caucased] hash-existing-files = ${buildout:directory}/software_release/buildout.cfg -- 2.30.9 From 4b612d249d4835849a999c910fd3335541e66612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= Date: Tue, 4 Feb 2020 11:01:18 +0100 Subject: [PATCH 5/5] caddy-frontend/test: Test monitoring configuration Only TestSlave class and its subclasses are tested, as those are enough complex scenarios: master partition, kedifa partition and frontend partition. --- software/caddy-frontend/test/test.py | 97 ++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/software/caddy-frontend/test/test.py b/software/caddy-frontend/test/test.py index 6635507100..7fd465e6fe 100644 --- a/software/caddy-frontend/test/test.py +++ b/software/caddy-frontend/test/test.py @@ -47,6 +47,7 @@ import gzip import base64 import re from slapos.recipe.librecipe import generateHashFromFiles +import xml.etree.ElementTree as ET try: @@ -1367,6 +1368,102 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s { } } + monitor_setup_url_key = 'monitor-setup-url' + + def test_monitor_setup(self): + IP = self._ipv6_address + self.monitor_configuration_list = [ + { + 'htmlUrl': 'https://[%s]:8401/public/feed' % (IP,), + 'text': 'testing partition 0', + 'title': 'testing partition 0', + 'type': 'rss', + 'url': 'https://[%s]:8401/share/private/' % (IP,), + 'version': 'RSS', + 'xmlUrl': 'https://[%s]:8401/public/feed' % (IP,), + }, + { + 'htmlUrl': 'https://[%s]:8402/public/feed' % (IP,), + 'text': 'kedifa', + 'title': 'kedifa', + 'type': 'rss', + 'url': 'https://[%s]:8402/share/private/' % (IP,), + 'version': 'RSS', + 'xmlUrl': 'https://[%s]:8402/public/feed' % (IP,), + }, + { + 'htmlUrl': 'https://[%s]:8411/public/feed' % (IP,), + 'text': 'caddy-frontend-1', + 'title': 'caddy-frontend-1', + 'type': 'rss', + 'url': 'https://[%s]:8411/share/private/' % (IP,), + 'version': 'RSS', + 'xmlUrl': 'https://[%s]:8411/public/feed' % (IP,), + }, + ] + connection_parameter_dict = self\ + .computer_partition.getConnectionParameterDict() + self.assertTrue( + self.monitor_setup_url_key in connection_parameter_dict, + '%s not in %s' % (self.monitor_setup_url_key, connection_parameter_dict)) + monitor_setup_url_value = connection_parameter_dict[ + self.monitor_setup_url_key] + monitor_url_match = re.match(r'.*url=(.*)', monitor_setup_url_value) + self.assertNotEqual( + None, monitor_url_match, '%s not parsable' % (monitor_setup_url_value,)) + self.assertEqual(1, len(monitor_url_match.groups())) + monitor_url = monitor_url_match.groups()[0] + monitor_url_split = monitor_url.split('&') + self.assertEqual( + 3, len(monitor_url_split), '%s not splitabble' % (monitor_url,)) + self.monitor_url = monitor_url_split[0] + monitor_username = monitor_url_split[1].split('=') + self.assertEqual( + 2, len(monitor_username), '%s not splittable' % (monitor_username)) + monitor_password = monitor_url_split[2].split('=') + self.assertEqual( + 2, len(monitor_password), '%s not splittable' % (monitor_password)) + self.monitor_username = monitor_username[1] + self.monitor_password = monitor_password[1] + + opml_text = requests.get(self.monitor_url, verify=False).text + opml = ET.fromstring(opml_text) + + body = opml[1] + self.assertEqual('body', body.tag) + + outline_list = body[0].findall('outline') + + self.assertEqual( + self.monitor_configuration_list, + [q.attrib for q in outline_list] + ) + + expected_status_code_list = [] + got_status_code_list = [] + for monitor_configuration in self.monitor_configuration_list: + status_code = requests.get( + monitor_configuration['url'], + verify=False, + auth=(self.monitor_username, self.monitor_password) + ).status_code + expected_status_code_list.append( + { + 'url': monitor_configuration['url'], + 'status_code': 200 + } + ) + got_status_code_list.append( + { + 'url': monitor_configuration['url'], + 'status_code': status_code + } + ) + self.assertEqual( + expected_status_code_list, + got_status_code_list + ) + def getMasterPartitionPath(self): # partition w/o etc/trafficserver, but with buildout.cfg return [ -- 2.30.9