Commit 22310196 authored by Łukasz Nowak's avatar Łukasz Nowak

caddy-frontend: Monitor backend connection on each slave

parent 92a40391
......@@ -30,7 +30,7 @@ md5sum = ef06c04a5aa33b103dc1d25d0dfe8217
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
md5sum = a473ded24aed999abed3d79a08bb09a6
md5sum = 448baca1d43f1dba4d40ed9e18bb86c5
[template-slave-configuration]
filename = templates/custom-virtualhost.conf.in
......
......@@ -172,10 +172,14 @@ bytes = 8
{% do slave_parameter_dict.__setitem__('certificate', certificate )%}
{# Set ssl certificates for each slave #}
{% set ssl_proxy_ca_crt_file = None %}
{% for cert_name in ('ssl_csr', 'ssl_proxy_ca_crt')%}
{% if cert_name in slave_instance %}
{% set cert_title = '%s-%s' % (slave_reference, cert_name.replace('ssl_', '')) %}
{% set cert_file = '/'.join([custom_ssl_directory, cert_title.replace('-','.')]) %}
{% if cert_name == 'ssl_proxy_ca_crt' %}
{% set ssl_proxy_ca_crt_file = cert_file %}
{% endif %}
{% do part_list.append(cert_title) %}
{% do slave_parameter_dict.__setitem__(cert_name, cert_file) %}
{% do slave_instance.__setitem__('path_to_' + cert_name, cert_file) %}
......@@ -262,6 +266,20 @@ extra-context =
filename = {{ '%s.conf' % slave_reference }}
{{ '\n' }}
{% for k in ['url', 'https-url'] %}
{% set v = slave_instance.get(k) %}
{% if v %}
{% set check_url_access_section_title = 'check-http-access-%s-%s' % (slave_instance.get('slave_reference'), k) %}
{% do part_list.append(check_url_access_section_title) %}
[{{ check_url_access_section_title }}]
<= promise-plugin-base
module = check_http_access
name = {{ check_url_access_section_title }}.py
config-url = {{ v }}
config-ssl-proxy-verify = {{ slave_instance.get('ssl-proxy-verify') }}
config-ssl-proxy-ca-crt-file = {{ ssl_proxy_ca_crt_file or '' }}
{% endif %}
{% endfor %}
{% set check_error_log_section_title = 'check-%s-error-log-last-hour' % slave_instance.get('slave_reference') %}
{% do part_list.append(check_error_log_section_title) %}
......
......@@ -17,6 +17,7 @@ T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
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-http-access-_test-url.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
......
......@@ -17,6 +17,7 @@ T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
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-http-access-_url-url.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
......
......@@ -17,6 +17,7 @@ T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
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-http-access-_replicate-url.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
......@@ -33,6 +34,7 @@ T-3/etc/plugin/caddy_frontend_ipv6_https.py: OK
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-http-access-_replicate-url.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: OK
......
......@@ -17,6 +17,7 @@ T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
T-2/etc/plugin/caddy_ssl_cached.py: ERROR
T-2/etc/plugin/check-_default-path-unsafe-error-log-last-day.py: OK
T-2/etc/plugin/check-_default-path-unsafe-error-log-last-hour.py: OK
T-2/etc/plugin/check-http-access-_default-path-unsafe-url.py: OK
T-2/etc/plugin/check-_monitor-ipv4-test-unsafe-error-log-last-day.py: OK
T-2/etc/plugin/check-_monitor-ipv4-test-unsafe-error-log-last-hour.py: OK
T-2/etc/plugin/check-_monitor-ipv4-test-unsafe-ipv4-packet-list-test.py: OK
......@@ -30,10 +31,13 @@ T-2/etc/plugin/check-_re6st-optimal-test-unsafe-error-log-last-hour.py: OK
T-2/etc/plugin/check-_re6st-optimal-test-unsafe-re6st-optimal-test.py: OK
T-2/etc/plugin/check-_server-alias-same-error-log-last-day.py: OK
T-2/etc/plugin/check-_server-alias-same-error-log-last-hour.py: OK
T-2/etc/plugin/check-http-access-_server-alias-same-url.py: OK
T-2/etc/plugin/check-_virtualhostroot-http-port-unsafe-error-log-last-day.py: OK
T-2/etc/plugin/check-_virtualhostroot-http-port-unsafe-error-log-last-hour.py: OK
T-2/etc/plugin/check-http-access-_virtualhostroot-http-port-unsafe-url.py: OK
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-http-access-_virtualhostroot-https-port-unsafe-url.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
......
......@@ -17,28 +17,40 @@ T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
T-2/etc/plugin/caddy_ssl_cached.py: ERROR
T-2/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-day.py: OK
T-2/etc/plugin/check-_custom_domain_ssl_crt_ssl_key-error-log-last-hour.py: OK
T-2/etc/plugin/check-http-access-_custom_domain_ssl_crt_ssl_key-url.py: OK
T-2/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-day.py: OK
T-2/etc/plugin/check-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-error-log-last-hour.py: OK
T-2/etc/plugin/check-http-access-_custom_domain_ssl_crt_ssl_key_ssl_ca_crt-url.py: OK
T-2/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-day.py: OK
T-2/etc/plugin/check-_ssl_ca_crt_does_not_match-error-log-last-hour.py: OK
T-2/etc/plugin/check-http-access-_ssl_ca_crt_does_not_match-url.py: OK
T-2/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-day.py: OK
T-2/etc/plugin/check-_ssl_ca_crt_garbage-error-log-last-hour.py: OK
T-2/etc/plugin/check-http-access-_ssl_ca_crt_garbage-url.py: OK
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-http-access-_ssl_from_master-url.py: OK
T-2/etc/plugin/check-_ssl_from_master_kedifa_overrides-error-log-last-day.py: OK
T-2/etc/plugin/check-_ssl_from_master_kedifa_overrides-error-log-last-hour.py: OK
T-2/etc/plugin/check-http-access-_ssl_from_master_kedifa_overrides-url.py: OK
T-2/etc/plugin/check-_ssl_from_slave-error-log-last-day.py: OK
T-2/etc/plugin/check-_ssl_from_slave-error-log-last-hour.py: OK
T-2/etc/plugin/check-http-access-_ssl_from_slave-url.py: OK
T-2/etc/plugin/check-_ssl_from_slave_kedifa_overrides-error-log-last-day.py: OK
T-2/etc/plugin/check-_ssl_from_slave_kedifa_overrides-error-log-last-hour.py: OK
T-2/etc/plugin/check-http-access-_ssl_from_slave_kedifa_overrides-url.py: OK
T-2/etc/plugin/check-_type-notebook-ssl_from_master-error-log-last-day.py: OK
T-2/etc/plugin/check-_type-notebook-ssl_from_master-error-log-last-hour.py: OK
T-2/etc/plugin/check-http-access-_type-notebook-ssl_from_master-url.py: OK
T-2/etc/plugin/check-_type-notebook-ssl_from_master_kedifa_overrides-error-log-last-day.py: OK
T-2/etc/plugin/check-_type-notebook-ssl_from_master_kedifa_overrides-error-log-last-hour.py: OK
T-2/etc/plugin/check-http-access-_type-notebook-ssl_from_master_kedifa_overrides-url.py: OK
T-2/etc/plugin/check-_type-notebook-ssl_from_slave-error-log-last-day.py: OK
T-2/etc/plugin/check-_type-notebook-ssl_from_slave-error-log-last-hour.py: OK
T-2/etc/plugin/check-http-access-_type-notebook-ssl_from_slave-url.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-http-access-_type-notebook-ssl_from_slave_kedifa_overrides-url.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
......
......@@ -17,6 +17,7 @@ T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
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-http-access-_ssl_from_master_kedifa_overrides_master_certificate-url.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
......
......@@ -17,6 +17,7 @@ T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
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-http-access-_ssl_from_master-url.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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment