Revert "caddy-frontend: Support slaveless nodes"

This reverts commit 9243ace4

There are some bizarre issues with notebook, which happen randomly.

/reviewed-on !463

software/caddy-frontend/buildout.hash.cfg

@@ -30,7 +30,7 @@ md5sum = 6a86edb96b171fbd0a59d0adc9cc906b
 
 [template-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
-md5sum = e6df7f2563a51ce699fa9eed111b4000
+md5sum = 434e00cbfee2f9c002b2a83084a48b4a
 
 [template-slave-configuration]
 filename = templates/custom-virtualhost.conf.in

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

@@ -112,23 +112,6 @@ crl = {{ custom_ssl_directory }}/crl/
 [slave-log-directory-dict]
 {{slave_reference}} = {{ slave_log_folder }}
 
-[slave-log-directories]
-<= slave-log-directory-dict
-recipe = slapos.cookbook:mkdirectory
-
-{% do part_list.append('slave-log-directories') %}
-
-[caddy-log-access]
-< = jinja2-template-base
-template = {{frontend_configuration.get('template-log-access')}}
-rendered = {{frontend_configuration.get('log-access-configuration')}}
-extra-context =
-    section slave_log_directory slave-log-directory-dict
-    section slave_password slave-password
-    section parameter_dict caddy-log-access-parameters
-
-{% do part_list.append('caddy-log-access') %}
-
 [slave-password]
 {{ slave_reference }} = {{ '${' + slave_password_section + ':passwd}' }}
 
@@ -346,6 +329,10 @@ extra-context =
 {{ '\n' }}
 {% endfor %}
 
+[slave-log-directories]
+<= slave-log-directory-dict
+recipe = slapos.cookbook:mkdirectory
+
 {#- Define IPv6 to IPV4 tunneling #}
 [tunnel-6to4-base]
 recipe = slapos.cookbook:wrapper
@@ -421,10 +408,12 @@ monitor-base-url = {{ monitor_base_url }}
 [buildout]
 extends = {{ common_profile }}
 parts +=
+    slave-log-directories
 {% for part in part_list %}
 {{ '    %s' % part }}
 {% endfor %}
     publish-caddy-information
+    caddy-log-access
     tunnel-6to4-base-http_port
     tunnel-6to4-base-https_port
     tunnel-6to4-base-cached_port

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

-TestMasterRequest-0/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
+TestMasterRequest-0/var/log/monitor-httpd-error.log
\ No newline at end of file

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

 TestMasterRequest-0/var/run/monitor-httpd.pid
-TestMasterRequest-0/var/run/monitor/monitor-bootstrap.pid
-TestMasterRequest-1/var/run/caddy_graceful_signature
-TestMasterRequest-1/var/run/caddy_graceful_signature.tmp
-TestMasterRequest-1/var/run/caddy_validate_signature
-TestMasterRequest-1/var/run/monitor/monitor-bootstrap.pid
-TestMasterRequest-1/var/run/nginx.pid
-TestMasterRequest-1/var/run/nginx_graceful_signature
-TestMasterRequest-1/var/run/nginx_graceful_signature.tmp
-TestMasterRequest-1/var/run/nginx_validate_signature
\ No newline at end of file
+TestMasterRequest-0/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file

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

 TestMasterRequest-0/etc/plugin/__init__.py
 TestMasterRequest-0/etc/plugin/buildout-TestMasterRequest-0-status.py
 TestMasterRequest-0/etc/plugin/check-free-disk-space.py
-TestMasterRequest-0/etc/plugin/monitor-bootstrap-status.py
-TestMasterRequest-1/etc/plugin/__init__.py
-TestMasterRequest-1/etc/plugin/buildout-TestMasterRequest-1-status.py
-TestMasterRequest-1/etc/plugin/check-free-disk-space.py
-TestMasterRequest-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestMasterRequest-0/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file

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

 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/caddy-frontend-is-running-actual-software-release
-TestMasterRequest-1/etc/promise/caddy_cached
-TestMasterRequest-1/etc/promise/caddy_frontend_ipv4_http
-TestMasterRequest-1/etc/promise/caddy_frontend_ipv4_https
-TestMasterRequest-1/etc/promise/caddy_frontend_ipv6_http
-TestMasterRequest-1/etc/promise/caddy_frontend_ipv6_https
-TestMasterRequest-1/etc/promise/caddy_ssl_cached
-TestMasterRequest-1/etc/promise/frontend-caddy-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
+TestMasterRequest-1/etc/promise/monitor-http-frontend
\ No newline at end of file

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

@@ -3,22 +3,4 @@ TestMasterRequest-0:certificate_authority-on-watch RUNNING
 TestMasterRequest-0:crond-{hash} RUNNING
 TestMasterRequest-0:monitor-httpd-{hash}-on-watch RUNNING
 TestMasterRequest-0:monitor-httpd-graceful EXITED
-TestMasterRequest-1:6tunnel-11080-on-watch RUNNING
-TestMasterRequest-1:6tunnel-11443-on-watch RUNNING
-TestMasterRequest-1:6tunnel-12080-on-watch RUNNING
-TestMasterRequest-1:6tunnel-12443-on-watch RUNNING
-TestMasterRequest-1:6tunnel-26011-on-watch RUNNING
-TestMasterRequest-1:6tunnel-26012-on-watch RUNNING
-TestMasterRequest-1:bootstrap-monitor EXITED
-TestMasterRequest-1:certificate_authority-{hash}-on-watch RUNNING
-TestMasterRequest-1:crond-{hash} RUNNING
-TestMasterRequest-1:crond-on-watch RUNNING
-TestMasterRequest-1:frontend-caddy-safe-graceful EXITED
-TestMasterRequest-1:frontend-nginx-safe-graceful EXITED
-TestMasterRequest-1:frontend_caddy-{hash}-on-watch EXITED
-TestMasterRequest-1:frontend_nginx-{hash}-on-watch RUNNING
-TestMasterRequest-1:monitor-httpd-{hash}-on-watch EXITED
-TestMasterRequest-1:monitor-httpd-graceful EXITED
-TestMasterRequest-1:trafficserver-{hash}-on-watch RUNNING
-TestMasterRequest-1:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
\ No newline at end of file

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

-TestMasterRequestDomain-0/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
+TestMasterRequestDomain-0/var/log/monitor-httpd-error.log
\ No newline at end of file

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

 TestMasterRequestDomain-0/var/run/monitor-httpd.pid
-TestMasterRequestDomain-0/var/run/monitor/monitor-bootstrap.pid
-TestMasterRequestDomain-1/var/run/caddy_graceful_signature
-TestMasterRequestDomain-1/var/run/caddy_graceful_signature.tmp
-TestMasterRequestDomain-1/var/run/caddy_validate_signature
-TestMasterRequestDomain-1/var/run/monitor/monitor-bootstrap.pid
-TestMasterRequestDomain-1/var/run/nginx.pid
-TestMasterRequestDomain-1/var/run/nginx_graceful_signature
-TestMasterRequestDomain-1/var/run/nginx_graceful_signature.tmp
-TestMasterRequestDomain-1/var/run/nginx_validate_signature
\ No newline at end of file
+TestMasterRequestDomain-0/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file

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

 TestMasterRequestDomain-0/etc/plugin/__init__.py
 TestMasterRequestDomain-0/etc/plugin/buildout-TestMasterRequestDomain-0-status.py
 TestMasterRequestDomain-0/etc/plugin/check-free-disk-space.py
-TestMasterRequestDomain-0/etc/plugin/monitor-bootstrap-status.py
-TestMasterRequestDomain-1/etc/plugin/__init__.py
-TestMasterRequestDomain-1/etc/plugin/buildout-TestMasterRequestDomain-1-status.py
-TestMasterRequestDomain-1/etc/plugin/check-free-disk-space.py
-TestMasterRequestDomain-1/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file
+TestMasterRequestDomain-0/etc/plugin/monitor-bootstrap-status.py
\ No newline at end of file

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

 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/caddy-frontend-is-running-actual-software-release
-TestMasterRequestDomain-1/etc/promise/caddy_cached
-TestMasterRequestDomain-1/etc/promise/caddy_frontend_ipv4_http
-TestMasterRequestDomain-1/etc/promise/caddy_frontend_ipv4_https
-TestMasterRequestDomain-1/etc/promise/caddy_frontend_ipv6_http
-TestMasterRequestDomain-1/etc/promise/caddy_frontend_ipv6_https
-TestMasterRequestDomain-1/etc/promise/caddy_ssl_cached
-TestMasterRequestDomain-1/etc/promise/frontend-caddy-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
+TestMasterRequestDomain-1/etc/promise/monitor-http-frontend
\ No newline at end of file

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

@@ -3,22 +3,4 @@ TestMasterRequestDomain-0:certificate_authority-on-watch RUNNING
 TestMasterRequestDomain-0:crond-{hash} RUNNING
 TestMasterRequestDomain-0:monitor-httpd-{hash}-on-watch RUNNING
 TestMasterRequestDomain-0:monitor-httpd-graceful EXITED
-TestMasterRequestDomain-1:6tunnel-11080-on-watch RUNNING
-TestMasterRequestDomain-1:6tunnel-11443-on-watch RUNNING
-TestMasterRequestDomain-1:6tunnel-12080-on-watch RUNNING
-TestMasterRequestDomain-1:6tunnel-12443-on-watch RUNNING
-TestMasterRequestDomain-1:6tunnel-26011-on-watch RUNNING
-TestMasterRequestDomain-1:6tunnel-26012-on-watch RUNNING
-TestMasterRequestDomain-1:bootstrap-monitor EXITED
-TestMasterRequestDomain-1:certificate_authority-{hash}-on-watch RUNNING
-TestMasterRequestDomain-1:crond-{hash} RUNNING
-TestMasterRequestDomain-1:crond-on-watch RUNNING
-TestMasterRequestDomain-1:frontend-caddy-safe-graceful EXITED
-TestMasterRequestDomain-1:frontend-nginx-safe-graceful EXITED
-TestMasterRequestDomain-1:frontend_caddy-{hash}-on-watch EXITED
-TestMasterRequestDomain-1:frontend_nginx-{hash}-on-watch RUNNING
-TestMasterRequestDomain-1:monitor-httpd-{hash}-on-watch EXITED
-TestMasterRequestDomain-1:monitor-httpd-graceful EXITED
-TestMasterRequestDomain-1:trafficserver-{hash}-on-watch RUNNING
-TestMasterRequestDomain-1:trafficserver-reload EXITED
 watchdog:watchdog RUNNING
\ No newline at end of file

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

@@ -3,7 +3,6 @@ TestRe6stVerificationUrlDefaultSlave-0/var/run/monitor/monitor-bootstrap.pid
 TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_graceful_signature
 TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_graceful_signature.tmp
 TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_validate_signature
-TestRe6stVerificationUrlDefaultSlave-1/var/run/caddy_validate_signature.status
 TestRe6stVerificationUrlDefaultSlave-1/var/run/httpd.pid
 TestRe6stVerificationUrlDefaultSlave-1/var/run/monitor-httpd.pid
 TestRe6stVerificationUrlDefaultSlave-1/var/run/monitor/monitor-bootstrap.pid

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

@@ -3,7 +3,6 @@ TestRe6stVerificationUrlSlave-0/var/run/monitor/monitor-bootstrap.pid
 TestRe6stVerificationUrlSlave-1/var/run/caddy_graceful_signature
 TestRe6stVerificationUrlSlave-1/var/run/caddy_graceful_signature.tmp
 TestRe6stVerificationUrlSlave-1/var/run/caddy_validate_signature
-TestRe6stVerificationUrlSlave-1/var/run/caddy_validate_signature.status
 TestRe6stVerificationUrlSlave-1/var/run/httpd.pid
 TestRe6stVerificationUrlSlave-1/var/run/monitor-httpd.pid
 TestRe6stVerificationUrlSlave-1/var/run/monitor/monitor-bootstrap.pid