caddy-frontend: Drop apache support in tests

cd9a6327 · Łukasz Nowak · Łukasz Nowak · 1ab2b30d · cd9a6327 · cd9a6327
Commit cd9a6327 authored Sep 13, 2018 by Łukasz Nowak Committed by Łukasz Nowak Sep 14, 2018
41 changed files
--- a/software/caddy-frontend/TODO.rst
+++ b/software/caddy-frontend/TODO.rst
 Generally things to be done with ``caddy-frontend``:
- * tests: drop APACHE switches, as it is not taken care anymore
 * tests: add assertion with results of promises in etc/promise for each partition
 * check the whole frontend slave snippet with ``caddy -validate`` during buildout run, and reject if does not pass validation
 * ``apache-ca-certificate`` shall be merged with ``apache-certificate``

--- a/software/caddy-frontend/test/test.py
+++ b/software/caddy-frontend/test/test.py
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-APACHE.txt
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/frontend-apache-access.log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/frontend-apache-error.log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/httpd/_enable-http2-default_access_log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/httpd/_enable-http2-default_error_log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/httpd/_enable-http2-false_access_log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/httpd/_enable-http2-false_error_log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/httpd/_enable-http2-true_access_log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/httpd/_enable-http2-true_error_log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/monitor-httpd-error.log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/nginx-access.log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/nginx-error.log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/trafficserver/manager.log
-TestEnableHttp2ByDefaultDefaultSlave-1/var/log/trafficserver/traffic.out
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-APACHE.txt
-TestEnableHttp2ByDefaultDefaultSlave-0/var/run/monitor/monitor-bootstrap.pid
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/apache_configuration.signature
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/httpd.pid
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/monitor-httpd.pid
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/monitor/monitor-bootstrap.pid
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/napache_configuration.signature
-TestEnableHttp2ByDefaultDefaultSlave-1/var/run/nginx.pid
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_monitor_promise_list-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_monitor_promise_list-APACHE.txt
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-day
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-hour
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_list-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_promise_list-APACHE.txt
-TestEnableHttp2ByDefaultDefaultSlave-0/etc/promise/check-free-disk-space
-TestEnableHttp2ByDefaultDefaultSlave-0/etc/promise/monitor-http-frontend
-TestEnableHttp2ByDefaultDefaultSlave-0/etc/promise/monitor-httpd-listening-on-tcp
-TestEnableHttp2ByDefaultDefaultSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/apache-frontend-is-running-actual-software-release
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/apache-mpm-watchdog
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/apache_cached
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/apache_frontend_ipv4_http
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/apache_frontend_ipv4_https
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/apache_frontend_ipv6_http
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/apache_frontend_ipv6_https
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/apache_ssl_cached
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/check-free-disk-space
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/frontend-apache-configuration-promise
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/monitor-http-frontend
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/monitor-httpd-listening-on-tcp
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/nginx-configuration-promise
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/nginx_frontend_ipv4_http
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/nginx_frontend_ipv4_https
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/nginx_frontend_ipv6_http
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/nginx_frontend_ipv6_https
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/re6st-connectivity
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/trafficserver-cache-availability
-TestEnableHttp2ByDefaultDefaultSlave-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-APACHE.txt
-TestEnableHttp2ByDefaultDefaultSlave-0:bootstrap-monitor EXITED
-TestEnableHttp2ByDefaultDefaultSlave-0:certificate_authority-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-0:crond RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-0:monitor-httpd-graceful EXITED
-TestEnableHttp2ByDefaultDefaultSlave-0:monitor-httpd-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:bootstrap-monitor EXITED
-TestEnableHttp2ByDefaultDefaultSlave-1:certificate_authority-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:crond-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:frontend-apache-safe-graceful EXITED
-TestEnableHttp2ByDefaultDefaultSlave-1:frontend-nginx-safe-graceful EXITED
-TestEnableHttp2ByDefaultDefaultSlave-1:frontend_apache-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:frontend_nginx-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:monitor-httpd-graceful EXITED
-TestEnableHttp2ByDefaultDefaultSlave-1:monitor-httpd-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:trafficserver-on-watch RUNNING
-TestEnableHttp2ByDefaultDefaultSlave-1:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-APACHE.txt
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/frontend-apache-access.log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/frontend-apache-error.log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/httpd/_enable-http2-default_access_log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/httpd/_enable-http2-default_error_log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/httpd/_enable-http2-false_access_log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/httpd/_enable-http2-false_error_log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/httpd/_enable-http2-true_access_log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/httpd/_enable-http2-true_error_log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/monitor-httpd-error.log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/nginx-access.log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/nginx-error.log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/trafficserver/manager.log
-TestEnableHttp2ByDefaultFalseSlave-1/var/log/trafficserver/traffic.out
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-APACHE.txt
-TestEnableHttp2ByDefaultFalseSlave-0/var/run/monitor/monitor-bootstrap.pid
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/apache_configuration.signature
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/httpd.pid
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/monitor-httpd.pid
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/monitor/monitor-bootstrap.pid
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/napache_configuration.signature
-TestEnableHttp2ByDefaultFalseSlave-1/var/run/nginx.pid
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_monitor_promise_list-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_monitor_promise_list-APACHE.txt
-TestEnableHttp2ByDefaultFalseSlave-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
-TestEnableHttp2ByDefaultFalseSlave-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
-TestEnableHttp2ByDefaultFalseSlave-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
-TestEnableHttp2ByDefaultFalseSlave-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
-TestEnableHttp2ByDefaultFalseSlave-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-day
-TestEnableHttp2ByDefaultFalseSlave-1/etc/monitor-promise/check-_enable-http2-true-error-log-last-hour
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_list-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_promise_list-APACHE.txt
-TestEnableHttp2ByDefaultFalseSlave-0/etc/promise/check-free-disk-space
-TestEnableHttp2ByDefaultFalseSlave-0/etc/promise/monitor-http-frontend
-TestEnableHttp2ByDefaultFalseSlave-0/etc/promise/monitor-httpd-listening-on-tcp
-TestEnableHttp2ByDefaultFalseSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/apache-frontend-is-running-actual-software-release
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/apache-mpm-watchdog
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/apache_cached
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/apache_frontend_ipv4_http
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/apache_frontend_ipv4_https
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/apache_frontend_ipv6_http
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/apache_frontend_ipv6_https
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/apache_ssl_cached
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/check-free-disk-space
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/frontend-apache-configuration-promise
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/monitor-http-frontend
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/monitor-httpd-listening-on-tcp
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/nginx-configuration-promise
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/nginx_frontend_ipv4_http
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/nginx_frontend_ipv4_https
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/nginx_frontend_ipv6_http
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/nginx_frontend_ipv6_https
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/re6st-connectivity
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/trafficserver-cache-availability
-TestEnableHttp2ByDefaultFalseSlave-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-APACHE.txt
-TestEnableHttp2ByDefaultFalseSlave-0:bootstrap-monitor EXITED
-TestEnableHttp2ByDefaultFalseSlave-0:certificate_authority-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-0:crond RUNNING
-TestEnableHttp2ByDefaultFalseSlave-0:monitor-httpd-graceful EXITED
-TestEnableHttp2ByDefaultFalseSlave-0:monitor-httpd-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:bootstrap-monitor EXITED
-TestEnableHttp2ByDefaultFalseSlave-1:certificate_authority-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:crond-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:frontend-apache-safe-graceful EXITED
-TestEnableHttp2ByDefaultFalseSlave-1:frontend-nginx-safe-graceful EXITED
-TestEnableHttp2ByDefaultFalseSlave-1:frontend_apache-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:frontend_nginx-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:monitor-httpd-graceful EXITED
-TestEnableHttp2ByDefaultFalseSlave-1:monitor-httpd-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:trafficserver-on-watch RUNNING
-TestEnableHttp2ByDefaultFalseSlave-1:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-APACHE.txt
-TestMasterRequest-1/var/log/frontend-apache-access.log
-TestMasterRequest-1/var/log/frontend-apache-error.log
-TestMasterRequest-1/var/log/monitor-httpd-error.log
-TestMasterRequest-1/var/log/nginx-access.log
-TestMasterRequest-1/var/log/nginx-error.log
-TestMasterRequest-1/var/log/trafficserver/manager.log
-TestMasterRequest-1/var/log/trafficserver/traffic.out
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-APACHE.txt
-TestMasterRequest-0/var/run/monitor/monitor-bootstrap.pid
-TestMasterRequest-1/var/run/apache_configuration.signature
-TestMasterRequest-1/var/run/httpd.pid
-TestMasterRequest-1/var/run/monitor-httpd.pid
-TestMasterRequest-1/var/run/monitor/monitor-bootstrap.pid
-TestMasterRequest-1/var/run/napache_configuration.signature
-TestMasterRequest-1/var/run/nginx.pid
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_list-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_list-APACHE.txt
-TestMasterRequest-0/etc/promise/check-free-disk-space
-TestMasterRequest-0/etc/promise/monitor-http-frontend
-TestMasterRequest-0/etc/promise/monitor-httpd-listening-on-tcp
-TestMasterRequest-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestMasterRequest-1/etc/promise/apache-frontend-is-running-actual-software-release
-TestMasterRequest-1/etc/promise/apache-mpm-watchdog
-TestMasterRequest-1/etc/promise/apache_cached
-TestMasterRequest-1/etc/promise/apache_frontend_ipv4_http
-TestMasterRequest-1/etc/promise/apache_frontend_ipv4_https
-TestMasterRequest-1/etc/promise/apache_frontend_ipv6_http
-TestMasterRequest-1/etc/promise/apache_frontend_ipv6_https
-TestMasterRequest-1/etc/promise/apache_ssl_cached
-TestMasterRequest-1/etc/promise/check-free-disk-space
-TestMasterRequest-1/etc/promise/frontend-apache-configuration-promise
-TestMasterRequest-1/etc/promise/monitor-http-frontend
-TestMasterRequest-1/etc/promise/monitor-httpd-listening-on-tcp
-TestMasterRequest-1/etc/promise/nginx-configuration-promise
-TestMasterRequest-1/etc/promise/nginx_frontend_ipv4_http
-TestMasterRequest-1/etc/promise/nginx_frontend_ipv4_https
-TestMasterRequest-1/etc/promise/nginx_frontend_ipv6_http
-TestMasterRequest-1/etc/promise/nginx_frontend_ipv6_https
-TestMasterRequest-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestMasterRequest-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestMasterRequest-1/etc/promise/re6st-connectivity
-TestMasterRequest-1/etc/promise/trafficserver-cache-availability
-TestMasterRequest-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-APACHE.txt
-TestMasterRequest-0:bootstrap-monitor EXITED
-TestMasterRequest-0:certificate_authority-on-watch RUNNING
-TestMasterRequest-0:crond RUNNING
-TestMasterRequest-0:monitor-httpd-graceful EXITED
-TestMasterRequest-0:monitor-httpd-on-watch RUNNING
-TestMasterRequest-1:bootstrap-monitor EXITED
-TestMasterRequest-1:certificate_authority-on-watch RUNNING
-TestMasterRequest-1:crond-on-watch RUNNING
-TestMasterRequest-1:frontend-apache-safe-graceful EXITED
-TestMasterRequest-1:frontend-nginx-safe-graceful EXITED
-TestMasterRequest-1:frontend_apache-on-watch RUNNING
-TestMasterRequest-1:frontend_nginx-on-watch RUNNING
-TestMasterRequest-1:monitor-httpd-graceful EXITED
-TestMasterRequest-1:monitor-httpd-on-watch RUNNING
-TestMasterRequest-1:trafficserver-on-watch RUNNING
-TestMasterRequest-1:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-APACHE.txt
-TestMasterRequestDomain-1/var/log/frontend-apache-access.log
-TestMasterRequestDomain-1/var/log/frontend-apache-error.log
-TestMasterRequestDomain-1/var/log/monitor-httpd-error.log
-TestMasterRequestDomain-1/var/log/nginx-access.log
-TestMasterRequestDomain-1/var/log/nginx-error.log
-TestMasterRequestDomain-1/var/log/trafficserver/manager.log
-TestMasterRequestDomain-1/var/log/trafficserver/traffic.out
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-APACHE.txt
-TestMasterRequestDomain-0/var/run/monitor/monitor-bootstrap.pid
-TestMasterRequestDomain-1/var/run/apache_configuration.signature
-TestMasterRequestDomain-1/var/run/httpd.pid
-TestMasterRequestDomain-1/var/run/monitor-httpd.pid
-TestMasterRequestDomain-1/var/run/monitor/monitor-bootstrap.pid
-TestMasterRequestDomain-1/var/run/napache_configuration.signature
-TestMasterRequestDomain-1/var/run/nginx.pid
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_list-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_list-APACHE.txt
-TestMasterRequestDomain-0/etc/promise/check-free-disk-space
-TestMasterRequestDomain-0/etc/promise/monitor-http-frontend
-TestMasterRequestDomain-0/etc/promise/monitor-httpd-listening-on-tcp
-TestMasterRequestDomain-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestMasterRequestDomain-1/etc/promise/apache-frontend-is-running-actual-software-release
-TestMasterRequestDomain-1/etc/promise/apache-mpm-watchdog
-TestMasterRequestDomain-1/etc/promise/apache_cached
-TestMasterRequestDomain-1/etc/promise/apache_frontend_ipv4_http
-TestMasterRequestDomain-1/etc/promise/apache_frontend_ipv4_https
-TestMasterRequestDomain-1/etc/promise/apache_frontend_ipv6_http
-TestMasterRequestDomain-1/etc/promise/apache_frontend_ipv6_https
-TestMasterRequestDomain-1/etc/promise/apache_ssl_cached
-TestMasterRequestDomain-1/etc/promise/check-free-disk-space
-TestMasterRequestDomain-1/etc/promise/frontend-apache-configuration-promise
-TestMasterRequestDomain-1/etc/promise/monitor-http-frontend
-TestMasterRequestDomain-1/etc/promise/monitor-httpd-listening-on-tcp
-TestMasterRequestDomain-1/etc/promise/nginx-configuration-promise
-TestMasterRequestDomain-1/etc/promise/nginx_frontend_ipv4_http
-TestMasterRequestDomain-1/etc/promise/nginx_frontend_ipv4_https
-TestMasterRequestDomain-1/etc/promise/nginx_frontend_ipv6_http
-TestMasterRequestDomain-1/etc/promise/nginx_frontend_ipv6_https
-TestMasterRequestDomain-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestMasterRequestDomain-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestMasterRequestDomain-1/etc/promise/re6st-connectivity
-TestMasterRequestDomain-1/etc/promise/trafficserver-cache-availability
-TestMasterRequestDomain-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-APACHE.txt
-TestMasterRequestDomain-0:bootstrap-monitor EXITED
-TestMasterRequestDomain-0:certificate_authority-on-watch RUNNING
-TestMasterRequestDomain-0:crond RUNNING
-TestMasterRequestDomain-0:monitor-httpd-graceful EXITED
-TestMasterRequestDomain-0:monitor-httpd-on-watch RUNNING
-TestMasterRequestDomain-1:bootstrap-monitor EXITED
-TestMasterRequestDomain-1:certificate_authority-on-watch RUNNING
-TestMasterRequestDomain-1:crond-on-watch RUNNING
-TestMasterRequestDomain-1:frontend-apache-safe-graceful EXITED
-TestMasterRequestDomain-1:frontend-nginx-safe-graceful EXITED
-TestMasterRequestDomain-1:frontend_apache-on-watch RUNNING
-TestMasterRequestDomain-1:frontend_nginx-on-watch RUNNING
-TestMasterRequestDomain-1:monitor-httpd-graceful EXITED
-TestMasterRequestDomain-1:monitor-httpd-on-watch RUNNING
-TestMasterRequestDomain-1:trafficserver-on-watch RUNNING
-TestMasterRequestDomain-1:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-APACHE.txt
-TestRe6stVerificationUrlDefaultSlave-1/var/log/frontend-apache-access.log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/frontend-apache-error.log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/httpd/_default_access_log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/httpd/_default_error_log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/monitor-httpd-error.log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/nginx-access.log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/nginx-error.log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/trafficserver/manager.log
-TestRe6stVerificationUrlDefaultSlave-1/var/log/trafficserver/traffic.out
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-APACHE.txt
-TestRe6stVerificationUrlDefaultSlave-0/var/run/monitor/monitor-bootstrap.pid
-TestRe6stVerificationUrlDefaultSlave-1/var/run/apache_configuration.signature
-TestRe6stVerificationUrlDefaultSlave-1/var/run/httpd.pid
-TestRe6stVerificationUrlDefaultSlave-1/var/run/monitor-httpd.pid
-TestRe6stVerificationUrlDefaultSlave-1/var/run/monitor/monitor-bootstrap.pid
-TestRe6stVerificationUrlDefaultSlave-1/var/run/napache_configuration.signature
-TestRe6stVerificationUrlDefaultSlave-1/var/run/nginx.pid
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_monitor_promise_list-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_monitor_promise_list-APACHE.txt
-TestRe6stVerificationUrlDefaultSlave-1/etc/monitor-promise/check-_default-error-log-last-day
-TestRe6stVerificationUrlDefaultSlave-1/etc/monitor-promise/check-_default-error-log-last-hour
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_list-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_promise_list-APACHE.txt
-TestRe6stVerificationUrlDefaultSlave-0/etc/promise/check-free-disk-space
-TestRe6stVerificationUrlDefaultSlave-0/etc/promise/monitor-http-frontend
-TestRe6stVerificationUrlDefaultSlave-0/etc/promise/monitor-httpd-listening-on-tcp
-TestRe6stVerificationUrlDefaultSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/apache-frontend-is-running-actual-software-release
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/apache-mpm-watchdog
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/apache_cached
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/apache_frontend_ipv4_http
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/apache_frontend_ipv4_https
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/apache_frontend_ipv6_http
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/apache_frontend_ipv6_https
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/apache_ssl_cached
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/check-free-disk-space
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/frontend-apache-configuration-promise
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/monitor-http-frontend
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/monitor-httpd-listening-on-tcp
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/nginx-configuration-promise
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/nginx_frontend_ipv4_http
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/nginx_frontend_ipv4_https
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/nginx_frontend_ipv6_http
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/nginx_frontend_ipv6_https
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/re6st-connectivity
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/trafficserver-cache-availability
-TestRe6stVerificationUrlDefaultSlave-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-APACHE.txt
-TestRe6stVerificationUrlDefaultSlave-0:bootstrap-monitor EXITED
-TestRe6stVerificationUrlDefaultSlave-0:certificate_authority-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-0:crond RUNNING
-TestRe6stVerificationUrlDefaultSlave-0:monitor-httpd-graceful EXITED
-TestRe6stVerificationUrlDefaultSlave-0:monitor-httpd-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:bootstrap-monitor EXITED
-TestRe6stVerificationUrlDefaultSlave-1:certificate_authority-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:crond-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:frontend-apache-safe-graceful EXITED
-TestRe6stVerificationUrlDefaultSlave-1:frontend-nginx-safe-graceful EXITED
-TestRe6stVerificationUrlDefaultSlave-1:frontend_apache-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:frontend_nginx-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:monitor-httpd-graceful EXITED
-TestRe6stVerificationUrlDefaultSlave-1:monitor-httpd-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:trafficserver-on-watch RUNNING
-TestRe6stVerificationUrlDefaultSlave-1:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_log-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_log-APACHE.txt
-TestRe6stVerificationUrlSlave-1/var/log/frontend-apache-access.log
-TestRe6stVerificationUrlSlave-1/var/log/frontend-apache-error.log
-TestRe6stVerificationUrlSlave-1/var/log/httpd/_default_access_log
-TestRe6stVerificationUrlSlave-1/var/log/httpd/_default_error_log
-TestRe6stVerificationUrlSlave-1/var/log/monitor-httpd-error.log
-TestRe6stVerificationUrlSlave-1/var/log/nginx-access.log
-TestRe6stVerificationUrlSlave-1/var/log/nginx-error.log
-TestRe6stVerificationUrlSlave-1/var/log/trafficserver/manager.log
-TestRe6stVerificationUrlSlave-1/var/log/trafficserver/traffic.out
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_run-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_run-APACHE.txt
-TestRe6stVerificationUrlSlave-0/var/run/monitor/monitor-bootstrap.pid
-TestRe6stVerificationUrlSlave-1/var/run/apache_configuration.signature
-TestRe6stVerificationUrlSlave-1/var/run/httpd.pid
-TestRe6stVerificationUrlSlave-1/var/run/monitor-httpd.pid
-TestRe6stVerificationUrlSlave-1/var/run/monitor/monitor-bootstrap.pid
-TestRe6stVerificationUrlSlave-1/var/run/napache_configuration.signature
-TestRe6stVerificationUrlSlave-1/var/run/nginx.pid
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_monitor_promise_list-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_monitor_promise_list-APACHE.txt
-TestRe6stVerificationUrlSlave-1/etc/monitor-promise/check-_default-error-log-last-day
-TestRe6stVerificationUrlSlave-1/etc/monitor-promise/check-_default-error-log-last-hour
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_list-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_promise_list-APACHE.txt
-TestRe6stVerificationUrlSlave-0/etc/promise/check-free-disk-space
-TestRe6stVerificationUrlSlave-0/etc/promise/monitor-http-frontend
-TestRe6stVerificationUrlSlave-0/etc/promise/monitor-httpd-listening-on-tcp
-TestRe6stVerificationUrlSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestRe6stVerificationUrlSlave-1/etc/promise/apache-frontend-is-running-actual-software-release
-TestRe6stVerificationUrlSlave-1/etc/promise/apache-mpm-watchdog
-TestRe6stVerificationUrlSlave-1/etc/promise/apache_cached
-TestRe6stVerificationUrlSlave-1/etc/promise/apache_frontend_ipv4_http
-TestRe6stVerificationUrlSlave-1/etc/promise/apache_frontend_ipv4_https
-TestRe6stVerificationUrlSlave-1/etc/promise/apache_frontend_ipv6_http
-TestRe6stVerificationUrlSlave-1/etc/promise/apache_frontend_ipv6_https
-TestRe6stVerificationUrlSlave-1/etc/promise/apache_ssl_cached
-TestRe6stVerificationUrlSlave-1/etc/promise/check-free-disk-space
-TestRe6stVerificationUrlSlave-1/etc/promise/frontend-apache-configuration-promise
-TestRe6stVerificationUrlSlave-1/etc/promise/monitor-http-frontend
-TestRe6stVerificationUrlSlave-1/etc/promise/monitor-httpd-listening-on-tcp
-TestRe6stVerificationUrlSlave-1/etc/promise/nginx-configuration-promise
-TestRe6stVerificationUrlSlave-1/etc/promise/nginx_frontend_ipv4_http
-TestRe6stVerificationUrlSlave-1/etc/promise/nginx_frontend_ipv4_https
-TestRe6stVerificationUrlSlave-1/etc/promise/nginx_frontend_ipv6_http
-TestRe6stVerificationUrlSlave-1/etc/promise/nginx_frontend_ipv6_https
-TestRe6stVerificationUrlSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestRe6stVerificationUrlSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestRe6stVerificationUrlSlave-1/etc/promise/re6st-connectivity
-TestRe6stVerificationUrlSlave-1/etc/promise/trafficserver-cache-availability
-TestRe6stVerificationUrlSlave-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_supervisor_state-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_supervisor_state-APACHE.txt
-TestRe6stVerificationUrlSlave-0:bootstrap-monitor EXITED
-TestRe6stVerificationUrlSlave-0:certificate_authority-on-watch RUNNING
-TestRe6stVerificationUrlSlave-0:crond RUNNING
-TestRe6stVerificationUrlSlave-0:monitor-httpd-graceful EXITED
-TestRe6stVerificationUrlSlave-0:monitor-httpd-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:bootstrap-monitor EXITED
-TestRe6stVerificationUrlSlave-1:certificate_authority-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:crond-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:frontend-apache-safe-graceful EXITED
-TestRe6stVerificationUrlSlave-1:frontend-nginx-safe-graceful EXITED
-TestRe6stVerificationUrlSlave-1:frontend_apache-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:frontend_nginx-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:monitor-httpd-graceful EXITED
-TestRe6stVerificationUrlSlave-1:monitor-httpd-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:trafficserver-on-watch RUNNING
-TestRe6stVerificationUrlSlave-1:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_log-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_log-APACHE.txt
-TestReplicateSlave-1/var/log/frontend-apache-access.log
-TestReplicateSlave-1/var/log/frontend-apache-error.log
-TestReplicateSlave-1/var/log/httpd/_replicate_access_log
-TestReplicateSlave-1/var/log/httpd/_replicate_error_log
-TestReplicateSlave-1/var/log/monitor-httpd-error.log
-TestReplicateSlave-1/var/log/nginx-access.log
-TestReplicateSlave-1/var/log/nginx-error.log
-TestReplicateSlave-1/var/log/trafficserver/manager.log
-TestReplicateSlave-1/var/log/trafficserver/traffic.out
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_run-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_run-APACHE.txt
-TestReplicateSlave-0/var/run/monitor/monitor-bootstrap.pid
-TestReplicateSlave-1/var/run/apache_configuration.signature
-TestReplicateSlave-1/var/run/httpd.pid
-TestReplicateSlave-1/var/run/monitor-httpd.pid
-TestReplicateSlave-1/var/run/monitor/monitor-bootstrap.pid
-TestReplicateSlave-1/var/run/napache_configuration.signature
-TestReplicateSlave-1/var/run/nginx.pid
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_monitor_promise_list-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_monitor_promise_list-APACHE.txt
-TestReplicateSlave-1/etc/monitor-promise/check-_replicate-error-log-last-day
-TestReplicateSlave-1/etc/monitor-promise/check-_replicate-error-log-last-hour
-TestReplicateSlave-2/etc/monitor-promise/check-_replicate-error-log-last-day
-TestReplicateSlave-2/etc/monitor-promise/check-_replicate-error-log-last-hour
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_list-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_list-APACHE.txt
-TestReplicateSlave-0/etc/promise/check-free-disk-space
-TestReplicateSlave-0/etc/promise/monitor-http-frontend
-TestReplicateSlave-0/etc/promise/monitor-httpd-listening-on-tcp
-TestReplicateSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestReplicateSlave-1/etc/promise/apache-frontend-is-running-actual-software-release
-TestReplicateSlave-1/etc/promise/apache-mpm-watchdog
-TestReplicateSlave-1/etc/promise/apache_cached
-TestReplicateSlave-1/etc/promise/apache_frontend_ipv4_http
-TestReplicateSlave-1/etc/promise/apache_frontend_ipv4_https
-TestReplicateSlave-1/etc/promise/apache_frontend_ipv6_http
-TestReplicateSlave-1/etc/promise/apache_frontend_ipv6_https
-TestReplicateSlave-1/etc/promise/apache_ssl_cached
-TestReplicateSlave-1/etc/promise/check-free-disk-space
-TestReplicateSlave-1/etc/promise/frontend-apache-configuration-promise
-TestReplicateSlave-1/etc/promise/monitor-http-frontend
-TestReplicateSlave-1/etc/promise/monitor-httpd-listening-on-tcp
-TestReplicateSlave-1/etc/promise/nginx-configuration-promise
-TestReplicateSlave-1/etc/promise/nginx_frontend_ipv4_http
-TestReplicateSlave-1/etc/promise/nginx_frontend_ipv4_https
-TestReplicateSlave-1/etc/promise/nginx_frontend_ipv6_http
-TestReplicateSlave-1/etc/promise/nginx_frontend_ipv6_https
-TestReplicateSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestReplicateSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestReplicateSlave-1/etc/promise/re6st-connectivity
-TestReplicateSlave-1/etc/promise/trafficserver-cache-availability
-TestReplicateSlave-1/etc/promise/trafficserver-port-listening
-TestReplicateSlave-2/etc/promise/apache-frontend-is-running-actual-software-release
-TestReplicateSlave-2/etc/promise/apache-mpm-watchdog
-TestReplicateSlave-2/etc/promise/apache_cached
-TestReplicateSlave-2/etc/promise/apache_frontend_ipv4_http
-TestReplicateSlave-2/etc/promise/apache_frontend_ipv4_https
-TestReplicateSlave-2/etc/promise/apache_frontend_ipv6_http
-TestReplicateSlave-2/etc/promise/apache_frontend_ipv6_https
-TestReplicateSlave-2/etc/promise/apache_ssl_cached
-TestReplicateSlave-2/etc/promise/check-free-disk-space
-TestReplicateSlave-2/etc/promise/frontend-apache-configuration-promise
-TestReplicateSlave-2/etc/promise/monitor-http-frontend
-TestReplicateSlave-2/etc/promise/monitor-httpd-listening-on-tcp
-TestReplicateSlave-2/etc/promise/nginx-configuration-promise
-TestReplicateSlave-2/etc/promise/nginx_frontend_ipv4_http
-TestReplicateSlave-2/etc/promise/nginx_frontend_ipv4_https
-TestReplicateSlave-2/etc/promise/nginx_frontend_ipv6_http
-TestReplicateSlave-2/etc/promise/nginx_frontend_ipv6_https
-TestReplicateSlave-2/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestReplicateSlave-2/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestReplicateSlave-2/etc/promise/re6st-connectivity
-TestReplicateSlave-2/etc/promise/trafficserver-cache-availability
-TestReplicateSlave-2/etc/promise/trafficserver-port-listening
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_supervisor_state-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_supervisor_state-APACHE.txt
-TestReplicateSlave-0:bootstrap-monitor EXITED
-TestReplicateSlave-0:certificate_authority-on-watch RUNNING
-TestReplicateSlave-0:crond RUNNING
-TestReplicateSlave-0:monitor-httpd-graceful EXITED
-TestReplicateSlave-0:monitor-httpd-on-watch RUNNING
-TestReplicateSlave-1:bootstrap-monitor EXITED
-TestReplicateSlave-1:certificate_authority-on-watch RUNNING
-TestReplicateSlave-1:crond-on-watch RUNNING
-TestReplicateSlave-1:frontend-apache-safe-graceful EXITED
-TestReplicateSlave-1:frontend-nginx-safe-graceful EXITED
-TestReplicateSlave-1:frontend_apache-on-watch RUNNING
-TestReplicateSlave-1:frontend_nginx-on-watch RUNNING
-TestReplicateSlave-1:monitor-httpd-graceful EXITED
-TestReplicateSlave-1:monitor-httpd-on-watch RUNNING
-TestReplicateSlave-1:trafficserver-on-watch RUNNING
-TestReplicateSlave-1:trafficserver-reload EXITED
-TestReplicateSlave-2:bootstrap-monitor STOPPED
-TestReplicateSlave-2:certificate_authority-on-watch STOPPED
-TestReplicateSlave-2:crond-on-watch STOPPED
-TestReplicateSlave-2:frontend-apache-safe-graceful STOPPED
-TestReplicateSlave-2:frontend-nginx-safe-graceful STOPPED
-TestReplicateSlave-2:frontend_apache-on-watch STOPPED
-TestReplicateSlave-2:frontend_nginx-on-watch STOPPED
-TestReplicateSlave-2:monitor-httpd-graceful STOPPED
-TestReplicateSlave-2:monitor-httpd-on-watch STOPPED
-TestReplicateSlave-2:trafficserver-on-watch STOPPED
-TestReplicateSlave-2:trafficserver-reload STOPPED
-watchdog:watchdog RUNNING
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-APACHE.txt
-TestSlave-1/var/log/frontend-apache-access.log
-TestSlave-1/var/log/frontend-apache-error.log
-TestSlave-1/var/log/httpd/_apache_custom_http_s-accepted_access_log
-TestSlave-1/var/log/httpd/_apache_custom_http_s-accepted_error_log
-TestSlave-1/var/log/httpd/_caddy_custom_http_s-accepted_access_log
-TestSlave-1/var/log/httpd/_caddy_custom_http_s-accepted_error_log
-TestSlave-1/var/log/httpd/_caddy_custom_http_s-rejected_access_log
-TestSlave-1/var/log/httpd/_caddy_custom_http_s-rejected_error_log
-TestSlave-1/var/log/httpd/_custom_domain_access_log
-TestSlave-1/var/log/httpd/_custom_domain_error_log
-TestSlave-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log
-TestSlave-1/var/log/httpd/_custom_domain_ssl_crt_ssl_key_error_log
-TestSlave-1/var/log/httpd/_disabled-cookie-list_access_log
-TestSlave-1/var/log/httpd/_disabled-cookie-list_error_log
-TestSlave-1/var/log/httpd/_empty_access_log
-TestSlave-1/var/log/httpd/_empty_error_log
-TestSlave-1/var/log/httpd/_enable-http2-default_access_log
-TestSlave-1/var/log/httpd/_enable-http2-default_error_log
-TestSlave-1/var/log/httpd/_enable-http2-false_access_log
-TestSlave-1/var/log/httpd/_enable-http2-false_error_log
-TestSlave-1/var/log/httpd/_enable_cache-disable-no-cache-request_access_log
-TestSlave-1/var/log/httpd/_enable_cache-disable-no-cache-request_error_log
-TestSlave-1/var/log/httpd/_enable_cache-disable-via-header_access_log
-TestSlave-1/var/log/httpd/_enable_cache-disable-via-header_error_log
-TestSlave-1/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_access_log
-TestSlave-1/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_error_log
-TestSlave-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-TestSlave-1/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-TestSlave-1/var/log/httpd/_enable_cache_access_log
-TestSlave-1/var/log/httpd/_enable_cache_error_log
-TestSlave-1/var/log/httpd/_https-only_access_log
-TestSlave-1/var/log/httpd/_https-only_error_log
-TestSlave-1/var/log/httpd/_monitor-ipv4-test_access_log
-TestSlave-1/var/log/httpd/_monitor-ipv4-test_error_log
-TestSlave-1/var/log/httpd/_monitor-ipv6-test_access_log
-TestSlave-1/var/log/httpd/_monitor-ipv6-test_error_log
-TestSlave-1/var/log/httpd/_prefer-gzip-encoding-to-backend_access_log
-TestSlave-1/var/log/httpd/_prefer-gzip-encoding-to-backend_error_log
-TestSlave-1/var/log/httpd/_re6st-optimal-test_access_log
-TestSlave-1/var/log/httpd/_re6st-optimal-test_error_log
-TestSlave-1/var/log/httpd/_server-alias_access_log
-TestSlave-1/var/log/httpd/_server-alias_error_log
-TestSlave-1/var/log/httpd/_ssl-proxy-verify-unverified_access_log
-TestSlave-1/var/log/httpd/_ssl-proxy-verify-unverified_error_log
-TestSlave-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-TestSlave-1/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-TestSlave-1/var/log/httpd/_type-eventsource_access_log
-TestSlave-1/var/log/httpd/_type-eventsource_error_log
-TestSlave-1/var/log/httpd/_type-notebook_access_log
-TestSlave-1/var/log/httpd/_type-notebook_error_log
-TestSlave-1/var/log/httpd/_type-redirect_access_log
-TestSlave-1/var/log/httpd/_type-redirect_error_log
-TestSlave-1/var/log/httpd/_type-zope-default-path_access_log
-TestSlave-1/var/log/httpd/_type-zope-default-path_error_log
-TestSlave-1/var/log/httpd/_type-zope-path_access_log
-TestSlave-1/var/log/httpd/_type-zope-path_error_log
-TestSlave-1/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_access_log
-TestSlave-1/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_error_log
-TestSlave-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-TestSlave-1/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-TestSlave-1/var/log/httpd/_type-zope-virtualhostroot-http-port_access_log
-TestSlave-1/var/log/httpd/_type-zope-virtualhostroot-http-port_error_log
-TestSlave-1/var/log/httpd/_type-zope-virtualhostroot-https-port_access_log
-TestSlave-1/var/log/httpd/_type-zope-virtualhostroot-https-port_error_log
-TestSlave-1/var/log/httpd/_type-zope_access_log
-TestSlave-1/var/log/httpd/_type-zope_error_log
-TestSlave-1/var/log/httpd/_url_access_log
-TestSlave-1/var/log/httpd/_url_error_log
-TestSlave-1/var/log/httpd/_url_https-url_access_log
-TestSlave-1/var/log/httpd/_url_https-url_error_log
-TestSlave-1/var/log/monitor-httpd-error.log
-TestSlave-1/var/log/nginx-access.log
-TestSlave-1/var/log/nginx-error.log
-TestSlave-1/var/log/trafficserver/manager.log
-TestSlave-1/var/log/trafficserver/traffic.out
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-APACHE.txt
-TestSlave-0/var/run/monitor/monitor-bootstrap.pid
-TestSlave-1/var/run/apache_configuration.signature
-TestSlave-1/var/run/httpd.pid
-TestSlave-1/var/run/monitor-httpd.pid
-TestSlave-1/var/run/monitor/monitor-bootstrap.pid
-TestSlave-1/var/run/napache_configuration.signature
-TestSlave-1/var/run/nginx.pid
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestSlave.test_master_partition_state-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_master_partition_state-APACHE.txt
-SetEnvIf Origin "^http(s)?://(.+\.)?(monitor\.app\.officejs\.com)$" ORIGIN_DOMAIN=$0
-Header always set Access-Control-Allow-Origin "%{ORIGIN_DOMAIN}e" env=ORIGIN_DOMAIN
-Header always set Access-Control-Allow-Credentials "true" env=ORIGIN_DOMAIN
-Header always set Access-Control-Allow-Methods "PROPFIND, PROPPATCH, COPY, MOVE, DELETE, MKCOL, LOCK, UNLOCK, PUT, GETLIB, VERSION-CONTROL, CHECKIN, CHECKOUT, UNCHECKOUT, REPORT, UPDATE, CANCELUPLOAD, HEAD, OPTIONS, GET, POST" env=ORIGIN_DOMAIN
-Header always set Access-Control-Allow-Headers "Overwrite, Destination, Content-Type, Depth, User-Agent, X-File-Size, X-Requested-With, If-Modified-Since, X-File-Name, Cache-Control, Authorization" env=ORIGIN_DOMAIN
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestSlave.test_monitor_promise_list-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_monitor_promise_list-APACHE.txt
-TestSlave-1/etc/monitor-promise/check-_apache_custom_http_s-accepted-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_apache_custom_http_s-accepted-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_caddy_custom_http_s-accepted-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_caddy_custom_http_s-accepted-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_caddy_custom_http_s-rejected-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_caddy_custom_http_s-rejected-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_custom_domain-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_custom_domain-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_disabled-cookie-list-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_disabled-cookie-list-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_empty-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_empty-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_enable-http2-default-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_enable-http2-false-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_enable_cache-disable-no-cache-request-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_enable_cache-disable-no-cache-request-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_enable_cache-disable-via-header-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_enable_cache-disable-via-header-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_enable_cache-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_enable_cache-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify-unverified-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_https-only-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_https-only-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_monitor-ipv4-test-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_monitor-ipv4-test-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_monitor-ipv4-test-ipv4-packet-list-test
-TestSlave-1/etc/monitor-promise/check-_monitor-ipv6-test-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_monitor-ipv6-test-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_monitor-ipv6-test-ipv6-packet-list-test
-TestSlave-1/etc/monitor-promise/check-_prefer-gzip-encoding-to-backend-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_prefer-gzip-encoding-to-backend-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_re6st-optimal-test-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_re6st-optimal-test-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_re6st-optimal-test-re6st-optimal-test
-TestSlave-1/etc/monitor-promise/check-_server-alias-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_server-alias-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_ssl-proxy-verify-unverified-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_ssl-proxy-verify-unverified-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-eventsource-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-eventsource-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-notebook-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-notebook-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-redirect-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-redirect-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-zope-default-path-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-zope-default-path-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-zope-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-zope-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-zope-path-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-zope-path-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify-unverified-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-zope-virtualhostroot-http-port-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-zope-virtualhostroot-http-port-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_type-zope-virtualhostroot-https-port-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_type-zope-virtualhostroot-https-port-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_url-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_url-error-log-last-hour
-TestSlave-1/etc/monitor-promise/check-_url_https-url-error-log-last-day
-TestSlave-1/etc/monitor-promise/check-_url_https-url-error-log-last-hour
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_list-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_promise_list-APACHE.txt
-TestSlave-0/etc/promise/check-free-disk-space
-TestSlave-0/etc/promise/monitor-http-frontend
-TestSlave-0/etc/promise/monitor-httpd-listening-on-tcp
-TestSlave-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestSlave-1/etc/promise/apache-frontend-is-running-actual-software-release
-TestSlave-1/etc/promise/apache-mpm-watchdog
-TestSlave-1/etc/promise/apache_cached
-TestSlave-1/etc/promise/apache_frontend_ipv4_http
-TestSlave-1/etc/promise/apache_frontend_ipv4_https
-TestSlave-1/etc/promise/apache_frontend_ipv6_http
-TestSlave-1/etc/promise/apache_frontend_ipv6_https
-TestSlave-1/etc/promise/apache_ssl_cached
-TestSlave-1/etc/promise/check-free-disk-space
-TestSlave-1/etc/promise/frontend-apache-configuration-promise
-TestSlave-1/etc/promise/monitor-http-frontend
-TestSlave-1/etc/promise/monitor-httpd-listening-on-tcp
-TestSlave-1/etc/promise/nginx-configuration-promise
-TestSlave-1/etc/promise/nginx_frontend_ipv4_http
-TestSlave-1/etc/promise/nginx_frontend_ipv4_https
-TestSlave-1/etc/promise/nginx_frontend_ipv6_http
-TestSlave-1/etc/promise/nginx_frontend_ipv6_https
-TestSlave-1/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
-TestSlave-1/etc/promise/promise-nginx-is-process-older-than-dependency-set
-TestSlave-1/etc/promise/re6st-connectivity
-TestSlave-1/etc/promise/trafficserver-cache-availability
-TestSlave-1/etc/promise/trafficserver-port-listening
\ No newline at end of file
--- a/software/caddy-frontend/test/test_data/test.TestSlave.test_supervisor_state-APACHE.txt
+++ b/software/caddy-frontend/test/test_data/test.TestSlave.test_supervisor_state-APACHE.txt
-TestSlave-0:bootstrap-monitor EXITED
-TestSlave-0:certificate_authority-on-watch RUNNING
-TestSlave-0:crond RUNNING
-TestSlave-0:monitor-httpd-graceful EXITED
-TestSlave-0:monitor-httpd-on-watch RUNNING
-TestSlave-1:bootstrap-monitor EXITED
-TestSlave-1:certificate_authority-on-watch RUNNING
-TestSlave-1:crond-on-watch RUNNING
-TestSlave-1:frontend-apache-safe-graceful EXITED
-TestSlave-1:frontend-nginx-safe-graceful EXITED
-TestSlave-1:frontend_apache-on-watch RUNNING
-TestSlave-1:frontend_nginx-on-watch RUNNING
-TestSlave-1:monitor-httpd-graceful EXITED
-TestSlave-1:monitor-httpd-on-watch RUNNING
-TestSlave-1:trafficserver-on-watch RUNNING
-TestSlave-1:trafficserver-reload EXITED
-watchdog:watchdog RUNNING
\ No newline at end of file