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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
slapos
Commits
5c20538e
Commit
5c20538e
authored
Nov 16, 2018
by
Łukasz Nowak
Committed by
Łukasz Nowak
Dec 14, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Support slaveless nodes
/reviewed-on
!466
parent
f0a3d912
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
132 additions
and
15 deletions
+132
-15
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
+17
-6
software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt
..._data/test.TestMasterRequest.test_file_list_log-CADDY.txt
+5
-1
software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt
..._data/test.TestMasterRequest.test_file_list_run-CADDY.txt
+9
-1
software/caddy-frontend/test/test_data/test.TestMasterRequest.test_plugin_list-CADDY.txt
...st_data/test.TestMasterRequest.test_plugin_list-CADDY.txt
+5
-1
software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_list-CADDY.txt
...t_data/test.TestMasterRequest.test_promise_list-CADDY.txt
+20
-1
software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-CADDY.txt
...ta/test.TestMasterRequest.test_supervisor_state-CADDY.txt
+18
-0
software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt
...test.TestMasterRequestDomain.test_file_list_log-CADDY.txt
+5
-1
software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt
...test.TestMasterRequestDomain.test_file_list_run-CADDY.txt
+9
-1
software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_plugin_list-CADDY.txt
...a/test.TestMasterRequestDomain.test_plugin_list-CADDY.txt
+5
-1
software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_list-CADDY.txt
.../test.TestMasterRequestDomain.test_promise_list-CADDY.txt
+20
-1
software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt
...t.TestMasterRequestDomain.test_supervisor_state-CADDY.txt
+18
-0
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
5c20538e
...
@@ -30,7 +30,7 @@ md5sum = 6a86edb96b171fbd0a59d0adc9cc906b
...
@@ -30,7 +30,7 @@ md5sum = 6a86edb96b171fbd0a59d0adc9cc906b
[template-slave-list]
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
filename = templates/apache-custom-slave-list.cfg.in
md5sum = 2
1d79170943678b1be1d69614a32bd92
md5sum = 2
32ee8c086db6f452e0c98e3869a2433
[template-slave-configuration]
[template-slave-configuration]
filename = templates/custom-virtualhost.conf.in
filename = templates/custom-virtualhost.conf.in
...
...
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
View file @
5c20538e
...
@@ -112,6 +112,23 @@ crl = {{ custom_ssl_directory }}/crl/
...
@@ -112,6 +112,23 @@ crl = {{ custom_ssl_directory }}/crl/
[slave-log-directory-dict]
[slave-log-directory-dict]
{{slave_reference}} = {{ slave_log_folder }}
{{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-password]
{{ slave_reference }} = {{ '${' + slave_password_section + ':passwd}' }}
{{ slave_reference }} = {{ '${' + slave_password_section + ':passwd}' }}
...
@@ -329,10 +346,6 @@ extra-context =
...
@@ -329,10 +346,6 @@ extra-context =
{{ '\n' }}
{{ '\n' }}
{% endfor %}
{% endfor %}
[slave-log-directories]
<= slave-log-directory-dict
recipe = slapos.cookbook:mkdirectory
{#- Define IPv6 to IPV4 tunneling #}
{#- Define IPv6 to IPV4 tunneling #}
[tunnel-6to4-base]
[tunnel-6to4-base]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
...
@@ -409,12 +422,10 @@ monitor-base-url = {{ monitor_base_url }}
...
@@ -409,12 +422,10 @@ monitor-base-url = {{ monitor_base_url }}
[buildout]
[buildout]
extends = {{ common_profile }}
extends = {{ common_profile }}
parts +=
parts +=
slave-log-directories
{% for part in part_list %}
{% for part in part_list %}
{{ ' %s' % part }}
{{ ' %s' % part }}
{% endfor %}
{% endfor %}
publish-caddy-information
publish-caddy-information
caddy-log-access
tunnel-6to4-base-http_port
tunnel-6to4-base-http_port
tunnel-6to4-base-https_port
tunnel-6to4-base-https_port
tunnel-6to4-base-cached_port
tunnel-6to4-base-cached_port
...
...
software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt
View file @
5c20538e
TestMasterRequest-0/var/log/monitor-httpd-error.log
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
software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt
View file @
5c20538e
TestMasterRequest-0/var/run/monitor-httpd.pid
TestMasterRequest-0/var/run/monitor-httpd.pid
TestMasterRequest-0/var/run/monitor/monitor-bootstrap.pid
TestMasterRequest-0/var/run/monitor/monitor-bootstrap.pid
TestMasterRequest-1/var/run/caddy_graceful_signature
TestMasterRequest-1/var/run/caddy_validate_signature
TestMasterRequest-1/var/run/caddy_validate_signature.status
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_validate_signature
TestMasterRequest-1/var/run/nginx_validate_signature.status
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestMasterRequest.test_plugin_list-CADDY.txt
View file @
5c20538e
...
@@ -2,3 +2,7 @@ TestMasterRequest-0/etc/plugin/__init__.py
...
@@ -2,3 +2,7 @@ TestMasterRequest-0/etc/plugin/__init__.py
TestMasterRequest-0/etc/plugin/buildout-TestMasterRequest-0-status.py
TestMasterRequest-0/etc/plugin/buildout-TestMasterRequest-0-status.py
TestMasterRequest-0/etc/plugin/check-free-disk-space.py
TestMasterRequest-0/etc/plugin/check-free-disk-space.py
TestMasterRequest-0/etc/plugin/monitor-bootstrap-status.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
software/caddy-frontend/test/test_data/test.TestMasterRequest.test_promise_list-CADDY.txt
View file @
5c20538e
TestMasterRequest-0/etc/promise/monitor-http-frontend
TestMasterRequest-0/etc/promise/monitor-http-frontend
TestMasterRequest-0/etc/promise/monitor-httpd-listening-on-tcp
TestMasterRequest-0/etc/promise/monitor-httpd-listening-on-tcp
TestMasterRequest-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
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-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
software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-CADDY.txt
View file @
5c20538e
...
@@ -3,4 +3,22 @@ TestMasterRequest-0:certificate_authority-on-watch RUNNING
...
@@ -3,4 +3,22 @@ TestMasterRequest-0:certificate_authority-on-watch RUNNING
TestMasterRequest-0:crond-{hash} RUNNING
TestMasterRequest-0:crond-{hash} RUNNING
TestMasterRequest-0:monitor-httpd-{hash}-on-watch RUNNING
TestMasterRequest-0:monitor-httpd-{hash}-on-watch RUNNING
TestMasterRequest-0:monitor-httpd-graceful EXITED
TestMasterRequest-0:monitor-httpd-graceful EXITED
TestMasterRequest-1:6tunnel-11080-{hash}-on-watch RUNNING
TestMasterRequest-1:6tunnel-11443-{hash}-on-watch RUNNING
TestMasterRequest-1:6tunnel-12080-{hash}-on-watch RUNNING
TestMasterRequest-1:6tunnel-12443-{hash}-on-watch RUNNING
TestMasterRequest-1:6tunnel-26011-{hash}-on-watch RUNNING
TestMasterRequest-1:6tunnel-26012-{hash}-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
watchdog:watchdog RUNNING
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt
View file @
5c20538e
TestMasterRequestDomain-0/var/log/monitor-httpd-error.log
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
software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt
View file @
5c20538e
TestMasterRequestDomain-0/var/run/monitor-httpd.pid
TestMasterRequestDomain-0/var/run/monitor-httpd.pid
TestMasterRequestDomain-0/var/run/monitor/monitor-bootstrap.pid
TestMasterRequestDomain-0/var/run/monitor/monitor-bootstrap.pid
TestMasterRequestDomain-1/var/run/caddy_graceful_signature
TestMasterRequestDomain-1/var/run/caddy_validate_signature
TestMasterRequestDomain-1/var/run/caddy_validate_signature.status
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_validate_signature
TestMasterRequestDomain-1/var/run/nginx_validate_signature.status
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_plugin_list-CADDY.txt
View file @
5c20538e
...
@@ -2,3 +2,7 @@ TestMasterRequestDomain-0/etc/plugin/__init__.py
...
@@ -2,3 +2,7 @@ TestMasterRequestDomain-0/etc/plugin/__init__.py
TestMasterRequestDomain-0/etc/plugin/buildout-TestMasterRequestDomain-0-status.py
TestMasterRequestDomain-0/etc/plugin/buildout-TestMasterRequestDomain-0-status.py
TestMasterRequestDomain-0/etc/plugin/check-free-disk-space.py
TestMasterRequestDomain-0/etc/plugin/check-free-disk-space.py
TestMasterRequestDomain-0/etc/plugin/monitor-bootstrap-status.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
software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_promise_list-CADDY.txt
View file @
5c20538e
TestMasterRequestDomain-0/etc/promise/monitor-http-frontend
TestMasterRequestDomain-0/etc/promise/monitor-http-frontend
TestMasterRequestDomain-0/etc/promise/monitor-httpd-listening-on-tcp
TestMasterRequestDomain-0/etc/promise/monitor-httpd-listening-on-tcp
TestMasterRequestDomain-0/etc/promise/promise-monitor-httpd-is-process-older-than-dependency-set
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-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
software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt
View file @
5c20538e
...
@@ -3,4 +3,22 @@ TestMasterRequestDomain-0:certificate_authority-on-watch RUNNING
...
@@ -3,4 +3,22 @@ TestMasterRequestDomain-0:certificate_authority-on-watch RUNNING
TestMasterRequestDomain-0:crond-{hash} RUNNING
TestMasterRequestDomain-0:crond-{hash} RUNNING
TestMasterRequestDomain-0:monitor-httpd-{hash}-on-watch RUNNING
TestMasterRequestDomain-0:monitor-httpd-{hash}-on-watch RUNNING
TestMasterRequestDomain-0:monitor-httpd-graceful EXITED
TestMasterRequestDomain-0:monitor-httpd-graceful EXITED
TestMasterRequestDomain-1:6tunnel-11080-{hash}-on-watch RUNNING
TestMasterRequestDomain-1:6tunnel-11443-{hash}-on-watch RUNNING
TestMasterRequestDomain-1:6tunnel-12080-{hash}-on-watch RUNNING
TestMasterRequestDomain-1:6tunnel-12443-{hash}-on-watch RUNNING
TestMasterRequestDomain-1:6tunnel-26011-{hash}-on-watch RUNNING
TestMasterRequestDomain-1:6tunnel-26012-{hash}-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
watchdog:watchdog RUNNING
\ No newline at end of file
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