Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
89
Merge Requests
89
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
22310196
Commit
22310196
authored
Jun 05, 2019
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Monitor backend connection on each slave
parent
92a40391
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
143 additions
and
1 deletion
+143
-1
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+1
-1
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
.../caddy-frontend/templates/apache-custom-slave-list.cfg.in
+18
-0
software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt
...DefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt
+1
-0
software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_plugin-CADDY.txt
...ta/test.TestQuicEnabled.test_promise_run_plugin-CADDY.txt
+1
-0
software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt
...test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt
+2
-0
software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_plugin-CADDY.txt
...est_data/test.TestSlave.test_promise_run_plugin-CADDY.txt
+51
-0
software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_plugin-CADDY.txt
....TestSlaveBadParameters.test_promise_run_plugin-CADDY.txt
+4
-0
software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt
...SlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt
+51
-0
software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_promise_run_plugin-CADDY.txt
...ertificateCompatibility.test_promise_run_plugin-CADDY.txt
+12
-0
software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_promise_run_plugin-CADDY.txt
...atibilityOverrideMaster.test_promise_run_plugin-CADDY.txt
+1
-0
software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_promise_run_plugin-CADDY.txt
...cateCompatibilityUpdate.test_promise_run_plugin-CADDY.txt
+1
-0
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
22310196
...
...
@@ -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
...
...
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
View file @
22310196
...
...
@@ -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) %}
...
...
software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_promise_run_plugin-CADDY.txt
View file @
22310196
...
...
@@ -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
...
...
software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_promise_run_plugin-CADDY.txt
View file @
22310196
...
...
@@ -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
...
...
software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_promise_run_plugin-CADDY.txt
View file @
22310196
...
...
@@ -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
...
...
software/caddy-frontend/test/test_data/test.TestSlave.test_promise_run_plugin-CADDY.txt
View file @
22310196
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_promise_run_plugin-CADDY.txt
View file @
22310196
...
...
@@ -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
...
...
software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_promise_run_plugin-CADDY.txt
View file @
22310196
This diff is collapsed.
Click to expand it.
software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_promise_run_plugin-CADDY.txt
View file @
22310196
...
...
@@ -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
...
...
software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_promise_run_plugin-CADDY.txt
View file @
22310196
...
...
@@ -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
...
...
software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_promise_run_plugin-CADDY.txt
View file @
22310196
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment