caddy-frontend: Add zero-SSL related port listening promises

Kedifa partition was missing monitoring at all, so add it and monitor kedifa
and exposer ip and port.

Partition running caddy was missing monitoring for exposer, so add it.

software/caddy-frontend/buildout.hash.cfg

@@ -30,7 +30,7 @@ md5sum = d62aefe002ec13875924e4c219914795
 
 [template-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
-md5sum = def9d8430ac19a40f3b457830f1feefc
+md5sum = 398f149e5fb6faf2e012ac22381a4bab
 
 [template-slave-configuration]
 filename = templates/custom-virtualhost.conf.in
@@ -110,4 +110,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
 
 [template-kedifa]
 filename = instance-kedifa.cfg.in
-md5sum = 2eecc01a16f6ae156c3a7889eef42c34
+md5sum = bb68849a97b0305bef149d6aed33a804

software/caddy-frontend/instance-kedifa.cfg.in

@@ -7,13 +7,16 @@ extends =
   {{ parameter_dict['monitor_template'] }}
 
 parts =
+  monitor-base
   directory
   kedifa
+  promise-kedifa-listen-ip-port
   slave-kedifa-information
   caucased
   caucased-promise
   caucase-updater
   expose-csr_id
+  promise-expose-csr_id-ip-port
 
 [caucased]
 hash-files = ${buildout:directory}/software_release/buildout.cfg
@@ -50,6 +53,7 @@ run = ${:var}/run
 service = ${:etc}/service
 etc-run = ${:etc}/run
 promise = ${:etc}/promise
+plugin = ${:etc}/plugin
 
 # KeDiFa directories
 kedifa = ${:srv}/kedifa
@@ -151,6 +155,13 @@ template = inline:
 
 rendered = ${directory:caddy-csr_id}/Caddyfile
 
+[promise-expose-csr_id-ip-port]
+<= promise-plugin-base
+module = check_port_listening
+name = expose-csr_id-ip-port-listening.py
+config-hostname = ${expose-csr_id-configuration:ip}
+config-port = ${expose-csr_id-configuration:port}
+
 [expose-csr_id]
 depends = ${store-csr_id:command}
 recipe = slapos.cookbook:wrapper
@@ -184,6 +195,14 @@ context =
     section directory directory
     ${:extra-context}
 
+[promise-plugin-base]
+recipe = slapos.cookbook:promise.plugin
+eggs =
+  slapos.toolbox
+content =
+  from slapos.promise.plugin.${:module} import RunPromise
+output = ${directory:plugin}/${:name}
+
 [kedifa-config]
 ip = {{ instance_parameter['ipv6-random'] }}
 port = {{ instance_parameter['configuration.kedifa_port'] }}
@@ -200,6 +219,13 @@ recipe = slapos.cookbook:wrapper
 command-line = kill -SIGHUP `cat ${kedifa-config:pidfile}`
 wrapper-path = ${directory:etc-run}/kedifa-reloader
 
+[promise-kedifa-listen-ip-port]
+<= promise-plugin-base
+module = check_port_listening
+name = kedifa-ip-port-listening.py
+config-hostname = ${kedifa-config:ip}
+config-port = ${kedifa-config:port}
+
 [kedifa]
 recipe = slapos.cookbook:wrapper
 command-line = {{ parameter_dict['kedifa'] }}

software/caddy-frontend/templates/apache-custom-slave-list.cfg.in

@@ -486,6 +486,7 @@ parts +=
     tunnel-6to4-base-cached_port
     tunnel-6to4-base-ssl_cached_port
     expose-csr_id
+    promise-expose-csr_id-ip-port
 
 cache-access = {{ cache_access }}
 
@@ -538,6 +539,13 @@ template = inline:
 
 rendered = {{ directory_caddy_csr_id }}/Caddyfile
 
+[promise-expose-csr_id-ip-port]
+<= promise-plugin-base
+module = check_port_listening
+name = expose-csr_id-ip-port-listening.py
+config-hostname = ${expose-csr_id-configuration:ip}
+config-port = ${expose-csr_id-configuration:port}
+
 [expose-csr_id]
 depends = ${store-csr_id:command}
 recipe = slapos.cookbook:wrapper

software/caddy-frontend/test/test.py

@@ -1266,7 +1266,7 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
       os.path.join(
         self.instance_path, '*', 'etc', 'monitor.conf'
       ))
-    self.assertEqual(2, len(monitor_conf_list))
+    self.assertEqual(3, len(monitor_conf_list))
     expected = [(False, q) for q in monitor_conf_list]
     got = [('!py!' in open(q).read(), q) for q in monitor_conf_list]
     # check that no monitor.conf in generated configuratio has magic !py!

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

 T-0/var/run/monitor/monitor-bootstrap.pid
-T-1/var/run/kedifa.pid
\ No newline at end of file
+T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: OK
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -12,6 +18,7 @@ T-2/etc/plugin/caddy_ssl_cached.py: OK
 T-2/etc/plugin/check-_test-error-log-last-day.py: OK
 T-2/etc/plugin/check-_test-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: ERROR
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch EXITED
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch STOPPED
 T-2:6tunnel-11443-{hash}-on-watch STOPPED
 T-2:6tunnel-26011-{hash}-on-watch STOPPED

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: ERROR
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -12,6 +18,7 @@ T-2/etc/plugin/caddy_ssl_cached.py: ERROR
 T-2/etc/plugin/check-_site_1-error-log-last-day.py: OK
 T-2/etc/plugin/check-_site_1-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: ERROR
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -16,6 +22,7 @@ T-2/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
 T-2/etc/plugin/check-_enable-http2-true-error-log-last-day.py: OK
 T-2/etc/plugin/check-_enable-http2-true-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: ERROR
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -16,6 +22,7 @@ T-2/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
 T-2/etc/plugin/check-_enable-http2-true-error-log-last-day.py: OK
 T-2/etc/plugin/check-_enable-http2-true-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: ERROR
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -16,6 +22,7 @@ T-2/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
 T-2/etc/plugin/check-_enable-http2-true-error-log-last-day.py: OK
 T-2/etc/plugin/check-_enable-http2-true-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: ERROR
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -16,6 +22,7 @@ T-2/etc/plugin/check-_enable-http2-false-error-log-last-hour.py: OK
 T-2/etc/plugin/check-_enable-http2-true-error-log-last-day.py: OK
 T-2/etc/plugin/check-_enable-http2-true-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: ERROR
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -12,6 +18,7 @@ T-2/etc/plugin/caddy_ssl_cached.py: ERROR
 T-2/etc/plugin/check-_empty-error-log-last-day.py: OK
 T-2/etc/plugin/check-_empty-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: ERROR
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -10,6 +16,7 @@ T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: ERROR
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: ERROR
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -10,6 +16,7 @@ T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
 T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
 T-2/etc/plugin/caddy_ssl_cached.py: ERROR
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: ERROR
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -12,6 +18,7 @@ T-2/etc/plugin/caddy_ssl_cached.py: ERROR
 T-2/etc/plugin/check-_url-error-log-last-day.py: OK
 T-2/etc/plugin/check-_url-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: ERROR
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -12,6 +18,7 @@ T-2/etc/plugin/caddy_ssl_cached.py: ERROR
 T-2/etc/plugin/check-_default-error-log-last-day.py: OK
 T-2/etc/plugin/check-_default-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: ERROR
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -12,6 +18,7 @@ T-2/etc/plugin/caddy_ssl_cached.py: ERROR
 T-2/etc/plugin/check-_default-error-log-last-day.py: OK
 T-2/etc/plugin/check-_default-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: ERROR
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -12,6 +18,7 @@ T-2/etc/plugin/caddy_ssl_cached.py: ERROR
 T-2/etc/plugin/check-_replicate-error-log-last-day.py: OK
 T-2/etc/plugin/check-_replicate-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
@@ -27,6 +34,7 @@ T-3/etc/plugin/caddy_ssl_cached.py: OK
 T-3/etc/plugin/check-_replicate-error-log-last-day.py: OK
 T-3/etc/plugin/check-_replicate-error-log-last-hour.py: OK
 T-3/etc/plugin/check-free-disk-space.py: OK
