Skip to content

slapos
slapos
Commit aa4541d4 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼
Browse files
Options

Update Release Candidate

parents 326822a0 9ae8e791
Show whitespace changes
Inline Side-by-side
Showing with 487 additions and 511 deletions
component/qemu-kvm/buildout.cfg
View file @ aa4541d4
...@@ -78,11 +78,11 @@ md5sum = f525f0c3f1c4ca184a604a75dabf4f71 ...@@ -78,11 +78,11 @@ md5sum = f525f0c3f1c4ca184a604a75dabf4f71
# XXX: This is not the latest version because # XXX: This is not the latest version because
# Debian does not provide a stable URL for it. # Debian does not provide a stable URL for it.
<= debian-amd64-netinst-base <= debian-amd64-netinst-base
version = 10.0.0 version = 10.1.0
md5sum = f31779fcca35f5ce9833a9661a9bd5bd md5sum = b931ef8736c98704bcf519160b50fd83
[debian-amd64-testing-netinst.iso] [debian-amd64-testing-netinst.iso]
<= debian-amd64-netinst-base <= debian-amd64-netinst-base
release = daily/20190923-1 release = daily-builds/daily/20191119-3
version = testing version = testing
md5sum = 00eda4218c401c46c15f491add41cd4e md5sum = db9e0131f6cfd3eb0aa2b76fddb2f942
software/backupserver/buildout.hash.cfg
View file @ aa4541d4
...@@ -46,7 +46,7 @@ md5sum = 80b3746568bc8e308a1f337bdaa2441c ...@@ -46,7 +46,7 @@ md5sum = 80b3746568bc8e308a1f337bdaa2441c
[template-pullrdiffbackup] [template-pullrdiffbackup]
filename = instance-pullrdiffbackup.cfg.in filename = instance-pullrdiffbackup.cfg.in
md5sum = 537ab12f3885660e59d280ee40e379ac md5sum = c1f00c251298c2ab7fd095e7c4571d3b
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
......
software/backupserver/instance-pullrdiffbackup.cfg.in
View file @ aa4541d4
...@@ -31,7 +31,6 @@ statistic = $${:srv}/$${variables:statistic_dirbasename} ...@@ -31,7 +31,6 @@ statistic = $${:srv}/$${variables:statistic_dirbasename}
backupscript = $${:etc}/backup backupscript = $${:etc}/backup
www = $${:srv}/www www = $${:srv}/www
home = $${:etc}/home home = $${:etc}/home
promises = $${:etc}/promise
ssl = $${:etc}/ssl ssl = $${:etc}/ssl
ssh = $${:home}/.ssh ssh = $${:home}/.ssh
plugin = $${:etc}/plugin plugin = $${:etc}/plugin
...@@ -194,10 +193,11 @@ virtual-depends = ...@@ -194,10 +193,11 @@ virtual-depends =
$${nginx-configuration:ip} $${nginx-configuration:ip}
[nginx-listen-promise] [nginx-listen-promise]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
hostname = $${nginx-configuration:ip} module = check_port_listening
port = $${nginx-configuration:port} name = nginx_listen.py
path = $${directory:promises}/nginx_listen config-hostname = $${nginx-configuration:ip}
config-port = $${nginx-configuration:port}
[nginx-configuration] [nginx-configuration]
recipe = slapos.recipe.template recipe = slapos.recipe.template
......
software/caddy-frontend/buildout.hash.cfg
View file @ aa4541d4
...@@ -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 = bb1eb172e65d8ffe5b161eae191947e1 md5sum = d5efd74d80a1df3d5386758c9f13e190
software/caddy-frontend/instance-apache-frontend.cfg.in
View file @ aa4541d4
...@@ -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 @ aa4541d4
...@@ -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 @ aa4541d4
...@@ -36,7 +36,6 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg ...@@ -36,7 +36,6 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
service_auto_approve_count=0, service_auto_approve_count=0,
user_auto_approve_count=1, user_auto_approve_count=1,
key_len=2048, key_len=2048,
promise='${directory:promise}/caucased',
)}} )}}
# Create all needed directories # Create all needed directories
...@@ -54,8 +53,6 @@ log = ${:var}/log ...@@ -54,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
...@@ -157,7 +154,7 @@ template = inline: ...@@ -157,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}
...@@ -196,14 +193,6 @@ context = ...@@ -196,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'] }}
...@@ -222,7 +211,7 @@ command-line = kill -SIGHUP `cat ${kedifa-config:pidfile}` ...@@ -222,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 @ aa4541d4
...@@ -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}
......
software/caddy-frontend/test/test.py
View file @ aa4541d4
...@@ -360,6 +360,8 @@ class TestDataMixin(object): ...@@ -360,6 +360,8 @@ class TestDataMixin(object):
'validate_configuration_state_signature', 'validate_configuration_state_signature',
# run by cron from time to time # run by cron from time to time
'monitor/monitor-collect.pid', 'monitor/monitor-collect.pid',
# no control regarding if it would or not be running
'monitor/monitor-bootstrap.pid',
]) ])
def test_file_list_etc_cron_d(self): def test_file_list_etc_cron_d(self):
......
software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
\ No newline at end of file
software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_run-CADDY.txt
View file @ aa4541d4
T-0/var/run/monitor-httpd.pid T-0/var/run/monitor-httpd.pid
T-0/var/run/monitor/monitor-bootstrap.pid
T-1/var/run/kedifa.pid T-1/var/run/kedifa.pid
T-1/var/run/monitor/monitor-bootstrap.pid
T-2/var/run/graceful_configuration_state_signature T-2/var/run/graceful_configuration_state_signature
T-2/var/run/httpd.pid T-2/var/run/httpd.pid
T-2/var/run/monitor-httpd.pid T-2/var/run/monitor-httpd.pid
T-2/var/run/monitor/monitor-bootstrap.pid
software/caucase/buildout.hash.cfg
View file @ aa4541d4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# not need these here). # not need these here).
[instance-caucased] [instance-caucased]
filename = instance-caucased.cfg.jinja2 filename = instance-caucased.cfg.jinja2
md5sum = 442e17a66b6f8d39f87903e147e3edaf md5sum = 2277c891a71534e00487468f5048d196
[instance] [instance]
filename = instance.cfg.jinja2 filename = instance.cfg.jinja2
......
software/caucase/instance-caucased.cfg.jinja2
View file @ aa4541d4
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
etc = ${buildout:directory}/etc etc = ${buildout:directory}/etc
promise = ${:etc}/promise
service-on-watch = ${:etc}/service service-on-watch = ${:etc}/service
srv = ${buildout:directory}/srv srv = ${buildout:directory}/srv
...@@ -17,7 +16,6 @@ srv = ${buildout:directory}/srv ...@@ -17,7 +16,6 @@ srv = ${buildout:directory}/srv
service_auto_approve_count=slapparameter_dict.get('service-auto-approve-amount', 0), service_auto_approve_count=slapparameter_dict.get('service-auto-approve-amount', 0),
user_auto_approve_count=slapparameter_dict.get('user-auto-approve-amount', 1), user_auto_approve_count=slapparameter_dict.get('user-auto-approve-amount', 1),
key_len=slapparameter_dict.get('key-length', 2048), key_len=slapparameter_dict.get('key-length', 2048),
promise='${directory:promise}/caucased',
) }} ) }}
[publish] [publish]
......
software/cloudooo/buildout.hash.cfg
View file @ aa4541d4
...@@ -18,4 +18,4 @@ md5sum = 6e4431cf4b0a0d034402604b1e2844c0 ...@@ -18,4 +18,4 @@ md5sum = 6e4431cf4b0a0d034402604b1e2844c0
[template-cloudooo-instance] [template-cloudooo-instance]
filename = instance-cloudooo.cfg.in filename = instance-cloudooo.cfg.in
md5sum = 31ed5c856ce2dff0305d7029caefc3f6 md5sum = 79f2740f7e28ad9fcd2f823d076e790e
software/cloudooo/instance-cloudooo.cfg.in
View file @ aa4541d4
...@@ -68,7 +68,9 @@ mode = {{ mode }} ...@@ -68,7 +68,9 @@ mode = {{ mode }}
[buildout] [buildout]
extends = extends =
{{ parameter_dict['template-logrotate-base'] }} {{ parameter_dict['template-logrotate-base'] }}
{{ parameter_dict['template-monitor'] }}
parts = parts =
monitor-base
publish publish
apache apache
apache-conf apache-conf
...@@ -114,10 +116,11 @@ crl = ${apache-ssl-client:crl} ...@@ -114,10 +116,11 @@ crl = ${apache-ssl-client:crl}
[apache-promise] [apache-promise]
# Check any apache port in ipv4, expect other ports and ipv6 to behave consistently # Check any apache port in ipv4, expect other ports and ipv6 to behave consistently
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
path = ${directory:promise}/apache module = check_port_listening
hostname = {{ ipv4 }} name = apache.py
port = {{ apache_dict.values()[0][0] }} config-hostname = {{ ipv4 }}
config-port = {{ apache_dict.values()[0][0] }}
[apache-conf-ssl] [apache-conf-ssl]
cert = ${directory:apache-conf}/apache.crt cert = ${directory:apache-conf}/apache.crt
...@@ -262,7 +265,6 @@ font = ${:srv}/font ...@@ -262,7 +265,6 @@ font = ${:srv}/font
log = ${:var}/log log = ${:var}/log
newcerts = ${:ca-dir}/newcerts newcerts = ${:ca-dir}/newcerts
private = ${:ca-dir}/private private = ${:ca-dir}/private
promise = ${directory:etc}/promise
requests = ${:ca-dir}/requests requests = ${:ca-dir}/requests
run = ${:var}/run run = ${:var}/run
services = ${:etc}/run services = ${:etc}/run
......
software/cloudooo/software-common.cfg
View file @ aa4541d4
...@@ -3,6 +3,7 @@ extends = ...@@ -3,6 +3,7 @@ extends =
buildout.hash.cfg buildout.hash.cfg
../../stack/cloudooo.cfg ../../stack/cloudooo.cfg
../../stack/logrotate/buildout.cfg ../../stack/logrotate/buildout.cfg
../../stack/monitor/buildout.cfg
parts = parts =
${cloudooo-buildout:parts} ${cloudooo-buildout:parts}
...@@ -78,6 +79,7 @@ xserver = ${xserver:location} ...@@ -78,6 +79,7 @@ xserver = ${xserver:location}
zlib = ${zlib:location} zlib = ${zlib:location}
template-apache-conf = ${template-apache-backend-conf:target} template-apache-conf = ${template-apache-backend-conf:target}
template-logrotate-base = ${template-logrotate-base:rendered} template-logrotate-base = ${template-logrotate-base:rendered}
template-monitor = ${monitor2-template:rendered}
[template-cloudooo-instance] [template-cloudooo-instance]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
......
software/erp5testnode/buildout.hash.cfg
View file @ aa4541d4
...@@ -18,4 +18,4 @@ md5sum = 307663d73ef3ef94b02567ecd322252e ...@@ -18,4 +18,4 @@ md5sum = 307663d73ef3ef94b02567ecd322252e
[template-default] [template-default]
filename = instance-default.cfg filename = instance-default.cfg
md5sum = 4abfdf82f90a39a36de338f36b5eeb3e md5sum = a76803eedf0c66fe7649b62efc86c8fe
software/erp5testnode/instance-default.cfg
View file @ aa4541d4
...@@ -183,7 +183,6 @@ recipe = slapos.cookbook:mkdirectory ...@@ -183,7 +183,6 @@ recipe = slapos.cookbook:mkdirectory
log = $${rootdirectory:var}/log log = $${rootdirectory:var}/log
services = $${rootdirectory:etc}/service services = $${rootdirectory:etc}/service
run = $${rootdirectory:var}/run run = $${rootdirectory:var}/run
promises = $${rootdirectory:etc}/promise
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
...@@ -217,17 +216,14 @@ return = domain secure_access ...@@ -217,17 +216,14 @@ return = domain secure_access
[promises] [promises]
recipe = recipe =
instance-promises = instance-promises =
$${shellinabox-frontend-listen-promise:path} $${shellinabox-frontend-listen-promise:name}
[check-port-listening-promise]
recipe = slapos.cookbook:check_port_listening
path = $${directory:promises}/$${:_buildout_section_name_}
[shellinabox-frontend-listen-promise] [shellinabox-frontend-listen-promise]
<= check-port-listening-promise <= monitor-promise-base
hostname= $${shellinabox-frontend:hostname} module = check_port_listening
port = $${shellinabox-frontend:port} name = $${:_buildout_section_name_}.py
config-hostname = $${shellinabox-frontend:hostname}
config-port = $${shellinabox-frontend:port}
[slap-parameter] [slap-parameter]
node-quantity = 1 node-quantity = 1
......
software/gitlab/buildout.hash.cfg
View file @ aa4541d4
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[instance.cfg] [instance.cfg]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = ddadc1eda2b474d6f2349409c05476eb md5sum = 36252abb4d857da08d62bf3eb26faae1
[watcher] [watcher]
_update_hash_filename_ = watcher.in _update_hash_filename_ = watcher.in
...@@ -50,7 +50,7 @@ md5sum = 0ddf4093dcf4427e5a160707e6017950 ...@@ -50,7 +50,7 @@ md5sum = 0ddf4093dcf4427e5a160707e6017950
[instance-gitlab.cfg.in] [instance-gitlab.cfg.in]
_update_hash_filename_ = instance-gitlab.cfg.in _update_hash_filename_ = instance-gitlab.cfg.in
md5sum = bd8bccad43e7cf294af2fc9b60fb3b46 md5sum = d794631233626d03b04894ca6b6d8496
[instance-gitlab-export.cfg.in] [instance-gitlab-export.cfg.in]
_update_hash_filename_ = instance-gitlab-export.cfg.in _update_hash_filename_ = instance-gitlab-export.cfg.in
......
software/gitlab/instance-gitlab.cfg.in
View file @ aa4541d4
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
# security and performance reasons (unix has 2x less latency and more # security and performance reasons (unix has 2x less latency and more
# throughput compared to tcp over loopback). # throughput compared to tcp over loopback).
[buildout] [buildout]
extends = {{ gitlab_parameters_cfg }} extends =
{{ gitlab_parameters_cfg }}
{{ monitor_template }}
parts = parts =
directory directory
publish-instance-info publish-instance-info
...@@ -105,7 +107,6 @@ srv = ${:home}/srv ...@@ -105,7 +107,6 @@ srv = ${:home}/srv
# slapos startup/service/promise scripts live here: # slapos startup/service/promise scripts live here:
startup = ${:etc}/run startup = ${:etc}/run
service = ${:etc}/service service = ${:etc}/service
promise = ${:etc}/promise
promise.slow = ${:promise}.slow promise.slow = ${:promise}.slow
# gitlab: etc/ log/ ... # gitlab: etc/ log/ ...
...@@ -401,18 +402,12 @@ tune-command = ...@@ -401,18 +402,12 @@ tune-command =
# 5. services # 5. services
# [promise-<something>] to generate promise wrapper <something>
[promise-wrapper]
recipe = slapos.cookbook:wrapper
wrapper-path = !py! '${directory:promise}/' + '${:_buildout_section_name_}'[8:]
# [promise-<something>] to check <something> by url # [promise-<something>] to check <something> by url
[promise-byurl] [promise-byurl]
recipe = slapos.cookbook:check_url_available <= monitor-promise-base
path = !py! '${directory:promise}/' + '${:_buildout_section_name_}'[8:] module = check_url_available
dash_path = {{ bash_bin }} name = !py! '${:_buildout_section_name_}'[8:] + '.py'
curl_path = {{ curl_bin }} config-http_code = 200
http_code = 200
...@@ -452,8 +447,10 @@ depend = ...@@ -452,8 +447,10 @@ depend =
${promise-postgresql:recipe} ${promise-postgresql:recipe}
[promise-postgresql] [promise-postgresql]
<= promise-wrapper <= monitor-base-promise
command-line = module = check_command_execute
name = promise-postgresql.py
config-command =
{{ postgresql_location }}/bin/psql {{ postgresql_location }}/bin/psql
-h ${service-postgresql:pgdata-directory} -h ${service-postgresql:pgdata-directory}
-U ${service-postgresql:superuser} -U ${service-postgresql:superuser}
...@@ -539,7 +536,7 @@ depend = ...@@ -539,7 +536,7 @@ depend =
<= promise-byurl <= promise-byurl
# http://localhost/users/statics.css will not redirect to /users/sign_in anymore because of this commit: # http://localhost/users/statics.css will not redirect to /users/sign_in anymore because of this commit:
# https://lab.nexedi.com/nexedi/gitlab-workhorse/commit/c81f109a62fecf2a847fb17ceed012b380dab49f#c1215002e6d745f05eaaf9ee1dad7752e85d866f_318_331 # https://lab.nexedi.com/nexedi/gitlab-workhorse/commit/c81f109a62fecf2a847fb17ceed012b380dab49f#c1215002e6d745f05eaaf9ee1dad7752e85d866f_318_331
url = --unix-socket ${gitlab-workhorse:socket} http://localhost/users/sign_in config-url = --unix-socket ${gitlab-workhorse:socket} http://localhost/users/sign_in
# gitlab-workhorse logs to stdout/stderr - logs are handled by slapos not us # gitlab-workhorse logs to stdout/stderr - logs are handled by slapos not us
...@@ -581,7 +578,7 @@ depend = ...@@ -581,7 +578,7 @@ depend =
[promise-unicorn] [promise-unicorn]
<= promise-byurl <= promise-byurl
url = --unix-socket ${unicorn:socket} http://localhost/ config-url = --unix-socket ${unicorn:socket} http://localhost/
[promise-rakebase] [promise-rakebase]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
...@@ -728,7 +725,7 @@ depend = ...@@ -728,7 +725,7 @@ depend =
<= promise-byurl <= promise-byurl
# XXX this depends on gitlab-workhorse being up # XXX this depends on gitlab-workhorse being up
# (nginx is configured to proxy all requests to gitlab-workhorse) # (nginx is configured to proxy all requests to gitlab-workhorse)
url = ${backend-info:url}/users/sign_in config-url = ${backend-info:url}/users/sign_in
[logrotate-entry-nginx] [logrotate-entry-nginx]
<= logrotate-entry <= logrotate-entry
......
software/gitlab/instance.cfg.in
View file @ aa4541d4
...@@ -64,6 +64,7 @@ context = ...@@ -64,6 +64,7 @@ context =
raw database_yml_in ${database.yml.in:target} raw database_yml_in ${database.yml.in:target}
raw gitconfig_in ${gitconfig.in:target} raw gitconfig_in ${gitconfig.in:target}
raw gitlab_parameters_cfg ${gitlab-parameters.cfg:target} raw gitlab_parameters_cfg ${gitlab-parameters.cfg:target}
raw monitor_template ${monitor2-template:rendered}
raw gitlab_shell_config_yml_in ${gitlab-shell-config.yml.in:target} raw gitlab_shell_config_yml_in ${gitlab-shell-config.yml.in:target}
raw gitlab_unicorn_startup_in ${gitlab-unicorn-startup.in:target} raw gitlab_unicorn_startup_in ${gitlab-unicorn-startup.in:target}
raw gitlab_yml_in ${gitlab.yml.in:target} raw gitlab_yml_in ${gitlab.yml.in:target}
......
software/gitlab/software.cfg
View file @ aa4541d4
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
extends = extends =
buildout.hash.cfg buildout.hash.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
../../stack/monitor/buildout.cfg
../../component/ruby/buildout.cfg ../../component/ruby/buildout.cfg
../../component/golang/buildout.cfg ../../component/golang/buildout.cfg
../../component/postgresql/buildout.cfg ../../component/postgresql/buildout.cfg
......
software/grafana/buildout.hash.cfg
View file @ aa4541d4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance-profile] [instance-profile]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 7fb6806b139b3a8d0054308397be1dd9 md5sum = 461d515da03de5e422e6f75189d09184
[influxdb-config-file] [influxdb-config-file]
filename = influxdb-config-file.cfg.in filename = influxdb-config-file.cfg.in
......
software/grafana/instance.cfg.in
View file @ aa4541d4
...@@ -3,6 +3,8 @@ parts = ...@@ -3,6 +3,8 @@ parts =
promises promises
publish-connection-parameter publish-connection-parameter
extends = {{ monitor_template }}
eggs-directory = {{ buildout['eggs-directory'] }} eggs-directory = {{ buildout['eggs-directory'] }}
develop-eggs-directory = {{ buildout['develop-eggs-directory'] }} develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
offline = true offline = true
...@@ -33,7 +35,6 @@ etc = ${:home}/etc ...@@ -33,7 +35,6 @@ etc = ${:home}/etc
var = ${:home}/var var = ${:home}/var
srv = ${:home}/srv srv = ${:home}/srv
service = ${:etc}/service service = ${:etc}/service
promise = ${:etc}/promise
influxdb-data-dir = ${:srv}/influxdb influxdb-data-dir = ${:srv}/influxdb
grafana-dir = ${:srv}/grafana grafana-dir = ${:srv}/grafana
grafana-data-dir = ${:grafana-dir}/data grafana-data-dir = ${:grafana-dir}/data
...@@ -70,8 +71,9 @@ mode = 0644 ...@@ -70,8 +71,9 @@ mode = 0644
extensions = jinja2.ext.do extensions = jinja2.ext.do
[check-port-listening-promise] [check-port-listening-promise]
recipe = slapos.cookbook:check_port_listening <= monitor-base-promise
path = ${directory:promise}/${:_buildout_section_name_} module = check_port_listening
name = ${:_buildout_section_name_}.py
...@@ -110,14 +112,15 @@ username = influxdb ...@@ -110,14 +112,15 @@ username = influxdb
[influxdb-listen-promise] [influxdb-listen-promise]
<= check-port-listening-promise <= check-port-listening-promise
hostname = ${influxdb:ipv6} config-hostname = ${influxdb:ipv6}
port = ${influxdb:http-port} config-port = ${influxdb:http-port}
[influxdb-password-promise] [influxdb-password-promise]
recipe = slapos.cookbook:wrapper <= monitor-base-promise
command-line = module = check_command_execute
name = ${:_buildout_section_name_}.py
config-command =
{{ influx_bin }} -username ${influxdb:auth-username} -password ${influxdb:auth-password} -socket ${influxdb:unix-socket} -execute "CREATE USER ${influxdb:auth-username} WITH PASSWORD '${influxdb:auth-password}' WITH ALL PRIVILEGES" {{ influx_bin }} -username ${influxdb:auth-username} -password ${influxdb:auth-password} -socket ${influxdb:unix-socket} -execute "CREATE USER ${influxdb:auth-username} WITH PASSWORD '${influxdb:auth-password}' WITH ALL PRIVILEGES"
wrapper-path = ${directory:promise}/${:_buildout_section_name_}
...@@ -160,8 +163,8 @@ context = ...@@ -160,8 +163,8 @@ context =
[grafana-listen-promise] [grafana-listen-promise]
<= check-port-listening-promise <= check-port-listening-promise
hostname= ${grafana:ipv6} config-hostname= ${grafana:ipv6}
port = ${grafana:port} config-port = ${grafana:port}
......
software/grafana/software.cfg
View file @ aa4541d4
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
extends = extends =
../../stack/slapos.cfg ../../stack/slapos.cfg
../../stack/nodejs.cfg ../../stack/nodejs.cfg
../../stack/monitor/buildout.cfg
../../component/make/buildout.cfg ../../component/make/buildout.cfg
../../component/golang/buildout.cfg ../../component/golang/buildout.cfg
../../component/openssl/buildout.cfg ../../component/openssl/buildout.cfg
...@@ -105,6 +106,7 @@ context = ...@@ -105,6 +106,7 @@ context =
key influx_bin gowork:influx-bin key influx_bin gowork:influx-bin
key grafana_bin gowork:grafana-bin key grafana_bin gowork:grafana-bin
key grafana_homepath gowork:grafana-homepath key grafana_homepath gowork:grafana-homepath
key monitor_template monitor2-template:rendered
[versions] [versions]
......
software/helloworld/buildout.hash.cfg
View file @ aa4541d4
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
# not need these here). # not need these here).
[instance-profile] [instance-profile]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 6567f8dedb5cdd93542dc29e96edb547 md5sum = cc8902e44c1d50804b570775633b8c2a
software/helloworld/instance.cfg.in
View file @ aa4541d4
...@@ -15,6 +15,7 @@ eggs-directory = {{ buildout['eggs-directory'] }} ...@@ -15,6 +15,7 @@ eggs-directory = {{ buildout['eggs-directory'] }}
develop-eggs-directory = {{ buildout['develop-eggs-directory'] }} develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
offline = true offline = true
extends = {{ template_monitor }}
[instance-parameter] [instance-parameter]
# Fetch arbitrary parameters defined by the user in SlapOS Master for his instance. # Fetch arbitrary parameters defined by the user in SlapOS Master for his instance.
...@@ -51,9 +52,6 @@ var = ${:home}/var ...@@ -51,9 +52,6 @@ var = ${:home}/var
script = ${:etc}/run/ script = ${:etc}/run/
# Executables put here will be started and monitored (for daemons) # Executables put here will be started and monitored (for daemons)
service = ${:etc}/service service = ${:etc}/service
# Executables put here will be launched after buildout has completed to see
# if instance is running
promise = ${:etc}/promise/
# Path of the log directory used by our service (see [helloweb]) # Path of the log directory used by our service (see [helloweb])
log = ${:var}/log log = ${:var}/log
...@@ -88,8 +86,9 @@ wrapper-path = ${directory:service}/helloweb-${:kind} ...@@ -88,8 +86,9 @@ wrapper-path = ${directory:service}/helloweb-${:kind}
# promise, that checks that helloweb service is alive # promise, that checks that helloweb service is alive
[helloweb-promise] [helloweb-promise]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
path = ${directory:promise}/helloweb-${:kind} module = check_port_listening
name = helloweb-${:kind}.py
{# macro to instantiate service of `kind` to listen on `port` #} {# macro to instantiate service of `kind` to listen on `port` #}
{% set service_list = [] %} {% set service_list = [] %}
...@@ -103,8 +102,8 @@ port = {{ port }} ...@@ -103,8 +102,8 @@ port = {{ port }}
[helloweb-{{ kind }}-promise] [helloweb-{{ kind }}-promise]
<= helloweb-promise <= helloweb-promise
kind = {{ kind }} kind = {{ kind }}
hostname= ${helloweb-{{ kind }}:ipv6} config-hostname= ${helloweb-{{ kind }}:ipv6}
port = {{ port }} config-port = {{ port }}
{% endmacro %} {% endmacro %}
# services instantiation # services instantiation
......
software/helloworld/software.cfg
View file @ aa4541d4
...@@ -7,6 +7,7 @@ extends = ...@@ -7,6 +7,7 @@ extends =
# "slapos" stack describes basic things needed for 99.9% of SlapOS Software # "slapos" stack describes basic things needed for 99.9% of SlapOS Software
# Releases # Releases
../../stack/slapos.cfg ../../stack/slapos.cfg
../../stack/monitor/buildout.cfg
# Extend here component profiles, like openssl, apache, mariadb, curl... # Extend here component profiles, like openssl, apache, mariadb, curl...
# Or/and extend a stack (lamp, tomcat) that does most of the work for you # Or/and extend a stack (lamp, tomcat) that does most of the work for you
# In this example we extend from helloweb component. # In this example we extend from helloweb component.
...@@ -46,6 +47,7 @@ rendered = ${buildout:directory}/instance.cfg ...@@ -46,6 +47,7 @@ rendered = ${buildout:directory}/instance.cfg
extensions = jinja2.ext.do extensions = jinja2.ext.do
context = context =
section buildout buildout section buildout buildout
raw template_monitor ${monitor2-template:rendered}
# md5sum is fetched from buildout.hash.cfg and can be recalculated automatically by # md5sum is fetched from buildout.hash.cfg and can be recalculated automatically by
# calling update-hash # calling update-hash
......
software/htmlvalidatorserver/buildout.hash.cfg
View file @ aa4541d4
...@@ -22,7 +22,7 @@ md5sum = 09803fb71404edbccb32c44a0040dae4 ...@@ -22,7 +22,7 @@ md5sum = 09803fb71404edbccb32c44a0040dae4
[template-validator] [template-validator]
filename = instance-validator.cfg.in filename = instance-validator.cfg.in
md5sum = 0275d7a8a021f84a1303e5c8933c07c3 md5sum = f2609d1f526ba6349b1374e3631a9f7c
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
......
software/htmlvalidatorserver/instance-validator.cfg.in
View file @ aa4541d4
...@@ -11,7 +11,6 @@ run = $${:var}/run ...@@ -11,7 +11,6 @@ run = $${:var}/run
log = $${:var}/log log = $${:var}/log
# scripts = $${:etc}/run # scripts = $${:etc}/run
services = $${:etc}/service services = $${:etc}/service
promises = $${:etc}/promise
# tomcat directories # tomcat directories
catalina_base = $${:var}/vnu catalina_base = $${:var}/vnu
catalina_logs = $${:catalina_base}/logs catalina_logs = $${:catalina_base}/logs
...@@ -55,10 +54,11 @@ port = 8899 ...@@ -55,10 +54,11 @@ port = 8899
scheme = https scheme = https
[tomcat-listen-promise] [tomcat-listen-promise]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
hostname = $${tomcat-configuration:ip} module = check_port_listening
port = $${tomcat-configuration:port} name = tomcat_listen.py
path = $${basedirectory:promises}/tomcat_listen config-hostname = $${tomcat-configuration:ip}
config-port = $${tomcat-configuration:port}
################################# #################################
# Slapos publish # Slapos publish
......
software/jstestnode/buildout.hash.cfg
View file @ aa4541d4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 2a79bb6c4f593d7c4c7f4e0de97d9803 md5sum = 1d6bb3263f642a115982ddf245cb1cf0
[template-nginx-service] [template-nginx-service]
filename = template-nginx-service.sh.in filename = template-nginx-service.sh.in
......
software/jstestnode/instance.cfg.in
View file @ aa4541d4
...@@ -22,7 +22,6 @@ log = $${:var}/log ...@@ -22,7 +22,6 @@ log = $${:var}/log
varnginx = $${:var}/nginx varnginx = $${:var}/nginx
scripts = $${:etc}/run scripts = $${:etc}/run
services = $${:etc}/service services = $${:etc}/service
promise = $${:etc}/promise/
www = $${:srv}/www www = $${:srv}/www
home = $${:etc}/home home = $${:etc}/home
ssl = $${:etc}/ssl ssl = $${:etc}/ssl
......
software/jupyter/buildout.hash.cfg
View file @ aa4541d4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance-jupyter-notebook] [instance-jupyter-notebook]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 78625cff193d7fdadd57670d30bc9a0d md5sum = ba4e4c582b81deeb7339a13c82bbf34b
[jupyter-notebook-config] [jupyter-notebook-config]
filename = jupyter_notebook_config.py.jinja filename = jupyter_notebook_config.py.jinja
......
software/jupyter/instance.cfg.in
View file @ aa4541d4
...@@ -90,7 +90,6 @@ etc = ${:home}/etc ...@@ -90,7 +90,6 @@ etc = ${:home}/etc
var = ${:home}/var var = ${:home}/var
script = ${:etc}/run/ script = ${:etc}/run/
service = ${:etc}/service service = ${:etc}/service
promise = ${:etc}/promise/
log = ${:var}/log log = ${:var}/log
notebook_dir = ${:var}/notebooks notebook_dir = ${:var}/notebooks
# Add folders to explicitly define jupyter directory # Add folders to explicitly define jupyter directory
......
software/kvm/buildout.hash.cfg
View file @ aa4541d4
...@@ -19,19 +19,19 @@ md5sum = 2cbfd6b08c65369c1d45cf3ba2ff335a ...@@ -19,19 +19,19 @@ md5sum = 2cbfd6b08c65369c1d45cf3ba2ff335a
[template-kvm] [template-kvm]
filename = instance-kvm.cfg.jinja2 filename = instance-kvm.cfg.jinja2
md5sum = bcd3705e510da52e7ddf1e1527839642 md5sum = 36e7a8656e52d3aace8d9e52dcb3864e
[template-kvm-cluster] [template-kvm-cluster]
filename = instance-kvm-cluster.cfg.jinja2.in filename = instance-kvm-cluster.cfg.jinja2.in
md5sum = 352f18067714501c8ccee55f8930d245 md5sum = 2e743132ba4e001f784791311df9ba6a
[template-kvm-resilient] [template-kvm-resilient]
filename = instance-kvm-resilient.cfg.jinja2 filename = instance-kvm-resilient.cfg.jinja2
md5sum = 7d4b14660b7a30084aa7e023b0db50be md5sum = e50e45c3097ed5a7115817fbc967f173
[template-kvm-import] [template-kvm-import]
filename = instance-kvm-import.cfg.jinja2.in filename = instance-kvm-import.cfg.jinja2.in
md5sum = dc3f3ad9ebd8b3b5c3ded57b91cee9c7 md5sum = 97a8ff8a5891678274b14481dfc5214c
[template-kvm-import-script] [template-kvm-import-script]
filename = template/kvm-import.sh.jinja2 filename = template/kvm-import.sh.jinja2
...@@ -47,7 +47,7 @@ md5sum = b617d64de73de1eed518185f310bbc82 ...@@ -47,7 +47,7 @@ md5sum = b617d64de73de1eed518185f310bbc82
[template-nbd] [template-nbd]
filename = instance-nbd.cfg.in filename = instance-nbd.cfg.in
md5sum = f634a5249b773658b7a7bc9fa9bb0368 md5sum = a05b581d65768ac55faf3b06d4aec447
[template-ansible-promise] [template-ansible-promise]
filename = template/ansible-promise.in filename = template/ansible-promise.in
...@@ -79,4 +79,4 @@ md5sum = 599dbbbd438fe7801e3f8642ae9e9a78 ...@@ -79,4 +79,4 @@ md5sum = 599dbbbd438fe7801e3f8642ae9e9a78
[template-httpd] [template-httpd]
filename = instance-kvm-http.cfg.in filename = instance-kvm-http.cfg.in
md5sum = 26a181a48046ce88570adb32334747ef md5sum = d657884d02105deffddee0edae4b50a6
software/kvm/instance-kvm-cluster.cfg.jinja2.in
View file @ aa4541d4
...@@ -229,7 +229,6 @@ log = ${:var}/log ...@@ -229,7 +229,6 @@ log = ${:var}/log
scripts = ${:etc}/run scripts = ${:etc}/run
services = ${:etc}/service services = ${:etc}/service
webroot = ${:srv}/document webroot = ${:srv}/document
promises = ${:etc}/promise
ssl = ${:etc}/ssl ssl = ${:etc}/ssl
[directory-doc] [directory-doc]
......
software/kvm/instance-kvm-http.cfg.in
View file @ aa4541d4
...@@ -14,7 +14,6 @@ public = ${:srv}/public/ ...@@ -14,7 +14,6 @@ public = ${:srv}/public/
log = ${:var}/log log = ${:var}/log
services = ${:etc}/service services = ${:etc}/service
scripts = ${:etc}/run scripts = ${:etc}/run
promises = ${:etc}/promise
run = ${:var}/run run = ${:var}/run
document = ${:srv}/document document = ${:srv}/document
ssl = ${:etc}/ssl ssl = ${:etc}/ssl
...@@ -65,7 +64,8 @@ update-command = ...@@ -65,7 +64,8 @@ update-command =
stop-on-error = true stop-on-error = true
[httpd-promise] [httpd-promise]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
path = ${directory:promises}/apache-httpd module = check_port_listening
hostname = ${apache-conf:ip} name = apache-httpd.py
port = ${apache-conf:port} config-hostname = ${apache-conf:ip}
\ No newline at end of file config-port = ${apache-conf:port}
software/kvm/instance-kvm-import.cfg.jinja2.in
View file @ aa4541d4
...@@ -41,7 +41,6 @@ var = ${buildout:directory}/var ...@@ -41,7 +41,6 @@ var = ${buildout:directory}/var
log = ${:var}/log log = ${:var}/log
scripts = ${:etc}/run scripts = ${:etc}/run
services = ${:etc}/service services = ${:etc}/service
promises = ${:etc}/promise
novnc-conf = ${:etc}/novnc novnc-conf = ${:etc}/novnc
run = ${:var}/run run = ${:var}/run
ca-dir = ${:srv}/ssl ca-dir = ${:srv}/ssl
...@@ -63,8 +62,7 @@ context = ...@@ -63,8 +62,7 @@ context =
backup-disk-path = ${directory:backup}/virtual.qcow2 backup-disk-path = ${directory:backup}/virtual.qcow2
[kvm-disk-image-corruption-promise] [kvm-disk-image-corruption-bin]
# Check that disk image is not corrupted
recipe = collective.recipe.template recipe = collective.recipe.template
input = inline:#!/bin/sh input = inline:#!/bin/sh
QEMU_IMAGE="${directory:srv}/virtual.qcow2" QEMU_IMAGE="${directory:srv}/virtual.qcow2"
...@@ -78,5 +76,12 @@ input = inline:#!/bin/sh ...@@ -78,5 +76,12 @@ input = inline:#!/bin/sh
else else
exit 1 exit 1
fi fi
output = ${directory:promises}/kvm-disk-image-corruption output = ${directory:bin}/kvm-disk-image-corruption
mode = 700 mode = 700
[kvm-disk-image-corruption-promise]
# Check that disk image is not corrupted
<= monitor-promise-base
module = check_command_execute
name = kvm-disk-image-corruption.py
config-command = ${kvm-disk-image-corruption-bin:output}
software/kvm/instance-kvm-resilient.cfg.jinja2
View file @ aa4541d4
...@@ -57,7 +57,6 @@ cors-domains = {{ monitor_parameter.get('monitor-cors-domains', '') }} ...@@ -57,7 +57,6 @@ cors-domains = {{ monitor_parameter.get('monitor-cors-domains', '') }}
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
etc = ${buildout:directory}/etc etc = ${buildout:directory}/etc
promises = ${:etc}/promise
# Bubble down the parameters of the requested instance to the user # Bubble down the parameters of the requested instance to the user
[request-kvm] [request-kvm]
...@@ -83,21 +82,26 @@ monitor-base-url = ${monitor-publish-parameters:monitor-base-url} ...@@ -83,21 +82,26 @@ monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${publish-early:monitor-password} monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${publish-early:monitor-password}
{% endif -%} {% endif -%}
[kvm-frontend-url-promise] [kvm-frontend-url-bin]
# Check that url parameter is complete
recipe = collective.recipe.template recipe = collective.recipe.template
input = inline:#!/bin/sh input = inline:#!/bin/sh
URL="${request-kvm:connection-url}" URL="${request-kvm:connection-url}"
if [[ ! "$URL" == https://* ]]; then if [[ ! "$URL" == https://* ]]; then
exit 1 exit 1
fi fi
output = ${resilient-directory:promise}/kvm-frontend-url output = ${directory:bin}/kvm-frontend-url
mode = 700 mode = 700
[kvm-frontend-url-promise]
# Check that url parameter is complete
<= monitor-promise-base
module = check_command_execute
name = kvm-frontend-url.py
config-command = ${kvm-frontend-url-bin:output}
[kvm-backend-url-promise] [kvm-backend-url-promise]
# Check that backend url is reachable # Check that backend url is reachable
recipe = slapos.cookbook:check_url_available <= monitor-promise-base
path = ${directory:promises}/frontend_promise module = check_url_available
url = ${publish-connection-information:url} name = frontend_promise.py
dash_path = /bin/sh config-url = ${publish-connection-information:url}
curl_path = {{ curl_executable_location }}
software/kvm/instance-kvm.cfg.jinja2
View file @ aa4541d4
...@@ -40,7 +40,6 @@ var = ${buildout:directory}/var ...@@ -40,7 +40,6 @@ var = ${buildout:directory}/var
log = ${:var}/log log = ${:var}/log
scripts = ${:etc}/run scripts = ${:etc}/run
services = ${:etc}/service services = ${:etc}/service
promises = ${:etc}/promise
novnc-conf = ${:etc}/novnc novnc-conf = ${:etc}/novnc
run = ${:var}/run run = ${:var}/run
prerm = ${:etc}/prerm prerm = ${:etc}/prerm
...@@ -216,13 +215,13 @@ command-line = ${kvm-controller:rendered} ...@@ -216,13 +215,13 @@ command-line = ${kvm-controller:rendered}
[kvm-vnc-promise] [kvm-vnc-promise]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
path = ${directory:promises}/vnc_promise module = check_port_listening
hostname = ${kvm-parameter-dict:vnc-ip} name = vnc_promise.py
port = ${kvm-parameter-dict:vnc-port} config-hostname = ${kvm-parameter-dict:vnc-ip}
config-port = ${kvm-parameter-dict:vnc-port}
[kvm-disk-image-corruption-promise] [kvm-disk-image-corruption-bin]
# Check that disk image is not corrupted
recipe = collective.recipe.template recipe = collective.recipe.template
input = inline:#!/bin/sh input = inline:#!/bin/sh
# Return code 0 is "OK" # Return code 0 is "OK"
...@@ -239,9 +238,16 @@ input = inline:#!/bin/sh ...@@ -239,9 +238,16 @@ input = inline:#!/bin/sh
else else
exit 1 exit 1
fi fi
output = ${directory:promises}/kvm-disk-image-corruption output = ${directory:bin}/kvm-disk-image-corruption
mode = 700 mode = 700
[kvm-disk-image-corruption-promise]
# Check that disk image is not corrupted
<= monitor-promise-base
module = check_command_execute
name = kvm-disk-image-corruption.py
config-command = ${kvm-disk-image-corruption-bin:output}
{% if wipe_disk == 'true' -%} {% if wipe_disk == 'true' -%}
{% do part_list.append('wipe-disk-wrapper') -%} {% do part_list.append('wipe-disk-wrapper') -%}
{% set wipe_file_list = '${kvm-parameter-dict:disk-path}' -%} {% set wipe_file_list = '${kvm-parameter-dict:disk-path}' -%}
...@@ -255,16 +261,22 @@ command-line = ...@@ -255,16 +261,22 @@ command-line =
{{ wipe_disk_wrapper }} -n {{ slapparameter_dict.get('wipe-disk-iterations', 1) }} -suz --check-pid-file ${kvm-parameter-dict:pid-file-path} --file {{ wipe_file_list }} {{ wipe_disk_wrapper }} -n {{ slapparameter_dict.get('wipe-disk-iterations', 1) }} -suz --check-pid-file ${kvm-parameter-dict:pid-file-path} --file {{ wipe_file_list }}
{% endif -%} {% endif -%}
[kvm-started-promise] [kvm-started-bin]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = {{ qemu_start_promise_tpl }} template = {{ qemu_start_promise_tpl }}
rendered = ${directory:promises}/qemu-virtual-machine-is-ready rendered = ${directory:bin}/qemu-virtual-machine-is-ready
mode = 700 mode = 700
context = context =
raw dash {{ dash_executable_location }} raw dash {{ dash_executable_location }}
raw qemu_ready_path ${kvm-controller-parameter-dict:kvm-status-path} raw qemu_ready_path ${kvm-controller-parameter-dict:kvm-status-path}
raw qemu_service_log_file ${buildout:directory}/.${slap-connection:partition-id}_kvm.log raw qemu_service_log_file ${buildout:directory}/.${slap-connection:partition-id}_kvm.log
[kvm-started-promise]
<= monitor-promise-base
module = check_command_execute
name = qemu-virtual-machine-is-ready.py
config-command = ${kvm-started-bin:rendered}
[novnc-instance] [novnc-instance]
recipe = slapos.cookbook:novnc recipe = slapos.cookbook:novnc
path = ${ca-novnc:executable} path = ${ca-novnc:executable}
...@@ -325,10 +337,11 @@ executable = ${directory:bin}/novnc ...@@ -325,10 +337,11 @@ executable = ${directory:bin}/novnc
wrapper = ${directory:bin}/websockify wrapper = ${directory:bin}/websockify
[novnc-promise] [novnc-promise]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
path = ${directory:promises}/novnc_promise module = check_port_listening
hostname = ${novnc-instance:ip} name = novnc_promise.py
port = ${novnc-instance:port} config-hostname = ${novnc-instance:ip}
config-port = ${novnc-instance:port}
#---------------- #----------------
...@@ -380,11 +393,10 @@ name = ${slap-parameter:frontend-instance-name} ...@@ -380,11 +393,10 @@ name = ${slap-parameter:frontend-instance-name}
sla-instance_guid = ${slap-parameter:frontend-instance-guid} sla-instance_guid = ${slap-parameter:frontend-instance-guid}
[frontend-promise] [frontend-promise]
recipe = slapos.cookbook:check_url_available <= monitor-promise-base
path = ${directory:promises}/frontend_promise module = check_url_available
url = ${publish-connection-information:url} name = frontend_promise.py
dash_path = {{ dash_executable_location }} config-url = ${publish-connection-information:url}
curl_path = {{ curl_executable_location }}
{% if additional_frontend %} {% if additional_frontend %}
[request-slave-frontend-additional] [request-slave-frontend-additional]
...@@ -395,11 +407,10 @@ name = ${slap-parameter:frontend-additional-instance-name} ...@@ -395,11 +407,10 @@ name = ${slap-parameter:frontend-additional-instance-name}
sla-instance_guid = ${slap-parameter:frontend-additional-instance-guid} sla-instance_guid = ${slap-parameter:frontend-additional-instance-guid}
[frontend-additional-promise] [frontend-additional-promise]
recipe = slapos.cookbook:check_url_available <= monitor-promise-base
path = ${directory:promises}/frontend_additional_promise module = check_url_available
url = ${publish-connection-information:url-additional} name = frontend_additional_promise.py
dash_path = {{ dash_executable_location }} config-url = ${publish-connection-information:url-additional}
curl_path = {{ curl_executable_location }}
{% endif %} {% endif %}
{% if enable_http == 'true' %} {% if enable_http == 'true' %}
...@@ -419,10 +430,11 @@ wrapper-path = ${directory:services}/http-server ...@@ -419,10 +430,11 @@ wrapper-path = ${directory:services}/http-server
hash-existing-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[httpd-promise] [httpd-promise]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
path = ${directory:promises}/httpd module = check_port_listening
hostname = ${httpd:host} name = httpd.py
port = ${httpd:port} config-hostname = ${httpd:host}
config-port = ${httpd:port}
{% endif %} {% endif %}
[monitor-instance-parameter] [monitor-instance-parameter]
...@@ -679,15 +691,21 @@ command-line = ${tunnel-cluster-url:runner-path} ...@@ -679,15 +691,21 @@ command-line = ${tunnel-cluster-url:runner-path}
wrapper-path = ${directory:services}/6tunnel-cluster wrapper-path = ${directory:services}/6tunnel-cluster
hash-existing-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[ansible-vm-promise] [ansible-vm-bin]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = {{ ansible_promise_tpl }} template = {{ ansible_promise_tpl }}
rendered = ${directory:promises}/ansible_{{ name }} rendered = ${directory:bin}/ansible_{{ name }}
extensions = jinja2.ext.do extensions = jinja2.ext.do
context = context =
raw logs ${directory:public}/ansible raw logs ${directory:public}/ansible
raw name {{ name }} raw name {{ name }}
[ansible-vm-promise]
<= monitor-promise-base
module = check_execute_comand
name = ansible_{{ name }}.py
config-command = ${ansible-vm-bin:rendered}
[download-bootstrap-script] [download-bootstrap-script]
recipe = plone.recipe.command recipe = plone.recipe.command
file-location = ${directory:public}/vm-bootstrap file-location = ${directory:public}/vm-bootstrap
......
software/kvm/instance-nbd.cfg.in
View file @ aa4541d4
...@@ -23,7 +23,6 @@ log = $${buildout:directory}/log ...@@ -23,7 +23,6 @@ log = $${buildout:directory}/log
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
services = $${rootdirectory:etc}/run services = $${rootdirectory:etc}/run
watched-services = $${rootdirectory:etc}/service watched-services = $${rootdirectory:etc}/service
promises = $${rootdirectory:etc}/promise
[nbd-instance] [nbd-instance]
recipe = slapos.cookbook:nbdserver recipe = slapos.cookbook:nbdserver
...@@ -36,10 +35,11 @@ shell-path = ${dash:location}/bin/dash ...@@ -36,10 +35,11 @@ shell-path = ${dash:location}/bin/dash
path = $${basedirectory:services}/nbdserver path = $${basedirectory:services}/nbdserver
[nbd-promise] [nbd-promise]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
path = $${basedirectory:promises}/nbd_promise module = check_port_listening
hostname = $${nbd-instance:ip} name = nbd_promise.py
port = $${nbd-instance:port} config-hostname = $${nbd-instance:ip}
config-port = $${nbd-instance:port}
[gen-passwd] [gen-passwd]
recipe = slapos.cookbook:generate.password recipe = slapos.cookbook:generate.password
...@@ -58,10 +58,11 @@ path = $${basedirectory:watched-services}/onetimeupload ...@@ -58,10 +58,11 @@ path = $${basedirectory:watched-services}/onetimeupload
key = $${gen-passwd:passwd} key = $${gen-passwd:passwd}
[onetimeupload-promise] [onetimeupload-promise]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
path = $${basedirectory:promises}/onetimeupload_promise module = check_port_listening
hostname = $${onetimeupload-instance:ip} name = onetimeupload_promise.py
port = $${onetimeupload-instance:port} config-hostname = $${onetimeupload-instance:ip}
config-port = $${onetimeupload-instance:port}
[publish-connection-information] [publish-connection-information]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
......
software/kvm/test/test.py
View file @ aa4541d4
...@@ -28,22 +28,46 @@ ...@@ -28,22 +28,46 @@
import httplib import httplib
import json import json
import os import os
import re
import requests import requests
import slapos.util import slapos.util
import subprocess
import sqlite3 import sqlite3
import urlparse import urlparse
import unittest
from slapos.recipe.librecipe import generateHashFromFiles from slapos.recipe.librecipe import generateHashFromFiles
from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
setUpModule, InstanceTestCase = makeModuleSetUpAndTestCaseClass( def sanityCheck():
try:
output = subprocess.check_output("lsmod | grep kvm_intel", shell=True)
except subprocess.CalledProcessError as e:
state = False
output = e.output
else:
state = True
if state is True and re.search(r'kvm.*kvm_intel', output):
return True
if sanityCheck():
setUpModule, InstanceTestCase = makeModuleSetUpAndTestCaseClass(
os.path.abspath( os.path.abspath(
os.path.join(os.path.dirname(__file__), '..', 'software.cfg'))) os.path.join(os.path.dirname(__file__), '..', 'software.cfg')))
else:
setUpModule, InstanceTestCase = None, unittest.TestCase
class SanityCheckTestCase(unittest.TestCase):
def test_kvm_sanity_check(self):
if not(sanityCheck()):
self.fail('This environment is not usable for kvm testing, as it '
'lacks kvm_intel kernel module')
class ServicesTestCase(InstanceTestCase):
@unittest.skipIf(not sanityCheck(), 'missing kvm_intel module')
class ServicesTestCase(InstanceTestCase):
def test_hashes(self): def test_hashes(self):
hash_files = [ hash_files = [
'software_release/buildout.cfg', 'software_release/buildout.cfg',
...@@ -138,6 +162,7 @@ class MonitorAccessMixin(object): ...@@ -138,6 +162,7 @@ class MonitorAccessMixin(object):
) )
@unittest.skipIf(not sanityCheck(), 'missing kvm_intel module')
class TestAccessDefault(MonitorAccessMixin, InstanceTestCase): class TestAccessDefault(MonitorAccessMixin, InstanceTestCase):
__partition_reference__ = 'ad' __partition_reference__ = 'ad'
expected_partition_with_monitor_base_url_count = 1 expected_partition_with_monitor_base_url_count = 1
...@@ -154,6 +179,7 @@ class TestAccessDefault(MonitorAccessMixin, InstanceTestCase): ...@@ -154,6 +179,7 @@ class TestAccessDefault(MonitorAccessMixin, InstanceTestCase):
self.assertFalse('url-additional' in connection_parameter_dict) self.assertFalse('url-additional' in connection_parameter_dict)
@unittest.skipIf(not sanityCheck(), 'missing kvm_intel module')
class TestAccessDefaultAdditional(MonitorAccessMixin, InstanceTestCase): class TestAccessDefaultAdditional(MonitorAccessMixin, InstanceTestCase):
__partition_reference__ = 'ada' __partition_reference__ = 'ada'
expected_partition_with_monitor_base_url_count = 1 expected_partition_with_monitor_base_url_count = 1
...@@ -184,6 +210,7 @@ class TestAccessDefaultAdditional(MonitorAccessMixin, InstanceTestCase): ...@@ -184,6 +210,7 @@ class TestAccessDefaultAdditional(MonitorAccessMixin, InstanceTestCase):
self.assertTrue('<title>noVNC</title>' in result.text) self.assertTrue('<title>noVNC</title>' in result.text)
@unittest.skipIf(not sanityCheck(), 'missing kvm_intel module')
class TestAccessKvmCluster(MonitorAccessMixin, InstanceTestCase): class TestAccessKvmCluster(MonitorAccessMixin, InstanceTestCase):
__partition_reference__ = 'akc' __partition_reference__ = 'akc'
expected_partition_with_monitor_base_url_count = 2 expected_partition_with_monitor_base_url_count = 2
...@@ -214,6 +241,7 @@ class TestAccessKvmCluster(MonitorAccessMixin, InstanceTestCase): ...@@ -214,6 +241,7 @@ class TestAccessKvmCluster(MonitorAccessMixin, InstanceTestCase):
self.assertFalse('kvm0-url-additional' in connection_parameter_dict) self.assertFalse('kvm0-url-additional' in connection_parameter_dict)
@unittest.skipIf(not sanityCheck(), 'missing kvm_intel module')
class TestAccessKvmClusterAdditional(MonitorAccessMixin, InstanceTestCase): class TestAccessKvmClusterAdditional(MonitorAccessMixin, InstanceTestCase):
__partition_reference__ = 'akca' __partition_reference__ = 'akca'
expected_partition_with_monitor_base_url_count = 2 expected_partition_with_monitor_base_url_count = 2
......
software/monitor/buildout.hash.cfg
View file @ aa4541d4
...@@ -18,7 +18,7 @@ md5sum = 1b7d2d097f208f6641bf98a17df079c8 ...@@ -18,7 +18,7 @@ md5sum = 1b7d2d097f208f6641bf98a17df079c8
[template-monitor] [template-monitor]
_update_hash_filename_ = instance-monitor.cfg.jinja2 _update_hash_filename_ = instance-monitor.cfg.jinja2
md5sum = dffe797be3a66d6838ffc70ee8f5f3ff md5sum = 373c79480e6425c20480fc911a56c3fd
[template-monitor-distributor] [template-monitor-distributor]
_update_hash_filename_ = instance-monitor-distributor.cfg.jinja2 _update_hash_filename_ = instance-monitor-distributor.cfg.jinja2
......
software/monitor/instance-monitor.cfg.jinja2
View file @ aa4541d4
...@@ -80,12 +80,10 @@ command-line = ...@@ -80,12 +80,10 @@ command-line =
wrapper-path = ${monitor-directory:bin}/monitor-collect-csv-dump wrapper-path = ${monitor-directory:bin}/monitor-collect-csv-dump
[monitor-check-memory-usage] [monitor-check-memory-usage]
recipe = slapos.cookbook:wrapper <= monitor-promise-base
command-line = {{ buildout_bin}}/check-computer-memory module = check_command_execute
-db ${monitor-instance-parameter:collector-db} name = check-computer-memory-usage.py
--threshold ${slap-parameter:memory-percent-threshold} config-command = {{ buildout_bin}}/check-computer-memory -db ${monitor-instance-parameter:collector-db} --threshold ${slap-parameter:memory-percent-threshold} --unit percent
--unit percent
wrapper-path = ${directory:promises}/check-computer-memory-usage
[monitor-check-cpu-usage] [monitor-check-cpu-usage]
recipe = slapos.cookbook:promise.plugin recipe = slapos.cookbook:promise.plugin
......
software/nayuos/buildout.hash.cfg
View file @ aa4541d4
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
# not need these here). # not need these here).
[template-instance] [template-instance]
filename = instance.cfg filename = instance.cfg
md5sum = 7e9deae78923ab7805c0d10d0d6fe336 md5sum = ae26da39d6a156a6164782086d6aa00d
software/nayuos/instance.cfg
View file @ aa4541d4
...@@ -6,12 +6,14 @@ ...@@ -6,12 +6,14 @@
[buildout] [buildout]
parts = parts =
monitor-base
parameters parameters
promise-sudo-on-host promise-sudo-on-host
template-full-build-script template-full-build-script
template-sudo-wrapper template-sudo-wrapper
template-cros-sdk-wrapper template-cros-sdk-wrapper
extends = {{ monitor_template }}
# standard declaration of eggs directories # standard declaration of eggs directories
eggs-directory = {{ eggs_directory }} eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }} develop-eggs-directory = {{ develop_eggs_directory }}
...@@ -54,7 +56,6 @@ cert = ${slap_connection:cert_file} ...@@ -54,7 +56,6 @@ cert = ${slap_connection:cert_file}
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
log = ${buildout:directory}/var/log log = ${buildout:directory}/var/log
run = ${buildout:directory}/etc/run run = ${buildout:directory}/etc/run
promise = ${buildout:directory}/etc/promise
wrapper_dir = ${buildout:directory}/wrapper_bin wrapper_dir = ${buildout:directory}/wrapper_bin
cros_location = ${buildout:directory}/parts/chromiumos cros_location = ${buildout:directory}/parts/chromiumos
...@@ -64,12 +65,18 @@ wrapper_cros_sdk=${directory:wrapper_dir}/wrapper_cros_sdk ...@@ -64,12 +65,18 @@ wrapper_cros_sdk=${directory:wrapper_dir}/wrapper_cros_sdk
bash=/bin/bash bash=/bin/bash
sudo=/usr/bin/sudo sudo=/usr/bin/sudo
[promise-sudo-on-host] [promise-sudo-on-host-bin]
# assert sudo is installed, as it is required to enter the chroot 'cros_sdk'
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:promise}/${:_buildout_section_name_} wrapper-path = ${directory:bin}/${:_buildout_section_name_}
command-line = sudo -V command-line = sudo -V
[promise-sudo-on-host]
# assert sudo is installed, as it is required to enter the chroot 'cros_sdk'
<= monitor-promise-base
module = check_command_execute
name = ${:_buildout_section_name_}.py
config-command = ${promise-sudo-on-host-bin:wrapper-path}
[template-sudo-wrapper] [template-sudo-wrapper]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = {{ software_dir }}/scripts/wrapper_sudo.in template = {{ software_dir }}/scripts/wrapper_sudo.in
......
software/nayuos/software.cfg
View file @ aa4541d4
...@@ -3,6 +3,7 @@ extends = ...@@ -3,6 +3,7 @@ extends =
buildout.hash.cfg buildout.hash.cfg
# basic needs # basic needs
../../stack/slapos.cfg ../../stack/slapos.cfg
../../stack/monitor/buildout.cfg
../../component/automake/buildout.cfg ../../component/automake/buildout.cfg
../../component/libexpat/buildout.cfg ../../component/libexpat/buildout.cfg
../../component/libaio/buildout.cfg ../../component/libaio/buildout.cfg
...@@ -35,6 +36,7 @@ context = ...@@ -35,6 +36,7 @@ context =
key eggs_directory buildout:eggs-directory key eggs_directory buildout:eggs-directory
key develop_eggs_directory buildout:develop-eggs-directory key develop_eggs_directory buildout:develop-eggs-directory
key thin_provisioning_tools thin-provisioning-tools:location key thin_provisioning_tools thin-provisioning-tools:location
key monitor_template monitor2-template:rendered
[thin-provisioning-tools] [thin-provisioning-tools]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
......
software/nextcloud/buildout.hash.cfg
View file @ aa4541d4
...@@ -26,4 +26,4 @@ md5sum = fbc5eacda192cb02c8d9861cb628fe6f ...@@ -26,4 +26,4 @@ md5sum = fbc5eacda192cb02c8d9861cb628fe6f
[template-nextcloud-instance] [template-nextcloud-instance]
filename = nextcloud-instance.cfg.in filename = nextcloud-instance.cfg.in
md5sum = 59e9c65e655cf9cf144d97dd36863ede md5sum = 426df55e81725cd7faa408d3cd93558e
software/nextcloud/nextcloud-instance.cfg.in
View file @ aa4541d4
...@@ -12,7 +12,7 @@ backup = ${directory:backup}/nextcloud ...@@ -12,7 +12,7 @@ backup = ${directory:backup}/nextcloud
[service-redis] [service-redis]
recipe = slapos.cookbook:redis.server recipe = slapos.cookbook:redis.server
wrapper = ${directory:services}/redis wrapper = ${directory:services}/redis
promise_wrapper = ${directory:promises}/redis promise_wrapper = ${directory:bin}/redis-promise
server_dir = ${nc-directory:redis} server_dir = ${nc-directory:redis}
config_file = ${directory:etc}/redis.conf config_file = ${directory:etc}/redis.conf
log_file = ${nc-directory:redis-log}/redis.log log_file = ${nc-directory:redis-log}/redis.log
...@@ -26,6 +26,12 @@ server_bin = {{ redis_bin }} ...@@ -26,6 +26,12 @@ server_bin = {{ redis_bin }}
depend = depend =
${logrotate-entry-redis:recipe} ${logrotate-entry-redis:recipe}
[redis-promise]
<= monitor-promise-base
module = check_command_execute
name = redis.py
config-command = ${service-redis:promise_wrapper}
[logrotate-entry-redis] [logrotate-entry-redis]
<= logrotate-entry-base <= logrotate-entry-base
name = redis name = redis
...@@ -83,6 +89,7 @@ context = ...@@ -83,6 +89,7 @@ context =
mode = 744 mode = 744
depends = depends =
${service-redis:recipe} ${service-redis:recipe}
${redis-promise:recipe}
${nextcloud-cron:recipe} ${nextcloud-cron:recipe}
${nextcloud-optimize:recipe} ${nextcloud-optimize:recipe}
${nextcloud-apache-httpd:recipe} ${nextcloud-apache-httpd:recipe}
......
software/plantuml/buildout.hash.cfg
View file @ aa4541d4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 8ed7b3f59d94869a328c72fa9bbfd7d5 md5sum = f35aa36b41cd197ab3d763dcb884e96a
[tomcat-server-xml] [tomcat-server-xml]
filename = server.xml.in filename = server.xml.in
......
software/plantuml/instance.cfg.in
View file @ aa4541d4
...@@ -7,6 +7,8 @@ eggs-directory = ${buildout:eggs-directory} ...@@ -7,6 +7,8 @@ eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true offline = true
extends = ${monitor2-template:rendered}
[fontconfig-conf] [fontconfig-conf]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${font.conf:output} url = ${font.conf:output}
...@@ -78,16 +80,14 @@ needs = $${tomcat-web-xml:location} ...@@ -78,16 +80,14 @@ needs = $${tomcat-web-xml:location}
[promises] [promises]
recipe = recipe =
instance-promises = instance-promises =
$${tomcat-listen-promise:path} $${tomcat-listen-promise:name}
[check-port-listening-promise]
recipe = slapos.cookbook:check_port_listening
path = $${directory:promises}/$${:_buildout_section_name_}
[tomcat-listen-promise] [tomcat-listen-promise]
<= check-port-listening-promise <= monitor-promise-base
hostname= $${tomcat-instance:ip} module = check_port_listening
port = $${tomcat-instance:port} name = $${:_buildout_section_name_}.py
config-hostname= $${tomcat-instance:ip}
config-port = $${tomcat-instance:port}
[publish-connection-parameter] [publish-connection-parameter]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
...@@ -110,7 +110,6 @@ srv = $${buildout:directory}/srv ...@@ -110,7 +110,6 @@ srv = $${buildout:directory}/srv
bin = $${buildout:directory}/bin bin = $${buildout:directory}/bin
tmp = $${buildout:directory}/tmp tmp = $${buildout:directory}/tmp
services = $${:etc}/service services = $${:etc}/service
promises = $${:etc}/promise
fonts = $${:srv}/fonts/ fonts = $${:srv}/fonts/
fontcache = $${buildout:directory}/.fontcache/ fontcache = $${buildout:directory}/.fontcache/
......
software/plantuml/software.cfg
View file @ aa4541d4
[buildout] [buildout]
extends = extends =
../../stack/slapos.cfg ../../stack/slapos.cfg
../../stack/monitor/buildout.cfg
../../stack/nodejs.cfg ../../stack/nodejs.cfg
../../component/fontconfig/buildout.cfg ../../component/fontconfig/buildout.cfg
../../component/freetype/buildout.cfg ../../component/freetype/buildout.cfg
......
software/powerdns/buildout.hash.cfg
View file @ aa4541d4
...@@ -18,7 +18,7 @@ md5sum = da8be58db4255c07750f7a7583eab3ca ...@@ -18,7 +18,7 @@ md5sum = da8be58db4255c07750f7a7583eab3ca
[template-powerdns] [template-powerdns]
filename = instance-powerdns.cfg filename = instance-powerdns.cfg
md5sum = 0275136daa72e1e3ee135cf0c1fa8af3 md5sum = 681cd9564e491d1f7b7ccb810f8ca7df
[template-pdns-configuration] [template-pdns-configuration]
_update_hash_filename_ = template/pdns.conf.jinja2 _update_hash_filename_ = template/pdns.conf.jinja2
......
software/powerdns/instance-powerdns.cfg
View file @ aa4541d4
...@@ -16,7 +16,6 @@ log = $${:var}/log ...@@ -16,7 +16,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
logrotate-backup = $${:backup}/logrotate logrotate-backup = $${:backup}/logrotate
logrotate-entries = $${:etc}/logrotate.d logrotate-entries = $${:etc}/logrotate.d
...@@ -106,10 +105,11 @@ extra-context = ...@@ -106,10 +105,11 @@ extra-context =
# Promises # Promises
[pdns-promise-listen-port] [pdns-promise-listen-port]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
path = $${directory:promise}/pdns-port-listening module = check_port_listening
hostname = $${pdns:local-ipv4} name = pdns-port-listening.py
port = $${pdns:port} config-hostname = $${pdns:local-ipv4}
config-port = $${pdns:port}
[publish-connection-informations] [publish-connection-informations]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
......
software/proftpd/buildout.hash.cfg
View file @ aa4541d4
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
[instance-profile] [instance-profile]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 8ed5b4a7940db47ccb386c2f4e3e7273 md5sum = efb4238229681447aa7fe73898dffad4
[instance-default] [instance-default]
filename = instance-default.cfg.in filename = instance-default.cfg.in
md5sum = 4cba10d2e9fc4b17c73c78bde0bcb86c md5sum = 2a2c066d7d40dd8545f3008f434ee842
[proftpd-config-file] [proftpd-config-file]
filename = proftpd-config-file.cfg.in filename = proftpd-config-file.cfg.in
......
software/proftpd/instance-default.cfg.in
View file @ aa4541d4
...@@ -3,6 +3,7 @@ parts = ...@@ -3,6 +3,7 @@ parts =
promises promises
publish-connection-parameter publish-connection-parameter
extends = {{ template_monitor }}
[instance-parameter] [instance-parameter]
# TODO: this is not needed # TODO: this is not needed
...@@ -29,7 +30,6 @@ var = ${:home}/var ...@@ -29,7 +30,6 @@ var = ${:home}/var
log = ${:var}/log log = ${:var}/log
srv = ${:home}/srv srv = ${:home}/srv
service = ${:etc}/service service = ${:etc}/service
promise = ${:etc}/promise
proftpd-dir = ${:srv}/proftpd/ proftpd-dir = ${:srv}/proftpd/
ssh-authorized-keys-dir = ${:etc}/authorized_keys/ ssh-authorized-keys-dir = ${:etc}/authorized_keys/
...@@ -40,10 +40,6 @@ rendered = ${directory:etc}/${:_buildout_section_name_}.cfg ...@@ -40,10 +40,6 @@ rendered = ${directory:etc}/${:_buildout_section_name_}.cfg
mode = 0644 mode = 0644
extensions = jinja2.ext.do extensions = jinja2.ext.do
[check-port-listening-promise]
recipe = slapos.cookbook:check_port_listening
path = ${directory:promise}/${:_buildout_section_name_}
[proftpd-userinfo] [proftpd-userinfo]
recipe = slapos.cookbook:userinfo recipe = slapos.cookbook:userinfo
...@@ -81,9 +77,11 @@ command-line = ...@@ -81,9 +77,11 @@ command-line =
wrapper-path = ${directory:service}/proftpd wrapper-path = ${directory:service}/proftpd
[proftpd-listen-promise] [proftpd-listen-promise]
<= check-port-listening-promise <= monitor-promise-base
hostname = ${proftpd:ipv6} module = check_port_listening
port = ${proftpd:sftp-port} name = ${:_buildout_section_name_}.py
config-hostname = ${proftpd:ipv6}
config-port = ${proftpd:sftp-port}
[ftpasswd] [ftpasswd]
...@@ -129,7 +127,7 @@ context = ...@@ -129,7 +127,7 @@ context =
[promises] [promises]
recipe = recipe =
instance-promises = instance-promises =
${proftpd-listen-promise:path} ${proftpd-listen-promise:name}
[publish-connection-parameter] [publish-connection-parameter]
......
software/proftpd/instance.cfg.in
View file @ aa4541d4
...@@ -25,6 +25,7 @@ context = ...@@ -25,6 +25,7 @@ context =
raw ftpdctl_bin {{ ftpdctl_bin }} raw ftpdctl_bin {{ ftpdctl_bin }}
raw ssh_keygen_bin {{ ssh_keygen_bin }} raw ssh_keygen_bin {{ ssh_keygen_bin }}
raw perl_bin {{ perl_bin }} raw perl_bin {{ perl_bin }}
raw template_monitor {{ template_monitor }}
[instance-default] [instance-default]
<= instance-template <= instance-template
......
software/proftpd/software.cfg
View file @ aa4541d4
[buildout] [buildout]
extends = extends =
../../stack/slapos.cfg ../../stack/slapos.cfg
../../stack/monitor/buildout.cfg
../../component/openssh/buildout.cfg ../../component/openssh/buildout.cfg
../../component/proftpd/buildout.cfg ../../component/proftpd/buildout.cfg
buildout.hash.cfg buildout.hash.cfg
...@@ -38,7 +39,7 @@ context = ...@@ -38,7 +39,7 @@ context =
key ftpdctl_bin proftpd-output:ftpdctl key ftpdctl_bin proftpd-output:ftpdctl
key ssh_keygen_bin openssh-output:keygen key ssh_keygen_bin openssh-output:keygen
key perl_bin proftpd-output:perl key perl_bin proftpd-output:perl
raw template_monitor ${monitor2-template:rendered}
[versions] [versions]
collective.recipe.environment = 1.1.0 collective.recipe.environment = 1.1.0
......
software/re6stnet/buildout.hash.cfg
View file @ aa4541d4
...@@ -18,7 +18,7 @@ md5sum = 610fc6fd0444d3bab3fca4478572749a ...@@ -18,7 +18,7 @@ md5sum = 610fc6fd0444d3bab3fca4478572749a
[template-re6stnet] [template-re6stnet]
filename = instance-re6stnet.cfg.in filename = instance-re6stnet.cfg.in
md5sum = 73c8fad6db7c711b0822891aba574564 md5sum = ee582dbab92c1c452874ddca3831aef6
[template-apache-conf] [template-apache-conf]
filename = apache.conf.in filename = apache.conf.in
......
software/re6stnet/instance-re6stnet.cfg.in
View file @ aa4541d4
...@@ -18,7 +18,6 @@ var = ${buildout:directory}/var ...@@ -18,7 +18,6 @@ var = ${buildout:directory}/var
log = ${:var}/log log = ${:var}/log
services = ${:etc}/service services = ${:etc}/service
script = ${:etc}/run script = ${:etc}/run
promises = ${:etc}/promise
run = ${:var}/run run = ${:var}/run
ca-dir = ${:etc}/ssl ca-dir = ${:etc}/ssl
requests = ${:ca-dir}/requests requests = ${:ca-dir}/requests
...@@ -202,16 +201,18 @@ context = ...@@ -202,16 +201,18 @@ context =
section parameter_dict re6st-registry-conf-dict section parameter_dict re6st-registry-conf-dict
[re6st-registry-promise] [re6st-registry-promise]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
path = ${directory:promises}/re6st-registry module = check_port_listening
hostname = ${re6st-registry:ipv4} name = re6st-registry.py
port = ${re6st-registry:port} config-hostname = ${re6st-registry:ipv4}
config-port = ${re6st-registry:port}
[apache-registry-promise] [apache-registry-promise]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
path = ${directory:promises}/apache-re6st-registry module = check_port_listening
hostname = ${apache-conf:ipv6} name = apache-re6st-registry.py
port = ${apache-conf:port} config-hostname = ${apache-conf:ipv6}
config-port = ${apache-conf:port}
{% do publish_dict.__setitem__('re6stry-url', uri_scheme ~ '://[${apache-conf:ipv6}]:${apache-conf:port}') -%} {% do publish_dict.__setitem__('re6stry-url', uri_scheme ~ '://[${apache-conf:ipv6}]:${apache-conf:port}') -%}
{% do publish_dict.__setitem__('re6stry-local-url', 'http://${re6st-registry:ipv4}:${re6st-registry:port}/') -%} {% do publish_dict.__setitem__('re6stry-local-url', 'http://${re6st-registry:ipv4}:${re6st-registry:port}/') -%}
......
software/seleniumserver/buildout.hash.cfg
View file @ aa4541d4
...@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88 ...@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88
[template-selenium] [template-selenium]
filename = instance-selenium.cfg.in filename = instance-selenium.cfg.in
md5sum = 7c1a5a4f1a3916ddf3ec0db7b22ef820 md5sum = 4f557a7b3aa9b4df1ca1fa6a754ca657
software/seleniumserver/instance-selenium.cfg.in
View file @ aa4541d4
[buildout] [buildout]
parts = parts =
monitor-base
promises promises
publish-connection-parameter publish-connection-parameter
extends = ${monitor-template:rendered}
eggs-directory = ${buildout:eggs-directory} eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true offline = true
...@@ -237,53 +239,54 @@ command = mkdir -p $${:location} && echo '$${instance-parameter:configuration.ss ...@@ -237,53 +239,54 @@ command = mkdir -p $${:location} && echo '$${instance-parameter:configuration.ss
[promises] [promises]
recipe = recipe =
instance-promises = instance-promises =
$${sshd-listen-promise:path} $${sshd-listen-promise:name}
$${selenium-server-frontend-listen-promise:path} $${selenium-server-frontend-listen-promise:name}
$${selenium-server-hub-listen-promise:path} $${selenium-server-hub-listen-promise:name}
$${selenium-server-node-firefox-52-listen-promise:path} $${selenium-server-node-firefox-52-listen-promise:name}
$${selenium-server-node-firefox-60-listen-promise:path} $${selenium-server-node-firefox-60-listen-promise:name}
$${selenium-server-node-firefox-68-listen-promise:path} $${selenium-server-node-firefox-68-listen-promise:name}
$${selenium-server-node-instance-chromium-69-listen-promise:path} $${selenium-server-node-instance-chromium-69-listen-promise:name}
[check-port-listening-promise] [check-port-listening-promise]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
path = $${directory:promises}/$${:_buildout_section_name_} module = check_port_listening
name = $${:_buildout_section_name_}.py
[sshd-listen-promise] [sshd-listen-promise]
<= check-port-listening-promise <= check-port-listening-promise
hostname = $${sshd-address:hostname} config-hostname = $${sshd-address:hostname}
port = $${sshd-address:port} config-port = $${sshd-address:port}
[selenium-server-frontend-listen-promise] [selenium-server-frontend-listen-promise]
<= check-port-listening-promise <= check-port-listening-promise
hostname = $${selenium-server-frontend-instance:ip} config-hostname = $${selenium-server-frontend-instance:ip}
port = $${selenium-server-frontend-instance:port} config-port = $${selenium-server-frontend-instance:port}
[selenium-server-hub-listen-promise] [selenium-server-hub-listen-promise]
<= check-port-listening-promise <= check-port-listening-promise
hostname = $${selenium-server-hub-instance:hostname} config-hostname = $${selenium-server-hub-instance:hostname}
port = $${selenium-server-hub-instance:port} config-port = $${selenium-server-hub-instance:port}
[selenium-server-node-firefox-52-listen-promise] [selenium-server-node-firefox-52-listen-promise]
<= check-port-listening-promise <= check-port-listening-promise
hostname = $${selenium-server-node-instance-firefox-52:hostname} config-hostname = $${selenium-server-node-instance-firefox-52:hostname}
port = $${selenium-server-node-instance-firefox-52:port} config-port = $${selenium-server-node-instance-firefox-52:port}
[selenium-server-node-firefox-60-listen-promise] [selenium-server-node-firefox-60-listen-promise]
<= check-port-listening-promise <= check-port-listening-promise
hostname = $${selenium-server-node-instance-firefox-60:hostname} config-hostname = $${selenium-server-node-instance-firefox-60:hostname}
port = $${selenium-server-node-instance-firefox-60:port} config-port = $${selenium-server-node-instance-firefox-60:port}
[selenium-server-node-firefox-68-listen-promise] [selenium-server-node-firefox-68-listen-promise]
<= check-port-listening-promise <= check-port-listening-promise
hostname = $${selenium-server-node-instance-firefox-68:hostname} config-hostname = $${selenium-server-node-instance-firefox-68:hostname}
port = $${selenium-server-node-instance-firefox-68:port} config-port = $${selenium-server-node-instance-firefox-68:port}
[selenium-server-node-instance-chromium-69-listen-promise] [selenium-server-node-instance-chromium-69-listen-promise]
<= check-port-listening-promise <= check-port-listening-promise
hostname = $${selenium-server-node-instance-chromium-69:hostname} config-hostname = $${selenium-server-node-instance-chromium-69:hostname}
port = $${selenium-server-node-instance-chromium-69:port} config-port = $${selenium-server-node-instance-chromium-69:port}
[publish-connection-parameter] [publish-connection-parameter]
...@@ -321,7 +324,6 @@ bin = $${buildout:directory}/bin ...@@ -321,7 +324,6 @@ bin = $${buildout:directory}/bin
tmp = $${buildout:directory}/tmp tmp = $${buildout:directory}/tmp
services = $${:etc}/service services = $${:etc}/service
promises = $${:etc}/promise
framebuffer = $${:srv}/framebuffer framebuffer = $${:srv}/framebuffer
fonts = $${:srv}/fonts/ fonts = $${:srv}/fonts/
ssh = $${:etc}/ssh ssh = $${:etc}/ssh
......
software/seleniumserver/software.cfg
View file @ aa4541d4
...@@ -14,6 +14,7 @@ extends = ...@@ -14,6 +14,7 @@ extends =
../../component/openssh/buildout.cfg ../../component/openssh/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
./buildout.hash.cfg ./buildout.hash.cfg
../../stack/monitor/buildout.cfg
parts = parts =
slapos-cookbook slapos-cookbook
......
software/slapos-master/buildout.hash.cfg
View file @ aa4541d4
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
# not need these here). # not need these here).
[template-erp5] [template-erp5]
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = 70c8d3e4414f6f9f969c9641e840b52f md5sum = 2ef0ddc206c6b0982a37cfc21f23e423
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
md5sum = e8033d4fd7b6348b525a6148762ccdb4 md5sum = ef86e09e44ac67a9b15939df0ab4a466
[template-apache-backend-conf] [template-apache-backend-conf]
filename = apache-backend.conf.in filename = apache-backend.conf.in
......
software/slapos-master/instance-balancer.cfg.in
View file @ aa4541d4
...@@ -187,10 +187,11 @@ input = inline: ...@@ -187,10 +187,11 @@ input = inline:
[{{ section('apache-promise') }}] [{{ section('apache-promise') }}]
# Check any apache port in ipv4, expect other ports and ipv6 to behave consistently # Check any apache port in ipv4, expect other ports and ipv6 to behave consistently
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
path = ${directory:promise}/apache module = check_port_listening
hostname = {{ ipv4 }} name = apache.py
port = {{ apache_dict.values()[0][0] }} config-hostname = {{ ipv4 }}
config-port = {{ apache_dict.values()[0][0] }}
[{{ section('publish') }}] [{{ section('publish') }}]
recipe = slapos.cookbook:publish.serialised recipe = slapos.cookbook:publish.serialised
...@@ -229,7 +230,6 @@ recipe = slapos.cookbook:mkdirectory ...@@ -229,7 +230,6 @@ recipe = slapos.cookbook:mkdirectory
apache-conf = ${:etc}/apache apache-conf = ${:etc}/apache
bin = ${buildout:directory}/bin bin = ${buildout:directory}/bin
etc = ${buildout:directory}/etc etc = ${buildout:directory}/etc
promise = ${:etc}/promise
services = ${:etc}/run services = ${:etc}/run
services-on-watch = ${:etc}/service services-on-watch = ${:etc}/service
var = ${buildout:directory}/var var = ${buildout:directory}/var
...@@ -273,14 +273,16 @@ configuration = {{ slapparameter_dict['apachedex-configuration'] }} ...@@ -273,14 +273,16 @@ configuration = {{ slapparameter_dict['apachedex-configuration'] }}
promise-threshold = {{ slapparameter_dict['apachedex-promise-threshold'] }} promise-threshold = {{ slapparameter_dict['apachedex-promise-threshold'] }}
[{{ section('monitor-promise-apachedex-result') }}] [{{ section('monitor-promise-apachedex-result') }}]
recipe = slapos.cookbook:wrapper <= monitor-promise-base
wrapper-path = ${directory:promise}/check-apachedex-result module = check_command_execute
command-line = "{{ parameter_dict['promise-check-apachedex-result'] }}" --apachedex_path "${directory:apachedex}" --status_file ${monitor-directory:private}/apachedex.report.json --threshold "${apachedex-parameters:promise-threshold}" name = check-apachedex-result.py
config-command = "{{ parameter_dict['promise-check-apachedex-result'] }}" --apachedex_path "${directory:apachedex}" --status_file ${monitor-directory:private}/apachedex.report.json --threshold "${apachedex-parameters:promise-threshold}"
[{{ section('promise-check-computer-memory') }}] [{{ section('promise-check-computer-memory') }}]
recipe = slapos.cookbook:wrapper <= monitor-promise-base
wrapper-path = ${directory:promise}/check-computer-memory module = check_command_execute
command-line = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent name = check-computer-memory.py
config-command = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
[monitor-instance-parameter] [monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }} monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
......
software/slapos-master/instance-erp5.cfg.in
View file @ aa4541d4
...@@ -65,7 +65,6 @@ config-name = {{ name }} ...@@ -65,7 +65,6 @@ config-name = {{ name }}
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
etc = ${buildout:directory}/etc etc = ${buildout:directory}/etc
promise = ${:etc}/promise
service-on-watch = ${:etc}/service service-on-watch = ${:etc}/service
srv = ${buildout:directory}/srv srv = ${buildout:directory}/srv
backup-caucased = ${:srv}/backup/caucased backup-caucased = ${:srv}/backup/caucased
...@@ -91,7 +90,6 @@ backup-caucased = ${:srv}/backup/caucased ...@@ -91,7 +90,6 @@ backup-caucased = ${:srv}/backup/caucased
service_auto_approve_count=caucase_dict.get('service-auto-approve-amount', 1), service_auto_approve_count=caucase_dict.get('service-auto-approve-amount', 1),
user_auto_approve_count=caucase_dict.get('user-auto-approve-amount', 0), user_auto_approve_count=caucase_dict.get('user-auto-approve-amount', 0),
key_len=caucase_dict.get('key-length', 2048), key_len=caucase_dict.get('key-length', 2048),
promise='${directory:promise}/caucased',
)}} )}}
{% do root_common.section('caucased') -%} {% do root_common.section('caucased') -%}
{% do root_common.section('caucased-promise') -%} {% do root_common.section('caucased-promise') -%}
......
software/slapos-master/software.cfg
View file @ aa4541d4
...@@ -9,10 +9,10 @@ parts += ...@@ -9,10 +9,10 @@ parts +=
[local-bt5-repository] [local-bt5-repository]
# Same as bt5-repository, but only local repository. # Same as bt5-repository, but only local repository.
# Used to generate bt5lists. # Used to generate bt5lists.
list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${vifib:location}/master/bt5 list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${erp5-bin:location}/bt5 ${erp5-doc:location}/bt5 ${vifib:location}/master/bt5
[erp5_repository_list] [erp5_repository_list]
repository_id_list = erp5 vifib/master repository_id_list = erp5 erp5-bin erp5-doc vifib/master
[erp5] [erp5]
branch = erp5-vifib branch = erp5-vifib
......
software/slaprunner/buildout.hash.cfg
View file @ aa4541d4
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = c44a7481bb85e3258128afe3fcf23f44 md5sum = 317c49bf451e80bf0f9d44baa603861e
[template-runner] [template-runner]
filename = instance-runner.cfg filename = instance-runner.cfg
...@@ -22,11 +22,11 @@ md5sum = bacb2d1a38d3a512025e861debdc75b2 ...@@ -22,11 +22,11 @@ md5sum = bacb2d1a38d3a512025e861debdc75b2
[template-runner-import-script] [template-runner-import-script]
filename = template/runner-import.sh.jinja2 filename = template/runner-import.sh.jinja2
md5sum = 3c80e21dda146b4cbee103b0a3f6935b md5sum = fc22e2d2f03ce58631f157a5b4943e15
[instance-runner-import] [instance-runner-import]
filename = instance-runner-import.cfg.in filename = instance-runner-import.cfg.in
md5sum = 238466e8045096c09534e1d01b1befd6 md5sum = 1f1c62f2bc09a6ab3a2f96eacdf99492
[instance-runner-export] [instance-runner-export]
filename = instance-runner-export.cfg.in filename = instance-runner-export.cfg.in
......
software/slaprunner/instance-runner-import.cfg.in
View file @ aa4541d4
...@@ -107,6 +107,7 @@ context = ...@@ -107,6 +107,7 @@ context =
section supervisord supervisord section supervisord supervisord
raw output_log_file ${directory:log}/${:resilient-log-basename} raw output_log_file ${directory:log}/${:resilient-log-basename}
raw shell_binary {{ bash_executable_location }} raw shell_binary {{ bash_executable_location }}
raw sqlite3_binary {{ sqlite3_executable_location }}
raw rsync_binary {{ rsync_executable_location }} raw rsync_binary {{ rsync_executable_location }}
raw restore_exit_code_file ${:restore-exit-code-file} raw restore_exit_code_file ${:restore-exit-code-file}
raw restore_error_message_file ${:restore-error-message-file} raw restore_error_message_file ${:restore-error-message-file}
......
software/slaprunner/instance.cfg
View file @ aa4541d4
...@@ -76,6 +76,7 @@ context = ...@@ -76,6 +76,7 @@ context =
raw importer_script_path ${template-runner-import-script:location}/${template-runner-import-script:filename} raw importer_script_path ${template-runner-import-script:location}/${template-runner-import-script:filename}
raw buildout_executable_location ${buildout:executable} raw buildout_executable_location ${buildout:executable}
raw bash_executable_location ${bash:location}/bin/bash raw bash_executable_location ${bash:location}/bin/bash
raw sqlite3_executable_location ${sqlite3:location}/bin/sqlite3
raw rsync_executable_location ${rsync:location}/bin/rsync raw rsync_executable_location ${rsync:location}/bin/rsync
raw pbsready_import_template_path ${pbsready-import:output} raw pbsready_import_template_path ${pbsready-import:output}
raw software_release_information_template ${template-resilient-software-release-information:destination}/${template-resilient-software-release-information:filename} raw software_release_information_template ${template-resilient-software-release-information:destination}/${template-resilient-software-release-information:filename}
......
software/slaprunner/template/runner-import.sh.jinja2
View file @ aa4541d4
...@@ -134,8 +134,7 @@ HOME='{{ directory["home"] }}' ...@@ -134,8 +134,7 @@ HOME='{{ directory["home"] }}'
export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
export MAKEFLAGS=-j4 export MAKEFLAGS=-j4
SLAPOS='{{ directory["bin"] }}'/slapos SLAPOS='{{ directory["bin"] }}'/slapos
# XXX hardcoded SQLITE3="{{ sqlite3_binary }}"
SQLITE3="$HOME/software_release/parts/sqlite3/bin/sqlite3"
DATABASE="$HOME/srv/runner/proxy.db" DATABASE="$HOME/srv/runner/proxy.db"
db_query () { db_query () {
# Try opening locked tables for 5 seconds to prevent "database is locked" error # Try opening locked tables for 5 seconds to prevent "database is locked" error
......
software/theia/buildout.hash.cfg
View file @ aa4541d4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = c35e6baca37c690bce39ef43825ec42b md5sum = 6a0a65ff9f81f907d53c42c65b54442a
[yarn.lock] [yarn.lock]
filename = yarn.lock filename = yarn.lock
......
software/theia/instance.cfg.in
View file @ aa4541d4
[buildout] [buildout]
parts = parts =
monitor-base
promises promises
.bashrc .bashrc
frontend-reload frontend-reload
publish-connection-parameter publish-connection-parameter
extends = ${monitor-template:rendered}
eggs-directory = ${buildout:eggs-directory} eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true offline = true
...@@ -111,23 +114,22 @@ template = inline: ...@@ -111,23 +114,22 @@ template = inline:
[promises] [promises]
recipe = recipe =
instance-promises = instance-promises =
$${theia-listen-promise:path} $${theia-listen-promise:name}
$${frontend-listen-promise:path} $${frontend-listen-promise:name}
[check-port-listening-promise]
recipe = slapos.cookbook:check_port_listening
path = $${directory:promises}/$${:_buildout_section_name_}
[theia-listen-promise] [theia-listen-promise]
<= check-port-listening-promise <= monitor-promise-base
hostname= $${theia-instance:ip} module = check_port_listening
port = $${theia-instance:port} name = $${:_buildout_section_name_}.py
config-hostname= $${theia-instance:ip}
config-port = $${theia-instance:port}
[frontend-listen-promise] [frontend-listen-promise]
<= check-port-listening-promise <= monitor-promise-base
hostname= $${frontend-instance:ip} module = check_port_listening
port = $${frontend-instance:port} name = $${:_buildout_section_name_}.py
config-hostname = $${frontend-instance:ip}
config-port = $${frontend-instance:port}
[publish-connection-parameter] [publish-connection-parameter]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
...@@ -152,7 +154,6 @@ tmp = $${buildout:directory}/tmp ...@@ -152,7 +154,6 @@ tmp = $${buildout:directory}/tmp
pidfiles = $${:var}/run pidfiles = $${:var}/run
services = $${:etc}/service services = $${:etc}/service
promises = $${:etc}/promise
framebuffer = $${:srv}/framebuffer framebuffer = $${:srv}/framebuffer
fonts = $${:srv}/fonts fonts = $${:srv}/fonts
home = $${:srv}/home home = $${:srv}/home
\ No newline at end of file
software/theia/software.cfg
View file @ aa4541d4
...@@ -8,6 +8,7 @@ extends = ...@@ -8,6 +8,7 @@ extends =
../../component/bash/buildout.cfg ../../component/bash/buildout.cfg
../../component/coreutils/buildout.cfg ../../component/coreutils/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
../../stack/monitor/buildout.cfg
./gowork.cfg ./gowork.cfg
./buildout.hash.cfg ./buildout.hash.cfg
# this gowork.cfg includes the one from caddy, because they share the only gowork # this gowork.cfg includes the one from caddy, because they share the only gowork
......
software/turnserver/buildout.hash.cfg
View file @ aa4541d4
...@@ -19,4 +19,4 @@ md5sum = d027a2dccaf15ae6e7d3a28cc02d70c3 ...@@ -19,4 +19,4 @@ md5sum = d027a2dccaf15ae6e7d3a28cc02d70c3
[template-turnserver] [template-turnserver]
filename = instance-turnserver.cfg.jinja2.in filename = instance-turnserver.cfg.jinja2.in
md5sum = 6ba54fb299e1fd59617e5a6a9545e36e md5sum = 62382da42ea56e9fd0124caeca42bcf3
software/turnserver/instance-turnserver.cfg.jinja2.in
View file @ aa4541d4
...@@ -11,7 +11,6 @@ run = ${:var}/run ...@@ -11,7 +11,6 @@ run = ${:var}/run
log = ${:var}/log log = ${:var}/log
scripts = ${:etc}/run scripts = ${:etc}/run
services = ${:etc}/service services = ${:etc}/service
promises = ${:etc}/promise
plugins = ${:etc}/plugin plugins = ${:etc}/plugin
ssl = ${:etc}/ssl ssl = ${:etc}/ssl
......
stack/caucase/buildout.hash.cfg
View file @ aa4541d4
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
[caucase-jinja2-library] [caucase-jinja2-library]
filename = caucase.jinja2.library filename = caucase.jinja2.library
md5sum = 5cf324ea1beb593738339f3d20d60a44 md5sum = 6394dadda5726571149ec1b21207311b
stack/caucase/caucase.jinja2.library
View file @ aa4541d4
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
user_auto_approve_count=1, user_auto_approve_count=1,
key_len=None, key_len=None,
backup_dir=None, backup_dir=None,
promise=None promise=True
) -%} ) -%}
[{{ prefix }}-directory] [{{ prefix }}-directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
...@@ -30,9 +30,10 @@ command-line = '{{ buildout_bin_directory }}/caucased' ...@@ -30,9 +30,10 @@ command-line = '{{ buildout_bin_directory }}/caucased'
{% if promise -%} {% if promise -%}
[{{ prefix }}-promise] [{{ prefix }}-promise]
recipe = slapos.cookbook:wrapper <= monitor-promise-base
wrapper-path = {{ promise }} module = check_command_execute
command-line = '{{ buildout_bin_directory }}/caucase-probe' 'http://{{ netloc }}' name = {{ prefix }}.py
config-command = '{{ buildout_bin_directory }}/caucase-probe' 'http://{{ netloc }}'
{%- endif %} {%- endif %}
{%- endmacro %} {%- endmacro %}
......
stack/erp5/buildout.cfg
View file @ aa4541d4
...@@ -365,7 +365,7 @@ list = ${local-bt5-repository:list} ...@@ -365,7 +365,7 @@ list = ${local-bt5-repository:list}
[local-bt5-repository] [local-bt5-repository]
# Same as bt5-repository, but only local repository. # Same as bt5-repository, but only local repository.
# Used to generate bt5lists. # Used to generate bt5lists.
list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${erp5-bin:location}/bt5 ${erp5-doc:location} list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${erp5-bin:location}/bt5 ${erp5-doc:location}/bt5
[genbt5list] [genbt5list]
recipe = plone.recipe.command recipe = plone.recipe.command
......
stack/erp5/buildout.hash.cfg
View file @ aa4541d4
...@@ -26,11 +26,11 @@ md5sum = d95e8500bdc72d1f40b97cc414656e7e ...@@ -26,11 +26,11 @@ md5sum = d95e8500bdc72d1f40b97cc414656e7e
[template-mariadb] [template-mariadb]
filename = instance-mariadb.cfg.in filename = instance-mariadb.cfg.in
md5sum = 591fe60e2f615c7690fa5078473b1b0a md5sum = b29449652ef996c267518e4dcfd8e9e1
[template-kumofs] [template-kumofs]
filename = instance-kumofs.cfg.in filename = instance-kumofs.cfg.in
md5sum = 13315c109deab534b81e7a45e7320eea md5sum = e91c0fbd0df441884f7422fa7976053c
[template-zope-conf] [template-zope-conf]
filename = zope.conf.in filename = zope.conf.in
...@@ -50,7 +50,7 @@ md5sum = dec33a617fa1b307c8ddb883efcfe3ce ...@@ -50,7 +50,7 @@ md5sum = dec33a617fa1b307c8ddb883efcfe3ce
[template-postfix] [template-postfix]
filename = instance-postfix.cfg.in filename = instance-postfix.cfg.in
md5sum = cbcb5f4c2885e3f2589770e76a422be7 md5sum = bbf84495576a3dbc522524895e9640ff
[template-postfix-master-cf] [template-postfix-master-cf]
filename = postfix_master.cf.in filename = postfix_master.cf.in
...@@ -78,19 +78,19 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e ...@@ -78,19 +78,19 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
[template-erp5] [template-erp5]
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = 4fe42a1fe78ce9531d8e9c9837f4a784 md5sum = 939522bb26bf2109d7db818585a46f7a
[template-zeo] [template-zeo]
filename = instance-zeo.cfg.in filename = instance-zeo.cfg.in
md5sum = 10a01b85c966ad9fe13bc981f1ddabe8 md5sum = 0648e38bd5d3a15bb9f93264932740b9
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = 5eba2aa53af7ee74959745e6225ea0a7 md5sum = b1685783f4c93da918ccc83702559e6f
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
md5sum = 10c620e934397390dc9b737453aab387 md5sum = cfc9c1ad40bf215771f4902b2ea3fe5b
[template-haproxy-cfg] [template-haproxy-cfg]
filename = haproxy.cfg.in filename = haproxy.cfg.in
......
stack/erp5/instance-balancer.cfg.in
View file @ aa4541d4
...@@ -180,11 +180,12 @@ input = inline: ...@@ -180,11 +180,12 @@ input = inline:
kill -USR1 "$(cat '${apache-conf-parameter-dict:pid-file}')" kill -USR1 "$(cat '${apache-conf-parameter-dict:pid-file}')"
[{{ section('apache-promise') }}] [{{ section('apache-promise') }}]
<= monitor-promise-base
# Check any apache port in ipv4, expect other ports and ipv6 to behave consistently # Check any apache port in ipv4, expect other ports and ipv6 to behave consistently
recipe = slapos.cookbook:check_port_listening module = check_port_listening
path = ${directory:promise}/apache name = apache.py
hostname = {{ ipv4 }} config-hostname = {{ ipv4 }}
port = {{ apache_dict.values()[0][0] }} config-port = {{ apache_dict.values()[0][0] }}
[{{ section('publish') }}] [{{ section('publish') }}]
recipe = slapos.cookbook:publish.serialised recipe = slapos.cookbook:publish.serialised
...@@ -209,7 +210,6 @@ recipe = slapos.cookbook:mkdirectory ...@@ -209,7 +210,6 @@ recipe = slapos.cookbook:mkdirectory
apache-conf = ${:etc}/apache apache-conf = ${:etc}/apache
bin = ${buildout:directory}/bin bin = ${buildout:directory}/bin
etc = ${buildout:directory}/etc etc = ${buildout:directory}/etc
promise = ${:etc}/promise
services = ${:etc}/run services = ${:etc}/run
services-on-watch = ${:etc}/service services-on-watch = ${:etc}/service
var = ${buildout:directory}/var var = ${buildout:directory}/var
...@@ -247,14 +247,16 @@ configuration = {{ slapparameter_dict['apachedex-configuration'] }} ...@@ -247,14 +247,16 @@ configuration = {{ slapparameter_dict['apachedex-configuration'] }}
promise-threshold = {{ slapparameter_dict['apachedex-promise-threshold'] }} promise-threshold = {{ slapparameter_dict['apachedex-promise-threshold'] }}
[{{ section('monitor-promise-apachedex-result') }}] [{{ section('monitor-promise-apachedex-result') }}]
recipe = slapos.cookbook:wrapper <= monitor-promise-base
wrapper-path = ${directory:promise}/check-apachedex-result module = check_command_execute
command-line = "{{ parameter_dict['promise-check-apachedex-result'] }}" --apachedex_path "${directory:apachedex}" --status_file ${monitor-directory:private}/apachedex.report.json --threshold "${apachedex-parameters:promise-threshold}" name = check-apachedex-result.py
config-command = "{{ parameter_dict['promise-check-apachedex-result'] }}" --apachedex_path "${directory:apachedex}" --status_file ${monitor-directory:private}/apachedex.report.json --threshold "${apachedex-parameters:promise-threshold}"
[{{ section('promise-check-computer-memory') }}] [{{ section('promise-check-computer-memory') }}]
recipe = slapos.cookbook:wrapper <= monitor-promise-base
wrapper-path = ${directory:promise}/check-computer-memory module = check_command_execute
command-line = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent name = check-computer-memory.py
config-command = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
[monitor-instance-parameter] [monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }} monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
......
stack/erp5/instance-erp5.cfg.in
View file @ aa4541d4
...@@ -65,7 +65,7 @@ config-name = {{ name }} ...@@ -65,7 +65,7 @@ config-name = {{ name }}
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
etc = ${buildout:directory}/etc etc = ${buildout:directory}/etc
promise = ${:etc}/promise plugin = ${:etc}/plugin
service-on-watch = ${:etc}/service service-on-watch = ${:etc}/service
srv = ${buildout:directory}/srv srv = ${buildout:directory}/srv
backup-caucased = ${:srv}/backup/caucased backup-caucased = ${:srv}/backup/caucased
...@@ -91,7 +91,6 @@ backup-caucased = ${:srv}/backup/caucased ...@@ -91,7 +91,6 @@ backup-caucased = ${:srv}/backup/caucased
service_auto_approve_count=caucase_dict.get('service-auto-approve-amount', 1), service_auto_approve_count=caucase_dict.get('service-auto-approve-amount', 1),
user_auto_approve_count=caucase_dict.get('user-auto-approve-amount', 0), user_auto_approve_count=caucase_dict.get('user-auto-approve-amount', 0),
key_len=caucase_dict.get('key-length', 2048), key_len=caucase_dict.get('key-length', 2048),
promise='${directory:promise}/caucased',
)}} )}}
{% do root_common.section('caucased') -%} {% do root_common.section('caucased') -%}
{% do root_common.section('caucased-promise') -%} {% do root_common.section('caucased-promise') -%}
......
stack/erp5/instance-kumofs.cfg.in
View file @ aa4541d4
...@@ -72,7 +72,7 @@ log = ${kumofs-instance:kumo-gateway-log} ${kumofs-instance:kumo-manager-log} ${ ...@@ -72,7 +72,7 @@ log = ${kumofs-instance:kumo-gateway-log} ${kumofs-instance:kumo-manager-log} ${
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
log = ${buildout:directory}/var/log log = ${buildout:directory}/var/log
services = ${buildout:directory}/etc/run services = ${buildout:directory}/etc/run
promise = ${buildout:directory}/etc/promise plugin = ${buildout:directory}/etc/plugin
srv = ${buildout:directory}/srv srv = ${buildout:directory}/srv
kumofs-data = ${:srv}/kumofs kumofs-data = ${:srv}/kumofs
...@@ -85,34 +85,36 @@ rendered = ${directory:srv}/exporter.exclude ...@@ -85,34 +85,36 @@ rendered = ${directory:srv}/exporter.exclude
# Deploy zope promises scripts # Deploy zope promises scripts
[promise-template] [promise-template]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
hostname = ${kumofs-instance:ip} module = check_port_listening
port = ${kumofs-instance:server-listen-port} config-hostname = ${kumofs-instance:ip}
config-port = ${kumofs-instance:server-listen-port}
[promise-kumofs-server] [promise-kumofs-server]
<= promise-template <= promise-template
path = ${directory:promise}/kumofs-server name = kumofs-server.py
port = ${kumofs-instance:server-port} config-port = ${kumofs-instance:server-port}
[promise-kumofs-server-listen] [promise-kumofs-server-listen]
<= promise-template <= promise-template
path = ${directory:promise}/kumofs-server-listen name = kumofs-server-listen.py
port = ${kumofs-instance:server-listen-port} config-port = ${kumofs-instance:server-listen-port}
[promise-kumofs-gateway] [promise-kumofs-gateway]
<= promise-template <= promise-template
path = ${directory:promise}/kumofs-gateway name = kumofs-gateway.py
port = ${kumofs-instance:gateway-port} config-port = ${kumofs-instance:gateway-port}
[promise-kumofs-manager] [promise-kumofs-manager]
<= promise-template <= promise-template
path = ${directory:promise}/kumofs-manager name = kumofs-manager.py
port = ${kumofs-instance:manager-port} config-port = ${kumofs-instance:manager-port}
[promise-check-computer-memory] [promise-check-computer-memory]
recipe = slapos.cookbook:wrapper <= monitor-promise-base
wrapper-path = ${directory:promise}/check-computer-memory module = check_command_execute
command-line = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent name = check-computer-memory.py
config-command = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
[monitor-instance-parameter] [monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }} monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
......
stack/erp5/instance-mariadb.cfg.in
View file @ aa4541d4
...@@ -252,7 +252,7 @@ recipe = slapos.cookbook:mkdirectory ...@@ -252,7 +252,7 @@ recipe = slapos.cookbook:mkdirectory
bin = ${buildout:directory}/bin bin = ${buildout:directory}/bin
etc = ${buildout:directory}/etc etc = ${buildout:directory}/etc
services = ${:etc}/run services = ${:etc}/run
promise = ${:etc}/promise plugin = ${:etc}/plugin
srv = ${buildout:directory}/srv srv = ${buildout:directory}/srv
tmp = ${buildout:directory}/tmp tmp = ${buildout:directory}/tmp
backup = ${:srv}/backup backup = ${:srv}/backup
...@@ -333,19 +333,22 @@ max_queries_threshold = {{ slapparameter_dict['max-slowqueries-threshold'] }} ...@@ -333,19 +333,22 @@ max_queries_threshold = {{ slapparameter_dict['max-slowqueries-threshold'] }}
slowest_queries_threshold = {{ slapparameter_dict['slowest-query-threshold'] }} slowest_queries_threshold = {{ slapparameter_dict['slowest-query-threshold'] }}
[{{ section('monitor-promise-slowquery-result') }}] [{{ section('monitor-promise-slowquery-result') }}]
recipe = slapos.cookbook:wrapper <= monitor-promise-base
wrapper-path = ${directory:promise}/check-slow-query-pt-digest-result module = check_command_execute
command-line = "{{ parameter_dict['promise-check-slow-queries-digest-result'] }}" --ptdigest_path "${directory:slowquery}" --status_file ${monitor-directory:private}/mariadb_slow_query.report.json --max_queries_threshold "${slow-query-digest-parameters:max_queries_threshold}" --slowest_query_threshold "${slow-query-digest-parameters:slowest_queries_threshold}" name = check-slow-query-pt-digest-result.py
config-command = "{{ parameter_dict['promise-check-slow-queries-digest-result'] }}" --ptdigest_path "${directory:slowquery}" --status_file ${monitor-directory:private}/mariadb_slow_query.report.json --max_queries_threshold "${slow-query-digest-parameters:max_queries_threshold}" --slowest_query_threshold "${slow-query-digest-parameters:slowest_queries_threshold}"
[{{ section('promise-check-computer-memory') }}] [{{ section('promise-check-computer-memory') }}]
recipe = slapos.cookbook:wrapper <= monitor-promise-base
wrapper-path = ${directory:promise}/check-computer-memory module = check_command_execute
command-line = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent name = check-computer-memory.py
config-command = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
[{{ section('promise') }}] [{{ section('promise') }}]
recipe = slapos.cookbook:wrapper <= monitor-promise-base
command-line = "{{ parameter_dict['bin-directory'] }}/is-local-tcp-port-opened" "${my-cnf-parameters:ip}" "${my-cnf-parameters:port}" module = check_command_execute
wrapper-path = ${directory:promise}/mariadb name = mariadb.py
config-command = "{{ parameter_dict['bin-directory'] }}/is-local-tcp-port-opened" "${my-cnf-parameters:ip}" "${my-cnf-parameters:port}"
[monitor-instance-parameter] [monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }} monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
......
stack/erp5/instance-postfix.cfg.in
View file @ aa4541d4
...@@ -29,7 +29,7 @@ url = {{ dumps('smtp://' ~ urllib.quote_plus(smtpd_sasl_user) ~ ':' ~ urllib.quo ...@@ -29,7 +29,7 @@ url = {{ dumps('smtp://' ~ urllib.quote_plus(smtpd_sasl_user) ~ ':' ~ urllib.quo
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
etc = ${buildout:directory}/etc etc = ${buildout:directory}/etc
promise = ${:etc}/promise plugin = ${:etc}/plugin
etc-postfix = ${:etc}/postfix etc-postfix = ${:etc}/postfix
etc-cyrus = ${:etc}/cyrus etc-cyrus = ${:etc}/cyrus
run = ${:etc}/run run = ${:etc}/run
...@@ -79,10 +79,11 @@ wrapper-path = ${directory:run}/munnel ...@@ -79,10 +79,11 @@ wrapper-path = ${directory:run}/munnel
{% do milter_list.append(socket) -%} {% do milter_list.append(socket) -%}
[{{ section('munnel-promise') }}] [{{ section('munnel-promise') }}]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
path = ${directory:promise}/munnel module = check_port_listening
hostname = {{ ip }} name = munnel.py
port = {{ milter_port }} config-hostname = {{ ip }}
config-port = {{ milter_port }}
{% endif -%} {% endif -%}
[configuration] [configuration]
...@@ -260,15 +261,17 @@ command-line = ${directory:usr}/libexec/postfix/master ...@@ -260,15 +261,17 @@ command-line = ${directory:usr}/libexec/postfix/master
wrapper-path = ${directory:run}/postfix-master wrapper-path = ${directory:run}/postfix-master
[{{ section('postfix-promise') }}] [{{ section('postfix-promise') }}]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
path = ${directory:promise}/postfix module = check_port_listening
hostname = {{ ip }} name = postfix.py
port = {{ tcpv4_port }} config-hostname = {{ ip }}
config-port = {{ tcpv4_port }}
[{{ section('promise-check-computer-memory') }}] [{{ section('promise-check-computer-memory') }}]
recipe = slapos.cookbook:wrapper <= monitor-promise-base
wrapper-path = ${directory:promise}/check-computer-memory module = check_command_execute
command-line = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent name = check-computer-memory.py
config-command = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
[monitor-instance-parameter] [monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }} monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
......
stack/erp5/instance-zeo.cfg.in
View file @ aa4541d4
...@@ -54,10 +54,11 @@ log = {{ "${" ~ zeo_section_name ~ ":log-path}" }} ...@@ -54,10 +54,11 @@ log = {{ "${" ~ zeo_section_name ~ ":log-path}" }}
post = test ! -s {{ "${" ~ zeo_section_name ~":pid-path}" }} || {{ bin_directory }}/slapos-kill --pidfile {{ "${" ~ zeo_section_name ~ ":pid-path}" }} -s USR2 post = test ! -s {{ "${" ~ zeo_section_name ~":pid-path}" }} || {{ bin_directory }}/slapos-kill --pidfile {{ "${" ~ zeo_section_name ~ ":pid-path}" }} -s USR2
[{{ section(zeo_section_name ~ "-promise") }}] [{{ section(zeo_section_name ~ "-promise") }}]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
hostname = {{ "${" ~ zeo_section_name ~ ":ip}" }} module = check_port_listening
port = {{ "${" ~ zeo_section_name ~ ":port}" }} name = zeo-{{ family }}.py
path = ${directory:promises}/zeo-{{ family }} config-hostname = {{ "${" ~ zeo_section_name ~ ":ip}" }}
config-port = {{ "${" ~ zeo_section_name ~ ":port}" }}
{% endfor -%} {% endfor -%}
...@@ -87,10 +88,11 @@ repozo-wrapper = ${buildout:bin-directory}/tidstorage-repozo ...@@ -87,10 +88,11 @@ repozo-wrapper = ${buildout:bin-directory}/tidstorage-repozo
tidstorage-wrapper = ${directory:services}/tidstoraged tidstorage-wrapper = ${directory:services}/tidstoraged
[{{ section("promise-tidstorage") }}] [{{ section("promise-tidstorage") }}]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
hostname = ${tidstorage:ip} module = check_port_listening
port = ${tidstorage:port} name = tidstorage.py
path = ${directory:promises}/tidstorage config-hostname = ${tidstorage:ip}
config-port = ${tidstorage:port}
{% endif -%} {% endif -%}
[{{ section("cron-entry-tidstorage-backup") }}] [{{ section("cron-entry-tidstorage-backup") }}]
...@@ -174,9 +176,10 @@ mode = 755 ...@@ -174,9 +176,10 @@ mode = 755
{% endif -%} {% endif -%}
[{{ section('promise-check-computer-memory') }}] [{{ section('promise-check-computer-memory') }}]
recipe = slapos.cookbook:wrapper <= monitor-promise-base
wrapper-path = ${directory:promises}/check-computer-memory module = check_command_execute
command-line = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent name = check-computer-memory.py
config-command = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
[publish] [publish]
recipe = slapos.cookbook:publish.serialised recipe = slapos.cookbook:publish.serialised
...@@ -195,7 +198,7 @@ recipe = slapos.cookbook:mkdirectory ...@@ -195,7 +198,7 @@ recipe = slapos.cookbook:mkdirectory
bin = ${buildout:directory}/bin bin = ${buildout:directory}/bin
etc = ${buildout:directory}/etc etc = ${buildout:directory}/etc
services = ${:etc}/run services = ${:etc}/run
promises = ${:etc}/promise plugin = ${:etc}/plugin
srv = ${buildout:directory}/srv srv = ${buildout:directory}/srv
var = ${buildout:directory}/var var = ${buildout:directory}/var
log = ${:var}/log log = ${:var}/log
......
stack/erp5/instance-zope.cfg.in
View file @ aa4541d4
...@@ -86,7 +86,7 @@ srv = ${buildout:directory}/srv ...@@ -86,7 +86,7 @@ srv = ${buildout:directory}/srv
ca-dir = ${:srv}/ssl ca-dir = ${:srv}/ssl
tmp = ${buildout:directory}/tmp tmp = ${buildout:directory}/tmp
var = ${buildout:directory}/var var = ${buildout:directory}/var
promises = ${:etc}/promise plugin = ${:etc}/plugin
unit-test-path = ${:srv}/test-instance/unit_test unit-test-path = ${:srv}/test-instance/unit_test
# Used for ERP5 resiliency or (more probably) # Used for ERP5 resiliency or (more probably)
...@@ -326,10 +326,11 @@ port = {{ port }} ...@@ -326,10 +326,11 @@ port = {{ port }}
{%- endif %} {%- endif %}
[{{ section("promise-" ~ name) }}] [{{ section("promise-" ~ name) }}]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
hostname = {{ ipv4 }} module = check_port_listening
port = {{ port }} name = {{ name }}.py
path = ${directory:promises}/{{ name }} config-hostname = {{ ipv4 }}
config-port = {{ port }}
{% set extra_path_list = [] -%} {% set extra_path_list = [] -%}
{% set shell_escaped_extra_path_list = [] -%} {% set shell_escaped_extra_path_list = [] -%}
...@@ -339,9 +340,10 @@ path = ${directory:promises}/{{ name }} ...@@ -339,9 +340,10 @@ path = ${directory:promises}/{{ name }}
{% do shell_escaped_extra_path_list.append(line.replace("\x27", "\x27\\\x27\x27")) -%} {% do shell_escaped_extra_path_list.append(line.replace("\x27", "\x27\\\x27\x27")) -%}
{% endfor -%} {% endfor -%}
[{{ section("promise-" ~ name ~ "-is-running-actual-product") }}] [{{ section("promise-" ~ name ~ "-is-running-actual-product") }}]
recipe = slapos.cookbook:wrapper <= monitor-promise-base
command-line = '{{ parameter_dict['bin-directory'] }}/is-process-older-than-dependency-set' '{{ "${" ~ conf_parameter_name ~ ":pid-file}" }}' {{ " ".join(shell_escaped_extra_path_list) }} module = check_command_execute
wrapper-path = ${directory:promises}/{{ name }}-is-running-actual-product name = {{ name }}-is-running-actual-product.py
config-command = '{{ parameter_dict['bin-directory'] }}/is-process-older-than-dependency-set' '{{ "${" ~ conf_parameter_name ~ ":pid-file}" }}' {{ " ".join(shell_escaped_extra_path_list) }}
{% if use_ipv6 -%} {% if use_ipv6 -%}
[{{ zope_tunnel_section_name }}] [{{ zope_tunnel_section_name }}]
...@@ -352,26 +354,23 @@ ipv4-port = {{ port }} ...@@ -352,26 +354,23 @@ ipv4-port = {{ port }}
{% do publish_list.append(("[" ~ ipv6 ~ "]:" ~ port, thread_amount, webdav)) -%} {% do publish_list.append(("[" ~ ipv6 ~ "]:" ~ port, thread_amount, webdav)) -%}
[{{ section("promise-tunnel-" ~ name) }}] [{{ section("promise-tunnel-" ~ name) }}]
recipe = slapos.cookbook:check_port_listening <= monitor-promise-base
hostname = {{ '${' ~ zope_tunnel_section_name ~ ':ipv6}' }} module = check_port_listening
port = {{ '${' ~ zope_tunnel_section_name ~ ':ipv6-port}' }} name = {{ zope_tunnel_base_name }}.py
path = ${directory:promises}/{{ zope_tunnel_base_name }} config-hostname = {{ '${' ~ zope_tunnel_section_name ~ ':ipv6}' }}
config-port = {{ '${' ~ zope_tunnel_section_name ~ ':ipv6-port}' }}
{% else -%} {% else -%}
{% do publish_list.append((ipv4 ~ ":" ~ port, thread_amount, webdav)) -%} {% do publish_list.append((ipv4 ~ ":" ~ port, thread_amount, webdav)) -%}
{% endif -%} {% endif -%}
{% if longrequest_logger_interval > 0 -%} {% if longrequest_logger_interval > 0 -%}
[{{ section('promise-check-' ~name ~ '-longrequest-error-log') }}] [{{ section('promise-check-' ~name ~ '-longrequest-error-log') }}]
recipe = slapos.cookbook:promise.plugin <= monitor-promise-base
eggs = module = check_error_on_zope_longrequest_log
slapos.toolbox name = {{'check-' ~ name ~ '-longrequest-error-log.py'}}
output = ${directory:plugins}/{{'check-' ~ name ~ '-longrequest-error-log.py'}}
content =
from slapos.promise.plugin.check_error_on_zope_longrequest_log import RunPromise
config-log-file = {{ '${' ~ conf_parameter_name ~ ':longrequest-logger-file}' }} config-log-file = {{ '${' ~ conf_parameter_name ~ ':longrequest-logger-file}' }}
config-error-threshold = {{ slapparameter_dict["zope-longrequest-logger-error-threshold"] }} config-error-threshold = {{ slapparameter_dict["zope-longrequest-logger-error-threshold"] }}
config-maximum-delay = {{ slapparameter_dict["zope-longrequest-logger-maximum-delay"] }} config-maximum-delay = {{ slapparameter_dict["zope-longrequest-logger-maximum-delay"] }}
mode = 600
{% endif -%} {% endif -%}
[{{ section('logrotate-entry-' ~ name) }}] [{{ section('logrotate-entry-' ~ name) }}]
...@@ -494,21 +493,28 @@ environment-extra += ...@@ -494,21 +493,28 @@ environment-extra +=
zserver_address_list={{ ','.join(zserver_address_list) }} zserver_address_list={{ ','.join(zserver_address_list) }}
zserver_frontend_url_list={{ ','.join(slapparameter_dict['test-runner-apache-url-list']) }} zserver_frontend_url_list={{ ','.join(slapparameter_dict['test-runner-apache-url-list']) }}
[{{ section("promise-test-runner-apache-url") }}] [promise-test-runner-apache-url-executable]
# promise to wait for apache partition to have returned the parameter # promise to wait for apache partition to have returned the parameter
recipe = slapos.cookbook:check_parameter recipe = slapos.cookbook:check_parameter
value = {{ slapparameter_dict['test-runner-apache-url-list'] }} value = {{ slapparameter_dict['test-runner-apache-url-list'] }}
expected-not-value = not-ready expected-not-value = not-ready
path = ${directory:promises}/${:_buildout_section_name_} path = ${directory:bin}/${:_buildout_section_name_}
expected-value = expected-value =
[{{ section("promise-test-runner-apache-url") }}]
<= monitor-promise-base
module = check_command_execute
name = ${:_buildout_section_name_}.py
config-command = ${promise-test-runner-apache-url-executable:path}
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
[{{ section('promise-check-computer-memory') }}] [{{ section('promise-check-computer-memory') }}]
recipe = slapos.cookbook:wrapper <= monitor-promise-base
wrapper-path = ${directory:promises}/check-computer-memory module = check_command_execute
command-line = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent name = check-computer-memory.py
config-command = "{{ parameter_dict["check-computer-memory-binary"] }}" -db ${monitor-instance-parameter:collector-db} --threshold "{{ slapparameter_dict["computer-memory-percent-threshold"] }}" --unit percent
[publish] [publish]
......
stack/lamp/buildout.hash.cfg
View file @ aa4541d4
...@@ -18,11 +18,11 @@ md5sum = b4fbd7dc8d7fda7dbd1b80f3de273ecf ...@@ -18,11 +18,11 @@ md5sum = b4fbd7dc8d7fda7dbd1b80f3de273ecf
[instance-apache-php] [instance-apache-php]
filename = instance-apache-php.cfg.in filename = instance-apache-php.cfg.in
md5sum = 9d3eb7fcc44ac25bef8ee9df6eac8974 md5sum = 5212aed6c82876509eae9eda0975ffa1
[instance-lamp] [instance-lamp]
filename = instance-lamp.cfg.jinja2.in filename = instance-lamp.cfg.jinja2.in
md5sum = cefe97d3a80d10655212d64ced180b2a md5sum = 39e765fca5fcd92cb9fa13cd2b4d95fd
[template-apache.conf] [template-apache.conf]
filename = apache.conf.in filename = apache.conf.in
......
stack/lamp/instance-apache-php.cfg.in
View file @ aa4541d4
...@@ -37,8 +37,6 @@ services = ${:etc}/service ...@@ -37,8 +37,6 @@ services = ${:etc}/service
scripts = ${:etc}/run scripts = ${:etc}/run
run = ${:var}/run run = ${:var}/run
backup = ${:srv}/backup backup = ${:srv}/backup
promises = ${:etc}/promise
plugins = ${:etc}/plugin
httpd-log = ${:log}/apache httpd-log = ${:log}/apache
php-ini-dir = ${:etc}/php php-ini-dir = ${:etc}/php
tmp-php = ${:tmp}/php tmp-php = ${:tmp}/php
...@@ -206,18 +204,9 @@ backend-url = ${apache-php-configuration:url} ...@@ -206,18 +204,9 @@ backend-url = ${apache-php-configuration:url}
#---------------- #----------------
#-- #--
#-- Deploy promises scripts. #-- Deploy promises scripts.
[promise-base]
recipe = slapos.cookbook:promise.plugin
eggs =
slapos.toolbox
mode = 644
output = ${directory:plugins}/${:name}
content =
from slapos.promise.plugin.${:module} import RunPromise
[promise] [promise]
# Check any apache port in ipv4, expect other ports and ipv6 to behave consistently # Check any apache port in ipv4, expect other ports and ipv6 to behave consistently
<= promise-base <= monitor-promise-base
module = check_port_listening module = check_port_listening
name = apache-httpd-port-listening.py name = apache-httpd-port-listening.py
config-hostname = ${apache-php-configuration:ip} config-hostname = ${apache-php-configuration:ip}
......
stack/lamp/instance-lamp.cfg.jinja2.in
View file @ aa4541d4
...@@ -18,15 +18,6 @@ cert-file = ${slap-connection:cert-file} ...@@ -18,15 +18,6 @@ cert-file = ${slap-connection:cert-file}
computer-id = ${slap-connection:computer-id} computer-id = ${slap-connection:computer-id}
partition-id = ${slap-connection:partition-id} partition-id = ${slap-connection:partition-id}
[promise-base]
recipe = slapos.cookbook:promise.plugin
eggs =
slapos.toolbox
mode = 644
output = ${directory:plugins}/$${:name}
content =
from slapos.promise.plugin.${:module} import RunPromise
[request-apache] [request-apache]
<= request-common <= request-common
software-type = apache software-type = apache
...@@ -114,14 +105,11 @@ password = ${publish-early:monitor-password} ...@@ -114,14 +105,11 @@ password = ${publish-early:monitor-password}
[monitor-conf-parameters] [monitor-conf-parameters]
[publish-connection-information] [publish-connection-information]
<= monitor-publish
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
{% for name, value in publish_dict.items() -%} {% for name, value in publish_dict.items() -%}
{{ name }} = {{ value }} {{ name }} = {{ value }}
{% endfor %} {% endfor %}
{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters:monitor-password}
monitor-password = ${publish-early:monitor-password}
monitor-user = ${monitor-publish-parameters:monitor-user}
{% do part_list.append('monitor-base') -%} {% do part_list.append('monitor-base') -%}
[buildout] [buildout]
......
stack/monitor/buildout.hash.cfg
View file @ aa4541d4
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[monitor2-template] [monitor2-template]
filename = instance-monitor.cfg.jinja2.in filename = instance-monitor.cfg.jinja2.in
md5sum = d3d5a44db790f2bdf4fcbe6ebffe261f md5sum = e1c7d1c21a942064e2f3f40463b10177
[monitor-httpd-conf] [monitor-httpd-conf]
_update_hash_filename_ = templates/monitor-httpd.conf.in _update_hash_filename_ = templates/monitor-httpd.conf.in
......
stack/monitor/instance-monitor.cfg.jinja2.in
View file @ aa4541d4
...@@ -20,7 +20,6 @@ run = ${:var}/run ...@@ -20,7 +20,6 @@ run = ${:var}/run
log = ${:var}/log log = ${:var}/log
scripts = ${:etc}/run scripts = ${:etc}/run
services = ${:etc}/service services = ${:etc}/service
promises = ${:etc}/promise
plugins = ${:etc}/plugin plugins = ${:etc}/plugin
monitor = ${:srv}/monitor monitor = ${:srv}/monitor
...@@ -108,7 +107,6 @@ promise-output-file = ${directory:monitor}/monitor-bootstrap-status ...@@ -108,7 +107,6 @@ promise-output-file = ${directory:monitor}/monitor-bootstrap-status
output-folder = ${monitor-directory:public}/promise output-folder = ${monitor-directory:public}/promise
history-folder = ${monitor-directory:public} history-folder = ${monitor-directory:public}
promise-folder = ${directory:plugins} promise-folder = ${directory:plugins}
legacy-promise-folder = ${directory:promises}
pid-path = ${monitor-directory:pids}/runpromise.pid pid-path = ${monitor-directory:pids}/runpromise.pid
partition-folder = ${buildout:directory} partition-folder = ${buildout:directory}
master-url = ${slap-connection:server-url} master-url = ${slap-connection:server-url}
......
stack/slapos.cfg
View file @ aa4541d4
...@@ -137,7 +137,7 @@ pytz = 2016.10 ...@@ -137,7 +137,7 @@ pytz = 2016.10
requests = 2.13.0 requests = 2.13.0
six = 1.12.0 six = 1.12.0
slapos.cookbook = 1.0.123 slapos.cookbook = 1.0.123
slapos.core = 1.5.2 slapos.core = 1.5.3
slapos.extension.strip = 0.4 slapos.extension.strip = 0.4
slapos.extension.shared = 1.0 slapos.extension.shared = 1.0
slapos.libnetworkcache = 0.19 slapos.libnetworkcache = 0.19
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7