diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg index b4858beff585b55f87043d738e60cbeba00a0315..eb3472e45ea821057cdd30ff4d41385a6414bc78 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 = 48fb25df53d1465f4c95d1d9c39c40d2 [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 = d5efd74d80a1df3d5386758c9f13e190 +md5sum = 7814a48cc05d25c8f2d7b527ef2485b5 diff --git a/software/caddy-frontend/instance-apache-frontend.cfg.in b/software/caddy-frontend/instance-apache-frontend.cfg.in index 7fa92528296e0afd426ce798b383f0f1a27dcef9..067c4941c0e4f7b6fa83a987a28e0abc56a45877 100644 --- a/software/caddy-frontend/instance-apache-frontend.cfg.in +++ b/software/caddy-frontend/instance-apache-frontend.cfg.in @@ -682,10 +682,8 @@ 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 }} +password = {{ instance_parameter['configuration.monitor-password'] | string }} [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 e7f958ebe6a18ed7800bf90396ed17a809e57572..a91d491ca60c245060e0ca53c14ac63053034f5b 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 a7c52f67b2397acb126ddff52a382f8b4dcc8e99..e35cc67b1ae481d9c40b09a7615c4119f8d9a39f 100644 --- a/software/caddy-frontend/instance-kedifa.cfg.in +++ b/software/caddy-frontend/instance-kedifa.cfg.in @@ -20,6 +20,13 @@ 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 }} +password = {{ instance_parameter['configuration.monitor-password'] | string }} + [caucased] hash-existing-files = ${buildout:directory}/software_release/buildout.cfg @@ -288,4 +295,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 #} diff --git a/software/caddy-frontend/instance.cfg.in b/software/caddy-frontend/instance.cfg.in index cea2d60e984780aea940a442277a4c41659d23a9..1aee236db15caa00785947f26a24580be96d7281 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 984572777b9da5584437a568888b74e9c1a4bd69..7fd465e6feccfd6723869fcb7909ab5c53da8c50 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: @@ -73,9 +74,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' @@ -559,9 +557,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 @@ -944,7 +945,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, } @@ -964,7 +964,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', @@ -981,7 +981,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, } @@ -1000,7 +999,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', @@ -1080,8 +1079,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, @@ -1371,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 [ @@ -1444,7 +1537,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', @@ -4118,9 +4211,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, } @@ -4189,9 +4279,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, } @@ -4231,8 +4318,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, } @@ -4325,8 +4410,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, } @@ -4417,8 +4500,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, } @@ -4477,8 +4558,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, @@ -4540,8 +4619,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, } @@ -4566,7 +4643,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', @@ -4691,8 +4768,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, @@ -4792,8 +4867,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, @@ -4852,7 +4925,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', @@ -5203,8 +5276,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, @@ -5235,7 +5306,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', @@ -5460,8 +5531,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, @@ -5601,8 +5670,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, @@ -5693,7 +5760,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', @@ -6352,8 +6419,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, @@ -6386,7 +6451,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', @@ -6465,8 +6530,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, @@ -6495,7 +6558,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 9130ac82c8f640068cf6527f4c93a86dc65022dd..a12b4f83491e227ca93f8f6809f1f8a569fb07d3 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 08d574af727c5579fcdb7a94e3b122be4315486a..5056c32858237a00af0a49eeb1dcd60b233a9f94 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 +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 8bd47d92f206891db29f3c1d18c899b80d59fad8..8c189f4fe9fbfe3ae35b9b298f1c2dcabc03ea12 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 @@ -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_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt index 9130ac82c8f640068cf6527f4c93a86dc65022dd..a12b4f83491e227ca93f8f6809f1f8a569fb07d3 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 08d574af727c5579fcdb7a94e3b122be4315486a..5056c32858237a00af0a49eeb1dcd60b233a9f94 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 +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 8bd47d92f206891db29f3c1d18c899b80d59fad8..8c189f4fe9fbfe3ae35b9b298f1c2dcabc03ea12 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 @@ -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_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-CADDY.txt index 9130ac82c8f640068cf6527f4c93a86dc65022dd..a12b4f83491e227ca93f8f6809f1f8a569fb07d3 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 08d574af727c5579fcdb7a94e3b122be4315486a..5056c32858237a00af0a49eeb1dcd60b233a9f94 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 +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 8bd47d92f206891db29f3c1d18c899b80d59fad8..8c189f4fe9fbfe3ae35b9b298f1c2dcabc03ea12 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 @@ -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_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt index 9130ac82c8f640068cf6527f4c93a86dc65022dd..a12b4f83491e227ca93f8f6809f1f8a569fb07d3 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 08d574af727c5579fcdb7a94e3b122be4315486a..5056c32858237a00af0a49eeb1dcd60b233a9f94 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 +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 8bd47d92f206891db29f3c1d18c899b80d59fad8..8c189f4fe9fbfe3ae35b9b298f1c2dcabc03ea12 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 @@ -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_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt index 58eea5e107e245d25218786330209176df77e954..90bdbcdad55a7573d800f18344969436d4bc90bd 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 6dcfcfeda7f8c9b2d59973c5b116e17b69614bb7..5056c32858237a00af0a49eeb1dcd60b233a9f94 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,4 +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 7fedcf6a374bc0eb54de80f74ba62d756dbb65e7..8c189f4fe9fbfe3ae35b9b298f1c2dcabc03ea12 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 58eea5e107e245d25218786330209176df77e954..90bdbcdad55a7573d800f18344969436d4bc90bd 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 6dcfcfeda7f8c9b2d59973c5b116e17b69614bb7..5056c32858237a00af0a49eeb1dcd60b233a9f94 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,4 +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 7fedcf6a374bc0eb54de80f74ba62d756dbb65e7..8c189f4fe9fbfe3ae35b9b298f1c2dcabc03ea12 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 b02482ee4cee040ea8162dc362d31c30eebc846b..6a68483baecfdc434342ec25e659cf0afba381da 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 08d574af727c5579fcdb7a94e3b122be4315486a..5056c32858237a00af0a49eeb1dcd60b233a9f94 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 +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 8bd47d92f206891db29f3c1d18c899b80d59fad8..8c189f4fe9fbfe3ae35b9b298f1c2dcabc03ea12 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 @@ -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_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-CADDY.txt index af1ed209e3ac1248787da8179c443f52b830c11e..993703822634cf4618e94147d5f29d3eaa3babab 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 08d574af727c5579fcdb7a94e3b122be4315486a..5056c32858237a00af0a49eeb1dcd60b233a9f94 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 +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 8bd47d92f206891db29f3c1d18c899b80d59fad8..8c189f4fe9fbfe3ae35b9b298f1c2dcabc03ea12 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 @@ -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_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-CADDY.txt index 5d90ca227f622bb9586c246765d781d60e267122..4760eed2842a66b30744ba5b52b995f3807beadf 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 08d574af727c5579fcdb7a94e3b122be4315486a..5056c32858237a00af0a49eeb1dcd60b233a9f94 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 +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 12be88f19332b0bc62c2a450814ed7d5a09afd41..8c189f4fe9fbfe3ae35b9b298f1c2dcabc03ea12 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 a0c7f3c9ef3499c70a0511d20d0a558aae9f0d02..e1a6ae0193c77d7a90b9472eb282147c305908cb 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 08d574af727c5579fcdb7a94e3b122be4315486a..5056c32858237a00af0a49eeb1dcd60b233a9f94 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 +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 8bd47d92f206891db29f3c1d18c899b80d59fad8..8c189f4fe9fbfe3ae35b9b298f1c2dcabc03ea12 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 @@ -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_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt index 5d90ca227f622bb9586c246765d781d60e267122..4760eed2842a66b30744ba5b52b995f3807beadf 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 08d574af727c5579fcdb7a94e3b122be4315486a..5056c32858237a00af0a49eeb1dcd60b233a9f94 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 +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 8bd47d92f206891db29f3c1d18c899b80d59fad8..8c189f4fe9fbfe3ae35b9b298f1c2dcabc03ea12 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 @@ -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_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_log-CADDY.txt index 385ee4df105fce221712dd0b2abd137aca33164f..0880da3cc3e5d0853d78dcbe2ecaa5806270744c 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 08d574af727c5579fcdb7a94e3b122be4315486a..5056c32858237a00af0a49eeb1dcd60b233a9f94 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 +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 8bd47d92f206891db29f3c1d18c899b80d59fad8..8c189f4fe9fbfe3ae35b9b298f1c2dcabc03ea12 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 @@ -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_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_log-CADDY.txt index 5711a4603d39bd3ddda3baaf7898c317b9213ccd..dce32d9c5672905807b8d1e8f21adccd26dff2f4 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 08d574af727c5579fcdb7a94e3b122be4315486a..5056c32858237a00af0a49eeb1dcd60b233a9f94 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 +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 8bd47d92f206891db29f3c1d18c899b80d59fad8..8c189f4fe9fbfe3ae35b9b298f1c2dcabc03ea12 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 @@ -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_log-CADDY.txt b/software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_log-CADDY.txt index 43768d8f83f5dbc1154868fd6a557e83a109c2c6..e932449c0e1caa6907954c5108a0f38810ea9b6a 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 08d574af727c5579fcdb7a94e3b122be4315486a..5056c32858237a00af0a49eeb1dcd60b233a9f94 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 +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 8bd47d92f206891db29f3c1d18c899b80d59fad8..8c189f4fe9fbfe3ae35b9b298f1c2dcabc03ea12 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 @@ -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