+T-3/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-3/etc/plugin/frontend-caddy-configuration-promise.py: ERROR
 T-3/etc/plugin/monitor-bootstrap-status.py: OK
 T-3/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: OK
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -109,6 +115,7 @@ T-2/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-hour.p
 T-2/etc/plugin/check-_url_https-url-error-log-last-day.py: OK
 T-2/etc/plugin/check-_url_https-url-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: ERROR
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -29,6 +35,7 @@ T-2/etc/plugin/check-_virtualhostroot-http-port-unsafe-error-log-last-hour.py: O
 T-2/etc/plugin/check-_virtualhostroot-https-port-unsafe-error-log-last-day.py: OK
 T-2/etc/plugin/check-_virtualhostroot-https-port-unsafe-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: OK
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -109,6 +115,7 @@ T-2/etc/plugin/check-_type-zope-virtualhostroot-https-port-error-log-last-hour.p
 T-2/etc/plugin/check-_url_https-url-error-log-last-day.py: OK
 T-2/etc/plugin/check-_url_https-url-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: ERROR
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -34,6 +40,7 @@ T-2/etc/plugin/check-_type-notebook-ssl_from_slave-error-log-last-hour.py: OK
 T-2/etc/plugin/check-_type-notebook-ssl_from_slave_kedifa_overrides-error-log-last-day.py: OK
 T-2/etc/plugin/check-_type-notebook-ssl_from_slave_kedifa_overrides-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: ERROR
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -12,6 +18,7 @@ T-2/etc/plugin/caddy_ssl_cached.py: ERROR
 T-2/etc/plugin/check-_ssl_from_master_kedifa_overrides_master_certificate-error-log-last-day.py: OK
 T-2/etc/plugin/check-_ssl_from_master_kedifa_overrides_master_certificate-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING

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

 T-0/var/run/monitor-httpd.pid
 T-0/var/run/monitor/monitor-bootstrap.pid
 T-1/var/run/kedifa.pid
+T-1/var/run/monitor/monitor-bootstrap.pid
 T-2/var/run/caddy_graceful_signature
 T-2/var/run/caddy_validate_signature
 T-2/var/run/caddy_validate_signature.status

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

@@ -2,6 +2,12 @@ T-0/etc/plugin/buildout-T-0-status.py: OK
 T-0/etc/plugin/check-free-disk-space.py: OK
 T-0/etc/plugin/monitor-bootstrap-status.py: OK
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
+T-1/etc/plugin/buildout-T-1-status.py: OK
+T-1/etc/plugin/check-free-disk-space.py: OK
+T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
+T-1/etc/plugin/kedifa-ip-port-listening.py: OK
+T-1/etc/plugin/monitor-bootstrap-status.py: OK
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
 T-2/etc/plugin/buildout-T-2-status.py: OK
 T-2/etc/plugin/caddy_cached.py: ERROR
 T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
@@ -12,6 +18,7 @@ T-2/etc/plugin/caddy_ssl_cached.py: ERROR
 T-2/etc/plugin/check-_ssl_from_master-error-log-last-day.py: OK
 T-2/etc/plugin/check-_ssl_from_master-error-log-last-hour.py: OK
 T-2/etc/plugin/check-free-disk-space.py: OK
+T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
 T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
 T-2/etc/plugin/monitor-bootstrap-status.py: OK
 T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK

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

@@ -3,11 +3,16 @@ T-0:certificate_authority-{hash}-on-watch RUNNING
 T-0:crond-{hash}-on-watch RUNNING
 T-0:monitor-httpd-{hash}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash}-on-watch RUNNING
+T-1:certificate_authority-{hash}-on-watch RUNNING
+T-1:crond-{hash}-on-watch RUNNING
 T-1:expose-csr_id-{hash}-on-watch RUNNING
 T-1:kedifa-{hash}-on-watch RUNNING
 T-1:kedifa-reloader EXITED
+T-1:monitor-httpd-{hash}-on-watch EXITED
+T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash}-on-watch RUNNING
 T-2:6tunnel-11443-{hash}-on-watch RUNNING
 T-2:6tunnel-26011-{hash}-on-watch RUNNING