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
109
Merge Requests
109
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
5bc5d6a4
Commit
5bc5d6a4
authored
Aug 28, 2019
by
Łukasz Nowak
Committed by
Łukasz Nowak
Nov 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/caddy-frontend: Switch to monitor-promise-base
parent
af0336cf
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
60 deletions
+24
-60
software/caddy-frontend/buildout.hash.cfg
software/caddy-frontend/buildout.hash.cfg
+4
-4
software/caddy-frontend/instance-apache-frontend.cfg.in
software/caddy-frontend/instance-apache-frontend.cfg.in
+11
-21
software/caddy-frontend/instance-apache-replicate.cfg.in
software/caddy-frontend/instance-apache-replicate.cfg.in
+2
-11
software/caddy-frontend/instance-kedifa.cfg.in
software/caddy-frontend/instance-kedifa.cfg.in
+2
-12
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
.../caddy-frontend/templates/apache-custom-slave-list.cfg.in
+5
-12
No files found.
software/caddy-frontend/buildout.hash.cfg
View file @
5bc5d6a4
...
@@ -22,15 +22,15 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
...
@@ -22,15 +22,15 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
[template-apache-frontend]
[template-apache-frontend]
filename = instance-apache-frontend.cfg.in
filename = instance-apache-frontend.cfg.in
md5sum =
7f2f7b40e3639c50cf7dd929f4425f20
md5sum =
c6d78b2856d9d0ec63728e668e3395d8
[template-caddy-replicate]
[template-caddy-replicate]
filename = instance-apache-replicate.cfg.in
filename = instance-apache-replicate.cfg.in
md5sum =
bd73ad5ef84fe6bf0f479ee45da3139d
md5sum =
a34ab1970f91731c32ed7f2471632c86
[template-slave-list]
[template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in
filename = templates/apache-custom-slave-list.cfg.in
md5sum =
5913a176c025cdadee6782f8ad285dc4
md5sum =
46e0ccb54c2406b8a44cdada73c061a6
[template-slave-configuration]
[template-slave-configuration]
filename = templates/custom-virtualhost.conf.in
filename = templates/custom-virtualhost.conf.in
...
@@ -118,4 +118,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
...
@@ -118,4 +118,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
[template-kedifa]
[template-kedifa]
filename = instance-kedifa.cfg.in
filename = instance-kedifa.cfg.in
md5sum =
9ca8f5fdae2ad5aa9e95aba69c20f82
0
md5sum =
d5efd74d80a1df3d5386758c9f13e19
0
software/caddy-frontend/instance-apache-frontend.cfg.in
View file @
5bc5d6a4
...
@@ -59,7 +59,6 @@ log = ${:var}/log
...
@@ -59,7 +59,6 @@ log = ${:var}/log
run = ${:var}/run
run = ${:var}/run
service = ${:etc}/service
service = ${:etc}/service
etc-run = ${:etc}/run
etc-run = ${:etc}/run
plugin = ${:etc}/plugin
ca-dir = ${:srv}/ssl
ca-dir = ${:srv}/ssl
# BBB: SlapOS Master non-zero knowledge BEGIN
# BBB: SlapOS Master non-zero knowledge BEGIN
...
@@ -139,6 +138,7 @@ context =
...
@@ -139,6 +138,7 @@ context =
import json_module json
import json_module json
raw common_profile {{ parameter_dict['common_profile'] }}
raw common_profile {{ parameter_dict['common_profile'] }}
raw logrotate_base_instance {{ parameter_dict['logrotate_base_instance'] }}
raw logrotate_base_instance {{ parameter_dict['logrotate_base_instance'] }}
raw monitor_template {{ parameter_dict['monitor_template'] }}
key slap_software_type :slap_software_type
key slap_software_type :slap_software_type
key slapparameter_dict :slapparameter_dict
key slapparameter_dict :slapparameter_dict
section directory directory
section directory directory
...
@@ -257,7 +257,6 @@ extra-context =
...
@@ -257,7 +257,6 @@ extra-context =
section frontend_configuration frontend-configuration
section frontend_configuration frontend-configuration
section caddy_configuration caddy-configuration
section caddy_configuration caddy-configuration
key monitor_base_url monitor-instance-parameter:monitor-base-url
key monitor_base_url monitor-instance-parameter:monitor-base-url
key plugin_directory directory:plugin
key report_directory directory:bin
key report_directory directory:bin
key bin_directory :bin_directory
key bin_directory :bin_directory
key enable_http2_by_default configuration:enable-http2-by-default
key enable_http2_by_default configuration:enable-http2-by-default
...
@@ -510,17 +509,8 @@ filename = ip_allow.config
...
@@ -510,17 +509,8 @@ filename = ip_allow.config
context =
context =
key content trafficserver-variable:ip-allow-config
key content trafficserver-variable:ip-allow-config
[promise-plugin-base]
recipe = slapos.cookbook:promise.plugin
eggs =
slapos.toolbox
content =
from slapos.promise.plugin.${:module} import RunPromise
output = ${directory:plugin}/${:name}
[trafficserver-promise-listen-port]
[trafficserver-promise-listen-port]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = check_port_listening
module = check_port_listening
name = trafficserver-port-listening.py
name = trafficserver-port-listening.py
config-hostname = ${trafficserver-variable:local-ip}
config-hostname = ${trafficserver-variable:local-ip}
...
@@ -533,7 +523,7 @@ wrapper-path = ${directory:bin}/traffic_ctl
...
@@ -533,7 +523,7 @@ wrapper-path = ${directory:bin}/traffic_ctl
environment = TS_ROOT=${buildout:directory}
environment = TS_ROOT=${buildout:directory}
[trafficserver-promise-cache-availability]
[trafficserver-promise-cache-availability]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = trafficserver_cache_availability
module = trafficserver_cache_availability
name = trafficserver-cache-availability.py
name = trafficserver-cache-availability.py
config-wrapper-path = ${trafficserver-ctl:wrapper-path}
config-wrapper-path = ${trafficserver-ctl:wrapper-path}
...
@@ -633,48 +623,48 @@ context =
...
@@ -633,48 +623,48 @@ context =
key content :content
key content :content
[promise-frontend-caddy-configuration]
[promise-frontend-caddy-configuration]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = validate_frontend_configuration
module = validate_frontend_configuration
name = frontend-caddy-configuration-promise.py
name = frontend-caddy-configuration-promise.py
config-verification-script = ${promise-helper-last-configuration-state:rendered}
config-verification-script = ${promise-helper-last-configuration-state:rendered}
[promise-caddy-frontend-v4-https]
[promise-caddy-frontend-v4-https]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = check_port_listening
module = check_port_listening
name = caddy_frontend_ipv4_https.py
name = caddy_frontend_ipv4_https.py
config-hostname = {{ instance_parameter['ipv4-random'] }}
config-hostname = {{ instance_parameter['ipv4-random'] }}
config-port = ${configuration:port}
config-port = ${configuration:port}
[promise-caddy-frontend-v4-http]
[promise-caddy-frontend-v4-http]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = check_port_listening
module = check_port_listening
name = caddy_frontend_ipv4_http.py
name = caddy_frontend_ipv4_http.py
config-hostname = {{ instance_parameter['ipv4-random'] }}
config-hostname = {{ instance_parameter['ipv4-random'] }}
config-port = ${configuration:plain_http_port}
config-port = ${configuration:plain_http_port}
[promise-caddy-frontend-v6-https]
[promise-caddy-frontend-v6-https]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = check_port_listening
module = check_port_listening
name = caddy_frontend_ipv6_https.py
name = caddy_frontend_ipv6_https.py
config-hostname = {{ instance_parameter['ipv6-random'] }}
config-hostname = {{ instance_parameter['ipv6-random'] }}
config-port = ${configuration:port}
config-port = ${configuration:port}
[promise-caddy-frontend-v6-http]
[promise-caddy-frontend-v6-http]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = check_port_listening
module = check_port_listening
name = caddy_frontend_ipv6_http.py
name = caddy_frontend_ipv6_http.py
config-hostname = {{ instance_parameter['ipv6-random'] }}
config-hostname = {{ instance_parameter['ipv6-random'] }}
config-port = ${configuration:plain_http_port}
config-port = ${configuration:plain_http_port}
[promise-caddy-frontend-cached]
[promise-caddy-frontend-cached]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = check_port_listening
module = check_port_listening
name = caddy_cached.py
name = caddy_cached.py
config-hostname = {{ instance_parameter['ipv4-random'] }}
config-hostname = {{ instance_parameter['ipv4-random'] }}
config-port = ${caddy-configuration:cache-through-port}
config-port = ${caddy-configuration:cache-through-port}
[promise-caddy-frontend-ssl-cached]
[promise-caddy-frontend-ssl-cached]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = check_port_listening
module = check_port_listening
name = caddy_ssl_cached.py
name = caddy_ssl_cached.py
config-hostname = {{ instance_parameter['ipv4-random'] }}
config-hostname = {{ instance_parameter['ipv4-random'] }}
...
@@ -735,7 +725,7 @@ context =
...
@@ -735,7 +725,7 @@ context =
raw content show:cache-stats
raw content show:cache-stats
[monitor-verify-re6st-connectivity]
[monitor-verify-re6st-connectivity]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = check_url_available
module = check_url_available
name = re6st-connectivity.py
name = re6st-connectivity.py
config-url = ${configuration:re6st-verification-url}
config-url = ${configuration:re6st-verification-url}
...
...
software/caddy-frontend/instance-apache-replicate.cfg.in
View file @
5bc5d6a4
...
@@ -512,7 +512,6 @@ context =
...
@@ -512,7 +512,6 @@ context =
key content :content
key content :content
[directory]
[directory]
plugin = ${:etc}/plugin
service = ${:etc}/service
service = ${:etc}/service
promise-output = ${:srv}/promise-output
promise-output = ${:srv}/promise-output
...
@@ -573,23 +572,15 @@ template = inline:
...
@@ -573,23 +572,15 @@ template = inline:
rendered = ${directory:etc}/Caddyfile-rejected-slave
rendered = ${directory:etc}/Caddyfile-rejected-slave
[promise-plugin-base]
recipe = slapos.cookbook:promise.plugin
eggs =
slapos.toolbox
content =
from slapos.promise.plugin.${:module} import RunPromise
output = ${directory:plugin}/${:name}
[promise-rejected-slave-publish-ip-port]
[promise-rejected-slave-publish-ip-port]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = check_port_listening
module = check_port_listening
name = rejected-slave-publish-ip-port-listening.py
name = rejected-slave-publish-ip-port-listening.py
config-hostname = ${rejected-slave-publish-configuration:ip}
config-hostname = ${rejected-slave-publish-configuration:ip}
config-port = ${rejected-slave-publish-configuration:port}
config-port = ${rejected-slave-publish-configuration:port}
[rejected-slave-promise]
[rejected-slave-promise]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = check_port_listening
module = check_port_listening
module = check_file_state
module = check_file_state
name = rejected-slave.py
name = rejected-slave.py
...
...
software/caddy-frontend/instance-kedifa.cfg.in
View file @
5bc5d6a4
...
@@ -53,8 +53,6 @@ log = ${:var}/log
...
@@ -53,8 +53,6 @@ log = ${:var}/log
run = ${:var}/run
run = ${:var}/run
service = ${:etc}/service
service = ${:etc}/service
etc-run = ${:etc}/run
etc-run = ${:etc}/run
promise = ${:etc}/promise
plugin = ${:etc}/plugin
# KeDiFa directories
# KeDiFa directories
kedifa = ${:srv}/kedifa
kedifa = ${:srv}/kedifa
...
@@ -156,7 +154,7 @@ template = inline:
...
@@ -156,7 +154,7 @@ template = inline:
rendered = ${directory:caddy-csr_id}/Caddyfile
rendered = ${directory:caddy-csr_id}/Caddyfile
[promise-expose-csr_id-ip-port]
[promise-expose-csr_id-ip-port]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = check_port_listening
module = check_port_listening
name = expose-csr_id-ip-port-listening.py
name = expose-csr_id-ip-port-listening.py
config-hostname = ${expose-csr_id-configuration:ip}
config-hostname = ${expose-csr_id-configuration:ip}
...
@@ -195,14 +193,6 @@ context =
...
@@ -195,14 +193,6 @@ context =
section directory directory
section directory directory
${:extra-context}
${:extra-context}
[promise-plugin-base]
recipe = slapos.cookbook:promise.plugin
eggs =
slapos.toolbox
content =
from slapos.promise.plugin.${:module} import RunPromise
output = ${directory:plugin}/${:name}
[kedifa-config]
[kedifa-config]
ip = {{ instance_parameter['ipv6-random'] }}
ip = {{ instance_parameter['ipv6-random'] }}
port = {{ instance_parameter['configuration.kedifa_port'] }}
port = {{ instance_parameter['configuration.kedifa_port'] }}
...
@@ -221,7 +211,7 @@ command-line = kill -SIGHUP `cat ${kedifa-config:pidfile}`
...
@@ -221,7 +211,7 @@ command-line = kill -SIGHUP `cat ${kedifa-config:pidfile}`
wrapper-path = ${directory:etc-run}/kedifa-reloader
wrapper-path = ${directory:etc-run}/kedifa-reloader
[promise-kedifa-http-reply]
[promise-kedifa-http-reply]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = check_url_available
module = check_url_available
name = kedifa-http-reply.py
name = kedifa-http-reply.py
# Kedifa replies 400 on /, so use it to be sure that Kedifa replied
# Kedifa replies 400 on /, so use it to be sure that Kedifa replied
...
...
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
View file @
5bc5d6a4
...
@@ -42,14 +42,6 @@ create = true
...
@@ -42,14 +42,6 @@ create = true
{% set slave_kedifa_information = {} %}
{% set slave_kedifa_information = {} %}
{% endif %}
{% endif %}
[promise-plugin-base]
recipe = slapos.cookbook:promise.plugin
eggs =
slapos.toolbox
content =
from slapos.promise.plugin.${:module} import RunPromise
output = {{ plugin_directory }}/${:name}
# empty section if no cached slaves are available
# empty section if no cached slaves are available
[slave-log-cache-direct-directory-dict]
[slave-log-cache-direct-directory-dict]
...
@@ -288,7 +280,7 @@ filename = {{ '%s.conf' % slave_reference }}
...
@@ -288,7 +280,7 @@ filename = {{ '%s.conf' % slave_reference }}
{% set monitor_ipv6_section_title = 'check-%s-ipv6-packet-list-test' % slave_instance.get('slave_reference') %}
{% set monitor_ipv6_section_title = 'check-%s-ipv6-packet-list-test' % slave_instance.get('slave_reference') %}
{% do part_list.append(monitor_ipv6_section_title) %}
{% do part_list.append(monitor_ipv6_section_title) %}
[{{ monitor_ipv6_section_title }}]
[{{ monitor_ipv6_section_title }}]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = check_icmp_packet_lost
module = check_icmp_packet_lost
name = {{ monitor_ipv6_section_title }}.py
name = {{ monitor_ipv6_section_title }}.py
config-address = {{ dumps(monitor_ipv6_test) }}
config-address = {{ dumps(monitor_ipv6_test) }}
...
@@ -301,7 +293,7 @@ config-frequency = 720
...
@@ -301,7 +293,7 @@ config-frequency = 720
{% set monitor_ipv4_section_title = 'check-%s-ipv4-packet-list-test' % slave_instance.get('slave_reference') %}
{% set monitor_ipv4_section_title = 'check-%s-ipv4-packet-list-test' % slave_instance.get('slave_reference') %}
{% do part_list.append(monitor_ipv4_section_title) %}
{% do part_list.append(monitor_ipv4_section_title) %}
[{{ monitor_ipv4_section_title }}]
[{{ monitor_ipv4_section_title }}]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = check_icmp_packet_lost
module = check_icmp_packet_lost
name = {{ monitor_ipv4_section_title }}.py
name = {{ monitor_ipv4_section_title }}.py
config-address = {{ dumps(monitor_ipv4_test) }}
config-address = {{ dumps(monitor_ipv4_test) }}
...
@@ -321,7 +313,7 @@ config-frequency = 720
...
@@ -321,7 +313,7 @@ config-frequency = 720
{% do part_list.append(re6st_optimal_test_section_title) %}
{% do part_list.append(re6st_optimal_test_section_title) %}
[{{ re6st_optimal_test_section_title }}]
[{{ re6st_optimal_test_section_title }}]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = check_re6st_optimal_status
module = check_re6st_optimal_status
name = {{ re6st_optimal_test_section_title }}.py
name = {{ re6st_optimal_test_section_title }}.py
config-ipv4 = {{ dumps(re6st_ipv4) }}
config-ipv4 = {{ dumps(re6st_ipv4) }}
...
@@ -493,6 +485,7 @@ rendered = {{frontend_configuration.get('log-access-configuration')}}
...
@@ -493,6 +485,7 @@ rendered = {{frontend_configuration.get('log-access-configuration')}}
extends =
extends =
{{ common_profile }}
{{ common_profile }}
{{ logrotate_base_instance }}
{{ logrotate_base_instance }}
{{ monitor_template }}
parts +=
parts +=
kedifa-updater
kedifa-updater
...
@@ -561,7 +554,7 @@ template = inline:
...
@@ -561,7 +554,7 @@ template = inline:
rendered = {{ directory_caddy_csr_id }}/Caddyfile
rendered = {{ directory_caddy_csr_id }}/Caddyfile
[promise-expose-csr_id-ip-port]
[promise-expose-csr_id-ip-port]
<=
promise-plugin
-base
<=
monitor-promise
-base
module = check_port_listening
module = check_port_listening
name = expose-csr_id-ip-port-listening.py
name = expose-csr_id-ip-port-listening.py
config-hostname = ${expose-csr_id-configuration:ip}
config-hostname = ${expose-csr_id-configuration:ip}
...
...
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