Skip to content

slapos
slapos
Commit 9d866327 authored by Łukasz Nowak's avatar Łukasz Nowak Committed by Łukasz Nowak
Browse files
Options

caddy-frontend: Modernize profiles 

Features:

 * jinja2 is used to generate instance templates
 * downloads are done the same way for all resources
 * create with shared content for all instance profiles
 * fill in instance-common with shared sections
 * render templates late in order to ease its extenension and development
 * drop not needd duplicated section
 * drop slap-parameter in frontend and replicate template
 * simplify monitor configuration
 * move instance-parameter to instance file
   Thanks to this only one and topmost profile is reponsible for parsing and
   passing through the information which comes from the network
parent 8d39cd73
Hide whitespace changes
Inline Side-by-side
Showing with 919 additions and 112 deletions
software/caddy-frontend/TODO.rst
View file @ 9d866327
...@@ -26,7 +26,7 @@ Generally things to be done with ``caddy-frontend``: ...@@ -26,7 +26,7 @@ Generally things to be done with ``caddy-frontend``:
* ``apache-ca-certificate`` * ``apache-ca-certificate``
* ``apache-certificate`` and ``apache-key`` * ``apache-certificate`` and ``apache-key``
* change ``switch-softwaretype`` to way how ``software/erp5`` does, which will help with dropping jinja2 template for ``caddy-wrapper``, which is workaround for current situation, cf `note_62678 <https://lab.nexedi.com/nexedi/slapos/merge_requests/312#note_62678>`_ * drop jinja2 template for ``caddy-wrapper``
* use `slapos!326 <https://lab.nexedi.com/nexedi/slapos/merge_requests/326>`_, and especially `note about complex restart scenarios <https://lab.nexedi.com/nexedi/slapos/merge_requests/326#note_60198>`_, instead of self-developed graceful restart scripts * use `slapos!326 <https://lab.nexedi.com/nexedi/slapos/merge_requests/326>`_, and especially `note about complex restart scenarios <https://lab.nexedi.com/nexedi/slapos/merge_requests/326#note_60198>`_, instead of self-developed graceful restart scripts
* move out ``test/utils.py`` and use it from shared python distribution * move out ``test/utils.py`` and use it from shared python distribution
* provide various tricks for older browsers:: * provide various tricks for older browsers::
...@@ -61,7 +61,7 @@ Generally things to be done with ``caddy-frontend``: ...@@ -61,7 +61,7 @@ Generally things to be done with ``caddy-frontend``:
<FilesMatch "\.(cgi|shtml|phtml|php)$"> <FilesMatch "\.(cgi|shtml|phtml|php)$">
SSLOptions +StdEnvVars SSLOptions +StdEnvVars
</FilesMatch> </FilesMatch>
* reduce the time of configuration validation (in ``instance-apache-frontend.cfg`` sections ``[configtest]``, ``[caddy-configuration]``, ``[nginx-configuration]``), as it is not scalable on frontend with 2000+ slaves (takes few minutes instead of few, < 5, seconds), issue posted `upstream <https://github.com/mholt/caddy/issues/2220>`_ * reduce the time of configuration validation (in ``instance-apache-frontend.cfg.in`` sections ``[configtest]``, ``[caddy-configuration]``, ``[nginx-configuration]``), as it is not scalable on frontend with 2000+ slaves (takes few minutes instead of few, < 5, seconds), issue posted `upstream <https://github.com/mholt/caddy/issues/2220>`_
* drop ``6tunnel`` and use ``bind`` in Caddy configuration, as soon as multiple binds will be possible, tracked in upstream `bind: support multiple values <https://github.com/mholt/caddy/pull/2128>`_ and `ipv6: does not bind on ipv4 and ipv6 for sites that resolve to both <https://github.com/mholt/caddy/issues/864>`_ * drop ``6tunnel`` and use ``bind`` in Caddy configuration, as soon as multiple binds will be possible, tracked in upstream `bind: support multiple values <https://github.com/mholt/caddy/pull/2128>`_ and `ipv6: does not bind on ipv4 and ipv6 for sites that resolve to both <https://github.com/mholt/caddy/issues/864>`_
* use caddy-frontend in `standalone style playbooks <https://lab.nexedi.com/nexedi/slapos.package/tree/master/playbook/roles/standalone-shared>`_ * use caddy-frontend in `standalone style playbooks <https://lab.nexedi.com/nexedi/slapos.package/tree/master/playbook/roles/standalone-shared>`_
* ensure `QUIC <https://en.wikipedia.org/wiki/QUIC>`_ is used by caddy * ensure `QUIC <https://en.wikipedia.org/wiki/QUIC>`_ is used by caddy
......
software/caddy-frontend/buildout.hash.cfg
View file @ 9d866327
...@@ -13,20 +13,24 @@ ...@@ -13,20 +13,24 @@
# section inheritance (< = ...) are NOT supported (but you should really # section inheritance (< = ...) are NOT supported (but you should really
# not need these here). # not need these here).
[template] [template]
filename = instance.cfg filename = instance.cfg.in
md5sum = b73505ae80d6325a244f5094f8edc0ae md5sum = 345b3a9b12241448913ec3ec8f929d51
[template-common]
filename = instance-common.cfg.in
md5sum = c801b7f9f11f0965677c22e6bbe9281b
[template-apache-frontend] [template-apache-frontend]
filename = instance-apache-frontend.cfg filename = instance-apache-frontend.cfg.in
md5sum = b170d0987563b481eb71cf705c3658ab md5sum = da1f58f77e81e11264e5e2131794dc19
[template-apache-replicate] [template-apache-replicate]
filename = instance-apache-replicate.cfg.in filename = instance-apache-replicate.cfg.in
md5sum = 27e98547061bd81e5f84cb7dd21b683b md5sum = 8d34141a9cd1e51462aba845c7bea85b
[template-slave-list] [template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in filename = templates/apache-custom-slave-list.cfg.in
md5sum = fb6c93f42f232e381174a5951c3fc222 md5sum = bdce0cf67a8f533891eabdec0b7eee87
[template-slave-configuration] [template-slave-configuration]
filename = templates/custom-virtualhost.conf.in filename = templates/custom-virtualhost.conf.in
...@@ -34,7 +38,7 @@ md5sum = 54ae95597a126ae552c3a913ddf29e5e ...@@ -34,7 +38,7 @@ md5sum = 54ae95597a126ae552c3a913ddf29e5e
[template-replicate-publish-slave-information] [template-replicate-publish-slave-information]
filename = templates/replicate-publish-slave-information.cfg.in filename = templates/replicate-publish-slave-information.cfg.in
md5sum = 8d318af17da5631d4242c0d6d1531066 md5sum = 6a308c29b54d53cfd82ae23ba77a35dd
[template-caddy-frontend-configuration] [template-caddy-frontend-configuration]
filename = templates/Caddyfile.in filename = templates/Caddyfile.in
...@@ -42,7 +46,7 @@ md5sum = 6689d96fc18d9aad78d77fe87770d4da ...@@ -42,7 +46,7 @@ md5sum = 6689d96fc18d9aad78d77fe87770d4da
[template-custom-slave-list] [template-custom-slave-list]
filename = templates/apache-custom-slave-list.cfg.in filename = templates/apache-custom-slave-list.cfg.in
md5sum = fb6c93f42f232e381174a5951c3fc222 md5sum = bdce0cf67a8f533891eabdec0b7eee87
[caddy-backend-url-validator] [caddy-backend-url-validator]
filename = templates/caddy-backend-url-validator.in filename = templates/caddy-backend-url-validator.in
......
software/caddy-frontend/common.cfg
View file @ 9d866327
...@@ -34,16 +34,72 @@ eggs += ...@@ -34,16 +34,72 @@ eggs +=
websockify websockify
erp5.util erp5.util
[template-common]
recipe = slapos.recipe.template:jinja2
template = ${:_profile_base_location_}/instance-common.cfg.in
rendered = ${buildout:directory}/instance-common.cfg
mode = 0644
context =
key develop_eggs_directory buildout:develop-eggs-directory
key eggs_directory buildout:eggs-directory
[template-frontend-parameter-section]
common_profile = ${template-common:rendered}
bin_directory = ${buildout:bin-directory}
sixtunnel = ${6tunnel:location}
caddy = ${caddy:output}
caddy_location = ${caddy:location}
curl = ${curl:location}
dash = ${dash:location}
dcron = ${dcron:location}
gzip = ${gzip:location}
logrotate = ${logrotate:location}
openssl = ${openssl:location}
trafficserver = ${trafficserver:location}
monitor_template = ${monitor-template:output}
template_cached_slave_virtualhost = ${template-cached-slave-virtualhost:target}
template_caddy_frontend_configuration = ${template-caddy-frontend-configuration:target}
template_caddy_graceful_script = ${template-caddy-graceful-script:target}
template_caddy_lazy_script_call = ${template-caddy-lazy-script-call:target}
template_caddy_wrapper = ${template-caddy-wrapper:output}
template_default_slave_virtualhost = ${template-default-slave-virtualhost:target}
template_empty = ${template-empty:target}
template_log_access = ${template-log-access:target}
template_nging_configuration = ${template-nginx-configuration:output}
template_nginx_eventsource_slave_virtualhost = ${template-nginx-eventsource-slave-virtualhost:target}
template_nginx_notebook_slave_virtualhost = ${template-nginx-notebook-slave-virtualhost:target}
template_not_found_html = ${template-not-found-html:target}
template_slave_configuration = ${template-slave-configuration:target}
template_slave_list = ${template-slave-list:target}
template_trafficserver_records_config = ${template-trafficserver-records-config:location}
template_trafficserver_records_config_filename = ${template-trafficserver-records-config:filename}
template_trafficserver_records_config_location = ${template-trafficserver-records-config:location}
template_trafficserver_storage_config_filename = ${template-trafficserver-storage-config:filename}
template_trafficserver_storage_config_location = ${template-trafficserver-storage-config:location}
template_wrapper = ${template-wrapper:output}
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template:jinja2
url = ${:_profile_base_location_}/instance.cfg template = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/template.cfg rendered = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
context =
key common_profile template-common:rendered
key monitor2_template monitor2-template:rendered
key template_caddy_frontend template-caddy-frontend:target
key template_caddy_replicate template-caddy-replicate:target
key template_replicate_publish_slave_information template-replicate-publish-slave-information:target
key caddy_backend_url_validator caddy-backend-url-validator:output
section template_frontend_parameter_dict template-frontend-parameter-section
[template-caddy-frontend] [template-caddy-frontend]
recipe = slapos.recipe.template recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-apache-frontend.cfg url = ${:_profile_base_location_}/instance-apache-frontend.cfg.in
output = ${buildout:directory}/template-caddy-frontend.cfg
mode = 0644 mode = 0644
[caddy-backend-url-validator] [caddy-backend-url-validator]
...@@ -116,22 +172,14 @@ output = ${buildout:directory}/template-wrapper.cfg ...@@ -116,22 +172,14 @@ output = ${buildout:directory}/template-wrapper.cfg
mode = 0644 mode = 0644
[template-trafficserver-records-config] [template-trafficserver-records-config]
recipe = hexagonit.recipe.download <=download-template
ignore-existing = true
url = ${:_profile_base_location_}/templates/trafficserver/${:filename} url = ${:_profile_base_location_}/templates/trafficserver/${:filename}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = records.config.jinja2 filename = records.config.jinja2
download-only = true
mode = 0644
[template-trafficserver-storage-config] [template-trafficserver-storage-config]
recipe = hexagonit.recipe.download <=download-template
ignore-existing = true
url = ${:_profile_base_location_}/templates/trafficserver/${:filename} url = ${:_profile_base_location_}/templates/trafficserver/${:filename}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = storage.config.jinja2 filename = storage.config.jinja2
download-only = true
mode = 0644
# NGINX Configuration # NGINX Configuration
[template-nginx-configuration] [template-nginx-configuration]
......
software/caddy-frontend/instance-apache-frontend.cfg → software/caddy-frontend/instance-apache-frontend.cfg.in
View file @ 9d866327
[buildout] [buildout]
extends =
{{ parameter_dict['common_profile'] }}
{{ parameter_dict['monitor_template'] }}
parts = parts =
directory directory
configtest configtest
...@@ -51,134 +55,93 @@ parts = ...@@ -51,134 +55,93 @@ parts =
monitor-caddy-server-status-wrapper monitor-caddy-server-status-wrapper
monitor-verify-re6st-connectivity monitor-verify-re6st-connectivity
extends = ${monitor-template:output}
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
# Create all needed directories # Create all needed directories
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
bin = $${buildout:directory}/bin/ bin = ${buildout:directory}/bin/
etc = $${buildout:directory}/etc/ etc = ${buildout:directory}/etc/
srv = $${buildout:directory}/srv/ srv = ${buildout:directory}/srv/
var = $${buildout:directory}/var/ var = ${buildout:directory}/var/
template = $${buildout:directory}/template/ template = ${buildout:directory}/template/
backup = $${:srv}/backup backup = ${:srv}/backup
log = $${:var}/log 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 promise = ${:etc}/promise
logrotate-backup = $${:backup}/logrotate logrotate-backup = ${:backup}/logrotate
logrotate-entries = $${:etc}/logrotate.d logrotate-entries = ${:etc}/logrotate.d
cron-entries = $${:etc}/cron.d cron-entries = ${:etc}/cron.d
crontabs = $${:etc}/crontabs crontabs = ${:etc}/crontabs
cronstamps = $${:etc}/cronstamps cronstamps = ${:etc}/cronstamps
ca-dir = $${:srv}/ssl ca-dir = ${:srv}/ssl
varnginx = $${:var}/nginx varnginx = ${:var}/nginx
[switch-caddy-softwaretype] [switch-caddy-softwaretype]
recipe = slapos.cookbook:softwaretype recipe = slapos.cookbook:softwaretype
single-default = $${dynamic-custom-personal-template-slave-list:rendered} single-default = ${dynamic-custom-personal-template-slave-list:rendered}
single-custom-personal = $${dynamic-custom-personal-template-slave-list:rendered} single-custom-personal = ${dynamic-custom-personal-template-slave-list:rendered}
[instance-parameter]
# Fetches parameters defined in SlapOS Master for this instance.
# Always the same.
recipe = slapos.cookbook:slapconfiguration.serialised
computer = $${slap-connection:computer-id}
partition = $${slap-connection:partition-id}
url = $${slap-connection:server-url}
key = $${slap-connection:key-file}
cert = $${slap-connection:cert-file}
# Define default parameter(s) that will be used later, in case user didn't
# specify it
# All parameters are available through the configuration.XX syntax.
# All possible parameters should have a default.
configuration.domain = example.org
configuration.public-ipv4 =
configuration.port = 4443
configuration.plain_http_port = 8080
configuration.plain_nginx_port = 8081
configuration.nginx_port = 9443
configuration.server-admin = admin@example.com
# BBB: apache_custom_https and apache_custom_http
configuration.apache_custom_https = ""
configuration.apache_custom_http = ""
configuration.caddy_custom_https = ""
configuration.caddy_custom_http = ""
configuration.apache-key =
configuration.apache-certificate =
configuration.apache-ca-certificate =
configuration.open-port = 80 443
configuration.extra_slave_instance_list =
configuration.disk-cache-size = 8G
configuration.ram-cache-size = 1G
configuration.trafficserver-autoconf-port = 8083
configuration.trafficserver-mgmt-port = 8084
configuration.re6st-verification-url = http://[2001:67c:1254:4::1]/index.html
configuration.enable-http2-by-default = true
configuration.mpm-graceful-shutdown-timeout = 5
configuration.monitor-httpd-port = 8072
[frontend-configuration] [frontend-configuration]
template-log-access = ${template-log-access:target} template-log-access = {{ parameter_dict['template_log_access'] }}
log-access-configuration = $${directory:etc}/log-access.conf log-access-configuration = ${directory:etc}/log-access.conf
caddy-directory = ${caddy:location} caddy-directory = {{ parameter_dict['caddy_location'] }}
caddy-ipv6 = $${instance-parameter:ipv6-random} caddy-ipv6 = {{ instance_parameter['ipv6-random'] }}
caddy-https-port = $${instance-parameter:configuration.port} caddy-https-port = ${configuration:port}
[jinja2-template-base] [jinja2-template-base]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
rendered = $${buildout:directory}/$${:filename} rendered = ${buildout:directory}/${:filename}
extra-context = extra-context =
slapparameter_dict = {{ dumps(instance_parameter['configuration']) }}
slap_software_type = {{ dumps(instance_parameter['slap-software-type']) }}
context = context =
import json_module json import json_module json
key eggs_directory buildout:eggs-directory raw common_profile {{ parameter_dict['common_profile'] }}
key develop_eggs_directory buildout:develop-eggs-directory key slap_software_type :slap_software_type
key slap_software_type instance-parameter:slap-software-type key slapparameter_dict :slapparameter_dict
key slapparameter_dict instance-parameter:configuration
section directory directory section directory directory
$${:extra-context} ${:extra-context}
[software-release-path] [software-release-path]
template-empty = ${template-empty:target} template-empty = {{ parameter_dict['template_empty'] }}
template-slave-configuration = ${template-slave-configuration:target} template-slave-configuration = {{ parameter_dict['template_slave_configuration'] }}
template-default-slave-virtualhost = ${template-default-slave-virtualhost:target} template-default-slave-virtualhost = {{ parameter_dict['template_default_slave_virtualhost'] }}
template-cached-slave-virtualhost = ${template-cached-slave-virtualhost:target} template-cached-slave-virtualhost = {{ parameter_dict['template_cached_slave_virtualhost'] }}
caddy-location = ${caddy:location} caddy-location = {{ parameter_dict['caddy_location'] }}
template-nginx-eventsource-slave-virtualhost = ${template-nginx-eventsource-slave-virtualhost:target} template-nginx-eventsource-slave-virtualhost = {{ parameter_dict['template_nginx_eventsource_slave_virtualhost'] }}
template-nginx-notebook-slave-virtualhost = ${template-nginx-notebook-slave-virtualhost:target} template-nginx-notebook-slave-virtualhost = {{ parameter_dict['template_nginx_notebook_slave_virtualhost'] }}
[dynamic-custom-personal-template-slave-list] [dynamic-custom-personal-template-slave-list]
< = jinja2-template-base < = jinja2-template-base
template = ${template-slave-list:target} template = {{ parameter_dict['template_slave_list'] }}
filename = custom-personal-instance-slave-list.cfg filename = custom-personal-instance-slave-list.cfg
extensions = jinja2.ext.do extensions = jinja2.ext.do
slave_instance_list = {{ dumps(instance_parameter['slave-instance-list']) }}
extra_slave_instance_list = ${configuration:extra_slave_instance_list}
local_ipv4 = {{ dumps(instance_parameter['ipv4-random']) }}
local_ipv6 = {{ dumps(instance_parameter['ipv6-random']) }}
extra-context = extra-context =
key caddy_configuration_directory caddy-directory:slave-configuration key caddy_configuration_directory caddy-directory:slave-configuration
key nginx_configuration_directory caddy-directory:nginx-slave-configuration key nginx_configuration_directory caddy-directory:nginx-slave-configuration
key caddy_cached_configuration_directory caddy-directory:slave-with-cache-configuration key caddy_cached_configuration_directory caddy-directory:slave-with-cache-configuration
key slave_with_cache_configuration_directory caddy-directory:slave-with-cache-configuration key slave_with_cache_configuration_directory caddy-directory:slave-with-cache-configuration
key http_port instance-parameter:configuration.plain_http_port key http_port configuration:plain_http_port
key https_port instance-parameter:configuration.port key https_port configuration:port
key nginx_http_port instance-parameter:configuration.plain_nginx_port key nginx_http_port configuration:plain_nginx_port
key nginx_https_port instance-parameter:configuration.nginx_port key nginx_https_port configuration:nginx_port
key public_ipv4 instance-parameter:configuration.public-ipv4 key public_ipv4 configuration:public-ipv4
key slave_instance_list instance-parameter:slave-instance-list key slave_instance_list :slave_instance_list
key extra_slave_instance_list instance-parameter:configuration.extra_slave_instance_list key extra_slave_instance_list :extra_slave_instance_list
key custom_ssl_directory caddy-directory:vh-ssl key custom_ssl_directory caddy-directory:vh-ssl
key caddy_log_directory caddy-directory:slave-log key caddy_log_directory caddy-directory:slave-log
key local_ipv4 instance-parameter:ipv4-random key local_ipv4 :local_ipv4
key local_ipv6 instance-parameter:ipv6-random key local_ipv6 :local_ipv6
key global_ipv6 slap-network-information:global-ipv6 key global_ipv6 slap-network-information:global-ipv6
key varnginx directory:varnginx key varnginx directory:varnginx
key empty_template software-release-path:template-empty key empty_template software-release-path:template-empty
...@@ -196,41 +159,42 @@ extra-context = ...@@ -196,41 +159,42 @@ extra-context =
key monitor_base_url monitor-instance-parameter:monitor-base-url key monitor_base_url monitor-instance-parameter:monitor-base-url
key promise_directory monitor-directory:promises key promise_directory monitor-directory:promises
key report_directory monitor-directory:reports key report_directory monitor-directory:reports
raw bin_directory ${buildout:bin-directory} raw bin_directory {{ parameter_dict['bin_directory'] }}
key login_certificate ca-frontend:cert-file key login_certificate ca-frontend:cert-file
key login_key ca-frontend:key-file key login_key ca-frontend:key-file
key login_ca_crt ca-custom-frontend:rendered key login_ca_crt ca-custom-frontend:rendered
key enable_http2_by_default instance-parameter:configuration.enable-http2-by-default key enable_http2_by_default configuration:enable-http2-by-default
key access_log caddy-configuration:access-log key access_log caddy-configuration:access-log
key error_log caddy-configuration:error-log key error_log caddy-configuration:error-log
raw sixtunnel_executable ${6tunnel:location}/bin/6tunnel raw sixtunnel_executable {{ parameter_dict['sixtunnel'] }}/bin/6tunnel
raw service_directory $${directory:service} raw service_directory ${directory:service}
key not_found_file caddy-configuration:not-found-file key not_found_file caddy-configuration:not-found-file
[dynamic-virtualhost-template-slave] [dynamic-virtualhost-template-slave]
<= jinja2-template-base <= jinja2-template-base
template = ${template-slave-configuration:target} template = {{ parameter_dict['template_slave_configuration'] }}
rendered = $${directory:template}/slave-virtualhost.conf.in rendered = ${directory:template}/slave-virtualhost.conf.in
extensions = jinja2.ext.do extensions = jinja2.ext.do
# BBB: apache_custom_https and apache_custom_http # BBB: apache_custom_https and apache_custom_http
extra-context = extra-context =
key https_port instance-parameter:configuration.port key https_port configuration:port
key http_port instance-parameter:configuration.plain_http_port key http_port configuration:plain_http_port
key apache_custom_https instance-parameter:configuration.apache_custom_https key apache_custom_https configuration:apache_custom_https
key apache_custom_http instance-parameter:configuration.apache_custom_http key apache_custom_http configuration:apache_custom_http
key caddy_custom_https instance-parameter:configuration.caddy_custom_https key caddy_custom_https configuration:caddy_custom_https
key caddy_custom_http instance-parameter:configuration.caddy_custom_http key caddy_custom_http configuration:caddy_custom_http
# Deploy Caddy Frontend with Jinja power # Deploy Caddy Frontend with Jinja power
[dynamic-caddy-frontend-template] [dynamic-caddy-frontend-template]
< = jinja2-template-base < = jinja2-template-base
template = ${template-caddy-frontend-configuration:target} template = {{ parameter_dict['template_caddy_frontend_configuration'] }}
rendered = $${caddy-configuration:frontend-configuration} rendered = ${caddy-configuration:frontend-configuration}
local_ipv4 = {{ dumps(instance_parameter['ipv4-random']) }}
extra-context = extra-context =
key httpd_home software-release-path:caddy-location key httpd_home software-release-path:caddy-location
key httpd_mod_ssl_cache_directory caddy-directory:mod-ssl key httpd_mod_ssl_cache_directory caddy-directory:mod-ssl
key instance_home buildout:directory key instance_home buildout:directory
key server_admin instance-parameter:configuration.server-admin key server_admin configuration:server-admin
key login_certificate ca-frontend:cert-file key login_certificate ca-frontend:cert-file
key login_key ca-frontend:key-file key login_key ca-frontend:key-file
key login_ca_crt ca-custom-frontend:rendered key login_ca_crt ca-custom-frontend:rendered
...@@ -242,150 +206,151 @@ extra-context = ...@@ -242,150 +206,151 @@ extra-context =
key ssl_cached_port caddy-configuration:ssl-cache-through-port key ssl_cached_port caddy-configuration:ssl-cache-through-port
key slave_with_cache_configuration_directory caddy-directory:slave-with-cache-configuration key slave_with_cache_configuration_directory caddy-directory:slave-with-cache-configuration
section frontend_configuration frontend-configuration section frontend_configuration frontend-configuration
key http_port instance-parameter:configuration.plain_http_port key http_port configuration:plain_http_port
key https_port instance-parameter:configuration.port key https_port configuration:port
key local_ipv4 instance-parameter:ipv4-random key local_ipv4 :local_ipv4
key global_ipv6 slap-network-information:global-ipv6 key global_ipv6 slap-network-information:global-ipv6
key error_log caddy-configuration:error-log key error_log caddy-configuration:error-log
key not_found_file caddy-configuration:not-found-file key not_found_file caddy-configuration:not-found-file
key username slap-parameter:monitor-username key username monitor-instance-parameter:username
key password slap-parameter:monitor-password key password monitor-htpasswd:passwd
[caddy-wrapper] [caddy-wrapper]
< = jinja2-template-base < = jinja2-template-base
template = ${template-caddy-wrapper:output} template = {{ parameter_dict['template_caddy_wrapper'] }}
rendered = $${directory:bin}/caddy-wrapper rendered = ${directory:bin}/caddy-wrapper
mode = 0700 mode = 0700
extra-context = extra-context =
raw caddy ${caddy:output} raw caddy {{ parameter_dict['caddy'] }}
key conf dynamic-caddy-frontend-template:rendered key conf dynamic-caddy-frontend-template:rendered
key log caddy-configuration:error-log key log caddy-configuration:error-log
key grace instance-parameter:configuration.mpm-graceful-shutdown-timeout key grace configuration:mpm-graceful-shutdown-timeout
[caddy-frontend] [caddy-frontend]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = $${caddy-wrapper:rendered} -pidfile $${caddy-configuration:pid-file} command-line = ${caddy-wrapper:rendered} -pidfile ${caddy-configuration:pid-file}
wrapper-path = $${directory:service}/frontend_caddy wrapper-path = ${directory:service}/frontend_caddy
wait-for-files = wait-for-files =
$${ca-frontend:cert-file} ${ca-frontend:cert-file}
$${ca-frontend:key-file} ${ca-frontend:key-file}
[not-found-html] [not-found-html]
recipe = slapos.cookbook:symbolic.link recipe = slapos.cookbook:symbolic.link
target-directory = $${caddy-directory:document-root} target-directory = ${caddy-directory:document-root}
link-binary = link-binary =
${template-not-found-html:target} {{ parameter_dict['template_not_found_html'] }}
[caddy-directory] [caddy-directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
document-root = $${directory:srv}/htdocs document-root = ${directory:srv}/htdocs
slave-configuration = $${directory:etc}/caddy-slave-conf.d/ slave-configuration = ${directory:etc}/caddy-slave-conf.d/
slave-with-cache-configuration = $${directory:etc}/caddy-slave-with-cache-conf.d/ slave-with-cache-configuration = ${directory:etc}/caddy-slave-with-cache-conf.d/
cache = $${directory:var}/cache cache = ${directory:var}/cache
mod-ssl = $${:cache}/httpd_mod_ssl mod-ssl = ${:cache}/httpd_mod_ssl
vh-ssl = $${:slave-configuration}/ssl vh-ssl = ${:slave-configuration}/ssl
slave-log = $${directory:log}/httpd slave-log = ${directory:log}/httpd
nginx-slave-configuration = $${directory:etc}/nginx-slave-conf.d/ nginx-slave-configuration = ${directory:etc}/nginx-slave-conf.d/
[caddy-configuration] [caddy-configuration]
frontend-configuration = $${directory:etc}/Caddyfile frontend-configuration = ${directory:etc}/Caddyfile
access-log = $${directory:log}/frontend-access.log access-log = ${directory:log}/frontend-access.log
error-log = $${directory:log}/frontend-error.log error-log = ${directory:log}/frontend-error.log
pid-file = $${directory:run}/httpd.pid pid-file = ${directory:run}/httpd.pid
frontend-configuration-verification = $${caddy-wrapper:rendered} -validate > /dev/null frontend-configuration-verification = ${caddy-wrapper:rendered} -validate > /dev/null
frontend-graceful-command = $${:frontend-configuration-verification}; if [ $? -eq 0 ]; then kill -USR1 $(cat $${:pid-file}); fi frontend-graceful-command = ${:frontend-configuration-verification}; if [ $? -eq 0 ]; then kill -USR1 $(cat ${:pid-file}); fi
not-found-file = $${caddy-directory:document-root}/notfound.html not-found-file = ${caddy-directory:document-root}/notfound.html
# Communication with ATS # Communication with ATS
cache-port = $${trafficserver-variable:input-port} cache-port = ${trafficserver-variable:input-port}
cache-through-port = 26011 cache-through-port = 26011
ssl-cache-through-port = 26012 ssl-cache-through-port = 26012
[configtest] [configtest]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = $${caddy-wrapper:rendered} -validate command-line = ${caddy-wrapper:rendered} -validate
wrapper-path = $${directory:bin}/caddy-configtest wrapper-path = ${directory:bin}/caddy-configtest
[certificate-authority] [certificate-authority]
recipe = slapos.cookbook:certificate_authority recipe = slapos.cookbook:certificate_authority
openssl-binary = ${openssl:location}/bin/openssl openssl-binary = {{ parameter_dict['openssl'] }}/bin/openssl
ca-dir = $${directory:ca-dir} ca-dir = ${directory:ca-dir}
requests-directory = $${cadirectory:requests} requests-directory = ${cadirectory:requests}
wrapper = $${directory:service}/certificate_authority wrapper = ${directory:service}/certificate_authority
ca-private = $${cadirectory:private} ca-private = ${cadirectory:private}
ca-certs = $${cadirectory:certs} ca-certs = ${cadirectory:certs}
ca-newcerts = $${cadirectory:newcerts} ca-newcerts = ${cadirectory:newcerts}
ca-crl = $${cadirectory:crl} ca-crl = ${cadirectory:crl}
[cadirectory] [cadirectory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
requests = $${directory:ca-dir}/requests/ requests = ${directory:ca-dir}/requests/
private = $${directory:ca-dir}/private/ private = ${directory:ca-dir}/private/
certs = $${directory:ca-dir}/certs/ certs = ${directory:ca-dir}/certs/
newcerts = $${directory:ca-dir}/newcerts/ newcerts = ${directory:ca-dir}/newcerts/
crl = $${directory:ca-dir}/crl/ crl = ${directory:ca-dir}/crl/
[ca-frontend] [ca-frontend]
<= certificate-authority <= certificate-authority
recipe = slapos.cookbook:certificate_authority.request recipe = slapos.cookbook:certificate_authority.request
key-file = $${cadirectory:certs}/frontend.key key-file = ${cadirectory:certs}/frontend.key
cert-file = $${cadirectory:certs}/frontend.crt cert-file = ${cadirectory:certs}/frontend.crt
executable = $${directory:service}/frontend_caddy executable = ${directory:service}/frontend_caddy
wrapper = $${directory:service}/frontend_caddy wrapper = ${directory:service}/frontend_caddy
key-content = $${instance-parameter:configuration.apache-key} key-content = ${configuration:apache-key}
cert-content = $${instance-parameter:configuration.apache-certificate} cert-content = ${configuration:apache-certificate}
# Put domain name # Put domain name
name = $${instance-parameter:configuration.domain} name = ${configuration:domain}
[ca-custom-frontend] [ca-custom-frontend]
< = jinja2-template-base < = jinja2-template-base
template = ${template-empty:target} template = {{ parameter_dict['template_empty'] }}
rendered = $${cadirectory:certs}/frontend.ca.crt rendered = ${cadirectory:certs}/frontend.ca.crt
apache-ca-certificate = ${configuration:apache-ca-certificate}
extra-context = extra-context =
key content instance-parameter:configuration.apache-ca-certificate key content :apache-ca-certificate
[cron] [cron]
recipe = slapos.cookbook:cron recipe = slapos.cookbook:cron
dcrond-binary = ${dcron:location}/sbin/crond dcrond-binary = {{ parameter_dict['dcron'] }}/sbin/crond
cron-entries = $${directory:cron-entries} cron-entries = ${directory:cron-entries}
crontabs = $${directory:crontabs} crontabs = ${directory:crontabs}
cronstamps = $${directory:cronstamps} cronstamps = ${directory:cronstamps}
catcher = $${cron-simplelogger:wrapper} catcher = ${cron-simplelogger:wrapper}
binary = $${directory:service}/crond binary = ${directory:service}/crond
[cron-simplelogger] [cron-simplelogger]
recipe = slapos.cookbook:simplelogger recipe = slapos.cookbook:simplelogger
wrapper = $${directory:bin}/cron_simplelogger wrapper = ${directory:bin}/cron_simplelogger
log = $${directory:log}/cron.log log = ${directory:log}/cron.log
[cron-entry-logrotate] [cron-entry-logrotate]
<= cron <= cron
recipe = slapos.cookbook:cron.d recipe = slapos.cookbook:cron.d
name = logrotate name = logrotate
frequency = 0 0 * * * frequency = 0 0 * * *
command = $${logrotate:wrapper} command = ${logrotate:wrapper}
# Deploy Logrotate # Deploy Logrotate
[logrotate] [logrotate]
recipe = slapos.cookbook:logrotate recipe = slapos.cookbook:logrotate
# Binaries # Binaries
logrotate-binary = ${logrotate:location}/sbin/logrotate logrotate-binary = {{ parameter_dict['logrotate'] }}/sbin/logrotate
gzip-binary = ${gzip:location}/bin/gzip gzip-binary = {{ parameter_dict['gzip'] }}/bin/gzip
gunzip-binary = ${gzip:location}/bin/gunzip gunzip-binary = {{ parameter_dict['gzip'] }}/bin/gunzip
# Directories # Directories
wrapper = $${directory:bin}/logrotate wrapper = ${directory:bin}/logrotate
conf = $${directory:etc}/logrotate.conf conf = ${directory:etc}/logrotate.conf
logrotate-entries = $${directory:logrotate-entries} logrotate-entries = ${directory:logrotate-entries}
backup = $${directory:logrotate-backup} backup = ${directory:logrotate-backup}
state-file = $${directory:srv}/logrotate.status state-file = ${directory:srv}/logrotate.status
[logrotate-entry-caddy] [logrotate-entry-caddy]
<= logrotate <= logrotate
recipe = slapos.cookbook:logrotate.d recipe = slapos.cookbook:logrotate.d
name = caddy name = caddy
log = $${caddy-configuration:error-log} $${caddy-configuration:access-log} log = ${caddy-configuration:error-log} ${caddy-configuration:access-log}
frequency = daily frequency = daily
rotatep-num = 30 rotatep-num = 30
post = $${frontend-caddy-lazy-graceful:rendered} & post = ${frontend-caddy-lazy-graceful:rendered} &
sharedscripts = true sharedscripts = true
notifempty = true notifempty = true
create = true create = true
...@@ -394,10 +359,10 @@ create = true ...@@ -394,10 +359,10 @@ create = true
<= logrotate <= logrotate
recipe = slapos.cookbook:logrotate.d recipe = slapos.cookbook:logrotate.d
name = caddy-nginx name = caddy-nginx
log = $${nginx-configuration:error_log} $${nginx-configuration:access_log} log = ${nginx-configuration:error_log} ${nginx-configuration:access_log}
frequency = daily frequency = daily
rotatep-num = 30 rotatep-num = 30
post = $${nginx-configuration:nginx-graceful-command} post = ${nginx-configuration:nginx-graceful-command}
sharedscripts = true sharedscripts = true
notifempty = true notifempty = true
create = true create = true
...@@ -407,93 +372,93 @@ create = true ...@@ -407,93 +372,93 @@ create = true
################# #################
[trafficserver-directory] [trafficserver-directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
configuration = $${directory:etc}/trafficserver configuration = ${directory:etc}/trafficserver
local-state = $${directory:var}/trafficserver local-state = ${directory:var}/trafficserver
bin_path = ${trafficserver:location}/bin bin_path = {{ parameter_dict['trafficserver'] }}/bin
log = $${directory:log}/trafficserver log = ${directory:log}/trafficserver
cache-path = $${directory:srv}/ats_cache cache-path = ${directory:srv}/ats_cache
[trafficserver-variable] [trafficserver-variable]
wrapper-path = $${directory:service}/trafficserver wrapper-path = ${directory:service}/trafficserver
reload-path = $${directory:etc-run}/trafficserver-reload reload-path = ${directory:etc-run}/trafficserver-reload
local-ip = $${instance-parameter:ipv4-random} local-ip = {{ instance_parameter['ipv4-random'] }}
input-port = 23432 input-port = 23432
hostname = $${instance-parameter:configuration.frontend-name} hostname = ${configuration:frontend-name}
remap = map /HTTPS/ http://$${instance-parameter:ipv4-random}:$${caddy-configuration:ssl-cache-through-port} remap = map /HTTPS/ http://{{ instance_parameter['ipv4-random'] }}:${caddy-configuration:ssl-cache-through-port}
map / http://$${instance-parameter:ipv4-random}:$${caddy-configuration:cache-through-port} map / http://{{ instance_parameter['ipv4-random'] }}:${caddy-configuration:cache-through-port}
plugin-config = ${trafficserver:location}/libexec/trafficserver/rfc5861.so plugin-config = {{ parameter_dict['trafficserver'] }}/libexec/trafficserver/rfc5861.so
cache-path = $${trafficserver-directory:cache-path} cache-path = ${trafficserver-directory:cache-path}
disk-cache-size = $${instance-parameter:configuration.disk-cache-size} disk-cache-size = ${configuration:disk-cache-size}
autoconf-port = $${instance-parameter:configuration.trafficserver-autoconf-port} autoconf-port = ${configuration:trafficserver-autoconf-port}
mgmt-port = $${instance-parameter:configuration.trafficserver-mgmt-port} mgmt-port = ${configuration:trafficserver-mgmt-port}
ram-cache-size = $${instance-parameter:configuration.ram-cache-size} ram-cache-size = ${configuration:ram-cache-size}
[trafficserver-configuration-directory] [trafficserver-configuration-directory]
recipe = plone.recipe.command recipe = plone.recipe.command
command = cp -rn ${trafficserver:location}/etc/trafficserver/* $${:target} command = cp -rn {{ parameter_dict['trafficserver'] }}/etc/trafficserver/* ${:target}
target = $${trafficserver-directory:configuration} target = ${trafficserver-directory:configuration}
[trafficserver-launcher] [trafficserver-launcher]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${trafficserver:location}/bin/traffic_cop command-line = {{ parameter_dict['trafficserver'] }}/bin/traffic_cop
wrapper-path = $${trafficserver-variable:wrapper-path} wrapper-path = ${trafficserver-variable:wrapper-path}
environment = TS_ROOT=$${buildout:directory} environment = TS_ROOT=${buildout:directory}
[trafficserver-reload] [trafficserver-reload]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${trafficserver:location}/bin/traffic_line -x command-line = {{ parameter_dict['trafficserver'] }}/bin/traffic_line -x
wrapper-path = $${trafficserver-variable:reload-path} wrapper-path = ${trafficserver-variable:reload-path}
environment = TS_ROOT=$${buildout:directory} environment = TS_ROOT=${buildout:directory}
# XXX Dedicated Jinja Section without slapparameter # XXX Dedicated Jinja Section without slapparameter
[trafficserver-jinja2-template-base] [trafficserver-jinja2-template-base]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
rendered = $${trafficserver-directory:configuration}/$${:filename} rendered = ${trafficserver-directory:configuration}/${:filename}
extra-context = extra-context =
mode = 600 mode = 600
context = context =
section ats_directory trafficserver-directory section ats_directory trafficserver-directory
section ats_configuration trafficserver-variable section ats_configuration trafficserver-variable
$${:extra-context} ${:extra-context}
[trafficserver-records-config] [trafficserver-records-config]
< = trafficserver-jinja2-template-base < = trafficserver-jinja2-template-base
template = ${template-trafficserver-records-config:location}/${template-trafficserver-records-config:filename} template = {{ parameter_dict['template_trafficserver_records_config_location'] }}/{{ parameter_dict['template_trafficserver_records_config_filename'] }}
filename = records.config filename = records.config
extra-context = extra-context =
import os_module os import os_module os
[trafficserver-storage-config] [trafficserver-storage-config]
< = trafficserver-jinja2-template-base < = trafficserver-jinja2-template-base
template = ${template-trafficserver-storage-config:location}/${template-trafficserver-storage-config:filename} template = {{ parameter_dict['template_trafficserver_storage_config_location'] }}/{{ parameter_dict['template_trafficserver_storage_config_filename'] }}
filename = storage.config filename = storage.config
[trafficserver-remap-config] [trafficserver-remap-config]
< = trafficserver-jinja2-template-base < = trafficserver-jinja2-template-base
template = ${template-empty:target} template = {{ parameter_dict['template_empty'] }}
filename = remap.config filename = remap.config
context = context =
key content trafficserver-variable:remap key content trafficserver-variable:remap
[trafficserver-plugin-config] [trafficserver-plugin-config]
< = trafficserver-jinja2-template-base < = trafficserver-jinja2-template-base
template = ${template-empty:target} template = {{ parameter_dict['template_empty'] }}
filename = plugin.config filename = plugin.config
context = context =
key content trafficserver-variable:plugin-config key content trafficserver-variable:plugin-config
[trafficserver-promise-listen-port] [trafficserver-promise-listen-port]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
path = $${directory:promise}/trafficserver-port-listening path = ${directory:promise}/trafficserver-port-listening
hostname = $${trafficserver-variable:local-ip} hostname = ${trafficserver-variable:local-ip}
port = $${trafficserver-variable:input-port} port = ${trafficserver-variable:input-port}
[trafficserver-line] [trafficserver-line]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${trafficserver:location}/bin/traffic_line command-line = {{ parameter_dict['trafficserver'] }}/bin/traffic_line
wrapper-path = $${directory:bin}/traffic_line wrapper-path = ${directory:bin}/traffic_line
environment = TS_ROOT=$${buildout:directory} environment = TS_ROOT=${buildout:directory}
[trafficserver-promise-cache-availability] [trafficserver-promise-cache-availability]
recipe = collective.recipe.template recipe = collective.recipe.template
...@@ -501,12 +466,12 @@ input = ...@@ -501,12 +466,12 @@ input =
inline:#!${buildout:executable} inline:#!${buildout:executable}
import subprocess import subprocess
import sys import sys
traffic_line = "$${trafficserver-line:wrapper-path}" traffic_line = "${trafficserver-line:wrapper-path}"
result = float(subprocess.check_output([traffic_line, '-r', 'proxy.node.cache.percent_free' ])) result = float(subprocess.check_output([traffic_line, '-r', 'proxy.node.cache.percent_free' ]))
if result != 0: sys.exit(0) if result != 0: sys.exit(0)
sys.stderr.write("Cache not available, availability: %s" % result) sys.stderr.write("Cache not available, availability: %s" % result)
sys.exit(127) sys.exit(127)
output = $${directory:promise}/trafficserver-cache-availability output = ${directory:promise}/trafficserver-cache-availability
mode = 700 mode = 700
### End of ATS sections ### End of ATS sections
...@@ -514,16 +479,16 @@ mode = 700 ...@@ -514,16 +479,16 @@ mode = 700
### Caddy Graceful and promises ### Caddy Graceful and promises
[frontend-caddy-graceful-bin] [frontend-caddy-graceful-bin]
< = jinja2-template-base < = jinja2-template-base
template = ${template-wrapper:output} template = {{ parameter_dict['template_wrapper'] }}
rendered = $${directory:bin}/frontend-caddy-safe-graceful rendered = ${directory:bin}/frontend-caddy-safe-graceful
mode = 0700 mode = 0700
extra-context = extra-context =
key content caddy-configuration:frontend-graceful-command key content caddy-configuration:frontend-graceful-command
[frontend-caddy-graceful] [frontend-caddy-graceful]
< = jinja2-template-base < = jinja2-template-base
template = ${template-caddy-graceful-script:target} template = {{ parameter_dict['template_caddy_graceful_script'] }}
rendered = $${directory:etc-run}/frontend-caddy-safe-graceful rendered = ${directory:etc-run}/frontend-caddy-safe-graceful
mode = 0700 mode = 0700
extra-context = extra-context =
key directory_run directory:run key directory_run directory:run
...@@ -533,10 +498,10 @@ extra-context = ...@@ -533,10 +498,10 @@ extra-context =
[frontend-caddy-lazy-graceful] [frontend-caddy-lazy-graceful]
< = jinja2-template-base < = jinja2-template-base
template = ${template-caddy-lazy-script-call:target} template = {{ parameter_dict['template_caddy_lazy_script_call'] }}
rendered = $${directory:bin}/frontend-caddy-lazy-graceful rendered = ${directory:bin}/frontend-caddy-lazy-graceful
mode = 0700 mode = 0700
pid-file = $${directory:run}/lazy-graceful.pid pid-file = ${directory:run}/lazy-graceful.pid
extra-context = extra-context =
key pid_file :pid-file key pid_file :pid-file
raw wait_time 60 raw wait_time 60
...@@ -545,167 +510,131 @@ extra-context = ...@@ -545,167 +510,131 @@ extra-context =
# Promises checking configuration: # Promises checking configuration:
[promise-frontend-caddy-configuration] [promise-frontend-caddy-configuration]
< = jinja2-template-base < = jinja2-template-base
template = ${template-wrapper:output} template = {{ parameter_dict['template_wrapper'] }}
rendered = $${directory:promise}/frontend-caddy-configuration-promise rendered = ${directory:promise}/frontend-caddy-configuration-promise
mode = 0700 mode = 0700
extra-context = extra-context =
key content caddy-configuration:frontend-configuration-verification key content caddy-configuration:frontend-configuration-verification
[promise-caddy-frontend-v4-https] [promise-caddy-frontend-v4-https]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
path = $${directory:promise}/caddy_frontend_ipv4_https path = ${directory:promise}/caddy_frontend_ipv4_https
hostname = $${instance-parameter:ipv4-random} hostname = {{ instance_parameter['ipv4-random'] }}
port = $${instance-parameter:configuration.port} port = ${configuration:port}
[promise-caddy-frontend-v4-http] [promise-caddy-frontend-v4-http]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
path = $${directory:promise}/caddy_frontend_ipv4_http path = ${directory:promise}/caddy_frontend_ipv4_http
hostname = $${instance-parameter:ipv4-random} hostname = {{ instance_parameter['ipv4-random'] }}
port = $${instance-parameter:configuration.plain_http_port} port = ${configuration:plain_http_port}
[promise-caddy-frontend-v6-https] [promise-caddy-frontend-v6-https]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
path = $${directory:promise}/caddy_frontend_ipv6_https path = ${directory:promise}/caddy_frontend_ipv6_https
hostname = $${instance-parameter:ipv6-random} hostname = {{ instance_parameter['ipv6-random'] }}
port = $${instance-parameter:configuration.port} port = ${configuration:port}
[promise-caddy-frontend-v6-http] [promise-caddy-frontend-v6-http]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
path = $${directory:promise}/caddy_frontend_ipv6_http path = ${directory:promise}/caddy_frontend_ipv6_http
hostname = $${instance-parameter:ipv6-random} hostname = {{ instance_parameter['ipv6-random'] }}
port = $${instance-parameter:configuration.plain_http_port} port = ${configuration:plain_http_port}
[promise-caddy-frontend-cached] [promise-caddy-frontend-cached]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
path = $${directory:promise}/caddy_cached path = ${directory:promise}/caddy_cached
hostname = $${instance-parameter:ipv4-random} hostname = {{ instance_parameter['ipv4-random'] }}
port = $${caddy-configuration:cache-through-port} port = ${caddy-configuration:cache-through-port}
[promise-caddy-frontend-ssl-cached] [promise-caddy-frontend-ssl-cached]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
path = $${directory:promise}/caddy_ssl_cached path = ${directory:promise}/caddy_ssl_cached
hostname = $${instance-parameter:ipv4-random} hostname = {{ instance_parameter['ipv4-random'] }}
port = $${caddy-configuration:ssl-cache-through-port} port = ${caddy-configuration:ssl-cache-through-port}
[promise-caddy-is-process-older-than-dependency-set] [promise-caddy-is-process-older-than-dependency-set]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${buildout:bin-directory}/is-process-older-than-dependency-set $${caddy-configuration:pid-file} command-line = {{ parameter_dict['bin_directory'] }}/is-process-older-than-dependency-set ${caddy-configuration:pid-file}
wrapper-path = $${directory:promise}/caddy-frontend-is-running-actual-software-release wrapper-path = ${directory:promise}/caddy-frontend-is-running-actual-software-release
[slap_connection]
# Kept for backward compatibility
computer_id = $${slap-connection:computer-id}
partition_id = $${slap-connection:partition-id}
server_url = $${slap-connection:server-url}
software_release_url = $${slap-connection:software-release-url}
key_file = $${slap-connection:key-file}
cert_file = $${slap-connection:cert-file}
[slap-parameter]
# Define default parameter(s) that will be used later, in case user didn't
# specify it
# All parameters are available through the configuration.XX syntax.
# All possible parameters should have a default.
domain = example.org
public-ipv4 =
port = 4443
plain_http_port = 8080
server-admin = admin@example.com
# BBB: apache_custom_https and apache_custom_http
apache_custom_https = ""
apache_custom_http = ""
caddy_custom_https = ""
caddy_custom_http = ""
apache-key =
apache-certificate =
open-port = 80 443
extra_slave_instance_list =
frontend-name =
monitor-cors-domains =
monitor-username = $${monitor-instance-parameter:username}
monitor-password = $${monitor-htpasswd:passwd}
####### #######
# Monitoring sections # Monitoring sections
# #
[monitor-instance-parameter] [monitor-instance-parameter]
monitor-httpd-port = $${instance-parameter:configuration.monitor-httpd-port} monitor-httpd-port = ${configuration:monitor-httpd-port}
cors-domains = $${slap-parameter:monitor-cors-domains}
username = $${slap-parameter:monitor-username}
password = $${slap-parameter:monitor-password}
[monitor-conf-parameters] [monitor-conf-parameters]
private-path-list += private-path-list +=
$${directory:logrotate-backup} ${directory:logrotate-backup}
[monitor-traffic-summary-last-stats-wrapper] [monitor-traffic-summary-last-stats-wrapper]
< = jinja2-template-base < = jinja2-template-base
template = ${template-wrapper:output} template = {{ parameter_dict['template_wrapper'] }}
rendered = $${monitor-directory:reports}/traffic-summary-last-stats_every_1_hour rendered = ${monitor-directory:reports}/traffic-summary-last-stats_every_1_hour
mode = 0700 mode = 0700
command = export TS_ROOT=$${buildout:directory} && echo "<pre>$(${trafficserver:location}/bin/traffic_logstats -f $${trafficserver-directory:log}/squid.blog)</pre>" command = export TS_ROOT=${buildout:directory} && echo "<pre>$({{ parameter_dict['trafficserver'] }}/bin/traffic_logstats -f ${trafficserver-directory:log}/squid.blog)</pre>"
extra-context = extra-context =
key content monitor-traffic-summary-last-stats-wrapper:command key content monitor-traffic-summary-last-stats-wrapper:command
# Produce ATS Cache stats # Produce ATS Cache stats
[monitor-ats-cache-stats-wrapper] [monitor-ats-cache-stats-wrapper]
< = jinja2-template-base < = jinja2-template-base
template = ${template-wrapper:output} template = {{ parameter_dict['template_wrapper'] }}
rendered = $${monitor-directory:reports}/ats-cache-stats_every_1_hour rendered = ${monitor-directory:reports}/ats-cache-stats_every_1_hour
mode = 0700 mode = 0700
command = export TS_ROOT=$${buildout:directory} && echo "<pre>$(${trafficserver:location}/bin/traffic_shell $${monitor-ats-cache-stats-config:rendered})</pre>" command = export TS_ROOT=${buildout:directory} && echo "<pre>$({{ parameter_dict['trafficserver'] }}/bin/traffic_shell ${monitor-ats-cache-stats-config:rendered})</pre>"
extra-context = extra-context =
key content monitor-ats-cache-stats-wrapper:command key content monitor-ats-cache-stats-wrapper:command
[monitor-caddy-server-status-wrapper] [monitor-caddy-server-status-wrapper]
< = jinja2-template-base < = jinja2-template-base
template = ${template-wrapper:output} template = {{ parameter_dict['template_wrapper'] }}
rendered = $${monitor-directory:reports}/monitor-caddy-server-status-wrapper rendered = ${monitor-directory:reports}/monitor-caddy-server-status-wrapper
mode = 0700 mode = 0700
command = ${curl:location}/bin/curl -s http://$${instance-parameter:ipv4-random}:$${instance-parameter:configuration.plain_http_port}/server-status -u $${monitor-instance-parameter:username}:$${monitor-htpasswd:passwd} 2>&1 command = {{ parameter_dict['curl'] }}/bin/curl -s http://{{ instance_parameter['ipv4-random'] }}:${configuration:plain_http_port}/server-status -u ${monitor-instance-parameter:username}:${monitor-htpasswd:passwd} 2>&1
extra-context = extra-context =
key content monitor-caddy-server-status-wrapper:command key content monitor-caddy-server-status-wrapper:command
[monitor-ats-cache-stats-config] [monitor-ats-cache-stats-config]
< = jinja2-template-base < = jinja2-template-base
template = ${template-empty:target} template = {{ parameter_dict['template_empty'] }}
rendered = $${trafficserver-configuration-directory:target}/cache-config.stats rendered = ${trafficserver-configuration-directory:target}/cache-config.stats
mode = 644 mode = 644
context = context =
raw content show:cache-stats raw content show:cache-stats
[monitor-verify-re6st-connectivity] [monitor-verify-re6st-connectivity]
recipe = slapos.cookbook:check_url_available recipe = slapos.cookbook:check_url_available
path = $${directory:promise}/re6st-connectivity path = ${directory:promise}/re6st-connectivity
url = $${instance-parameter:configuration.re6st-verification-url} url = ${configuration:re6st-verification-url}
dash_path = ${dash:location}/bin/dash dash_path = {{ parameter_dict['dash'] }}/bin/dash
curl_path = ${curl:location}/bin/curl curl_path = {{ parameter_dict['curl'] }}/bin/curl
####################### #######################
# Nginx # Nginx
# #
[nginx-wrapper] [nginx-wrapper]
< = jinja2-template-base < = jinja2-template-base
template = ${template-caddy-wrapper:output} template = {{ parameter_dict['template_caddy_wrapper'] }}
rendered = $${directory:bin}/nginx-wrapper rendered = ${directory:bin}/nginx-wrapper
mode = 0700 mode = 0700
extra-context = extra-context =
raw caddy ${caddy:output} raw caddy {{ parameter_dict['caddy'] }}
key conf dynamic-nginx-frontend-template:rendered key conf dynamic-nginx-frontend-template:rendered
key log nginx-configuration:error_log key log nginx-configuration:error_log
key grace instance-parameter:configuration.mpm-graceful-shutdown-timeout key grace configuration:mpm-graceful-shutdown-timeout
[nginx-frontend] [nginx-frontend]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = $${nginx-wrapper:rendered} -pidfile $${nginx-configuration:pid-file} command-line = ${nginx-wrapper:rendered} -pidfile ${nginx-configuration:pid-file}
wrapper-path = $${directory:service}/frontend_nginx wrapper-path = ${directory:service}/frontend_nginx
[dynamic-nginx-frontend-template] [dynamic-nginx-frontend-template]
< = jinja2-template-base < = jinja2-template-base
template = ${template-nginx-configuration:output} template = {{ parameter_dict['template_nging_configuration'] }}
rendered = $${directory:etc}/nginx.cfg rendered = ${directory:etc}/nginx.cfg
mode = 0600 mode = 0600
extra-context = extra-context =
key port nginx-configuration:port key port nginx-configuration:port
...@@ -719,72 +648,79 @@ extra-context = ...@@ -719,72 +648,79 @@ extra-context =
key not_found_file caddy-configuration:not-found-file key not_found_file caddy-configuration:not-found-file
[nginx-configuration] [nginx-configuration]
access_log = $${directory:log}/nginx-access.log access_log = ${directory:log}/nginx-access.log
error_log = $${directory:log}/nginx-error.log error_log = ${directory:log}/nginx-error.log
ip = $${slap-network-information:global-ipv6} ip = ${slap-network-information:global-ipv6}
local_ip = $${slap-network-information:local-ipv4} local_ip = ${slap-network-information:local-ipv4}
port = $${instance-parameter:configuration.nginx_port} port = ${configuration:nginx_port}
plain_port = $${instance-parameter:configuration.plain_nginx_port} plain_port = ${configuration:plain_nginx_port}
worker_processes = 4 worker_processes = 4
worker_connections = 1024 worker_connections = 1024
slave-configuration-directory = $${caddy-directory:nginx-slave-configuration} slave-configuration-directory = ${caddy-directory:nginx-slave-configuration}
pid-file = $${directory:run}/nginx.pid pid-file = ${directory:run}/nginx.pid
nginx-graceful-command = $${:nginx-configuration-verification}; if [ $? -eq 0 ]; then kill -HUP $(cat $${:pid-file}); fi nginx-graceful-command = ${:nginx-configuration-verification}; if [ $? -eq 0 ]; then kill -HUP $(cat ${:pid-file}); fi
nginx-configuration-verification = $${nginx-wrapper:rendered} -validate nginx-configuration-verification = ${nginx-wrapper:rendered} -validate
ssl_certificate = $${ca-frontend:cert-file} ssl_certificate = ${ca-frontend:cert-file}
ssl_key = $${ca-frontend:key-file} ssl_key = ${ca-frontend:key-file}
[frontend-nginx-graceful] [frontend-nginx-graceful]
< = jinja2-template-base < = jinja2-template-base
template = ${template-wrapper:output} template = {{ parameter_dict['template_wrapper'] }}
rendered = $${directory:etc-run}/frontend-nginx-safe-graceful rendered = ${directory:etc-run}/frontend-nginx-safe-graceful
mode = 0700 mode = 0700
extra-context = extra-context =
key content nginx-configuration:nginx-graceful-command key content nginx-configuration:nginx-graceful-command
[promise-nginx-configuration] [promise-nginx-configuration]
< = jinja2-template-base < = jinja2-template-base
template = ${template-wrapper:output} template = {{ parameter_dict['template_wrapper'] }}
rendered = $${directory:promise}/nginx-configuration-promise rendered = ${directory:promise}/nginx-configuration-promise
mode = 0700 mode = 0700
extra-context = extra-context =
key content nginx-configuration:nginx-configuration-verification key content nginx-configuration:nginx-configuration-verification
[promise-nginx-frontend-v4-https] [promise-nginx-frontend-v4-https]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
path = $${directory:promise}/nginx_frontend_ipv4_https path = ${directory:promise}/nginx_frontend_ipv4_https
hostname = $${instance-parameter:ipv4-random} hostname = {{ instance_parameter['ipv4-random'] }}
port = $${instance-parameter:configuration.nginx_port} port = ${configuration:nginx_port}
[promise-nginx-frontend-v4-http] [promise-nginx-frontend-v4-http]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
path = $${directory:promise}/nginx_frontend_ipv4_http path = ${directory:promise}/nginx_frontend_ipv4_http
hostname = $${instance-parameter:ipv4-random} hostname = {{ instance_parameter['ipv4-random'] }}
port = $${instance-parameter:configuration.plain_nginx_port} port = ${configuration:plain_nginx_port}
[promise-nginx-frontend-v6-https] [promise-nginx-frontend-v6-https]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
path = $${directory:promise}/nginx_frontend_ipv6_https path = ${directory:promise}/nginx_frontend_ipv6_https
hostname = $${instance-parameter:ipv6-random} hostname = {{ instance_parameter['ipv6-random'] }}
port = $${instance-parameter:configuration.nginx_port} port = ${configuration:nginx_port}
[promise-nginx-frontend-v6-http] [promise-nginx-frontend-v6-http]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
path = $${directory:promise}/nginx_frontend_ipv6_http path = ${directory:promise}/nginx_frontend_ipv6_http
hostname = $${instance-parameter:ipv6-random} hostname = {{ instance_parameter['ipv6-random'] }}
port = $${instance-parameter:configuration.plain_nginx_port} port = ${configuration:plain_nginx_port}
[promise-nginx-is-process-older-than-dependency-set] [promise-nginx-is-process-older-than-dependency-set]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${buildout:bin-directory}/is-process-older-than-dependency-set $${nginx-configuration:pid-file} command-line = {{ parameter_dict['bin_directory'] }}/is-process-older-than-dependency-set ${nginx-configuration:pid-file}
wrapper-path = $${directory:promise}/promise-nginx-is-process-older-than-dependency-set wrapper-path = ${directory:promise}/promise-nginx-is-process-older-than-dependency-set
[port-redirection] [port-redirection]
<= jinja2-template-base <= jinja2-template-base
template = inline: template = inline:
[{"srcPort": 80, "destPort": {{ http_port }}}, {"srcPort": 443, "destPort": {{ https_port }}}] [{"srcPort": 80, "destPort": {{ '{{' }} http_port {{ '}}' }}}, {"srcPort": 443, "destPort": {{ '{{' }} https_port {{ '}}' }}}]
rendered = $${buildout:directory}/.slapos-port-redirect rendered = ${buildout:directory}/.slapos-port-redirect
mode = 0644 mode = 0644
extra-context = extra-context =
key http_port instance-parameter:configuration.plain_http_port key http_port configuration:plain_http_port
key https_port instance-parameter:configuration.port key https_port configuration:port
[configuration]
{%- for key, value in instance_parameter.iteritems() -%}
{%- if key.startswith('configuration.') %}
{{ key.replace('configuration.', '') }} = {{ dumps(value) }}
{%- endif -%}
{%- endfor -%}
software/caddy-frontend/instance-apache-replicate.cfg.in
View file @ 9d866327
...@@ -6,10 +6,7 @@ rendered = ${buildout:directory}/${:filename} ...@@ -6,10 +6,7 @@ rendered = ${buildout:directory}/${:filename}
extra-context = extra-context =
context = context =
import json_module json import json_module json
key eggs_directory buildout:eggs-directory raw common_profile {{ common_profile }}
key develop_eggs_directory buildout:develop-eggs-directory
key slap_software_type slap-parameter:slap_software_type
key slave_instance_list slap-parameter:slave_instance_list
${:extra-context} ${:extra-context}
{% set part_list = [] %} {% set part_list = [] %}
...@@ -173,7 +170,9 @@ monitor-url-list += ...@@ -173,7 +170,9 @@ monitor-url-list +=
{% endfor %} {% endfor %}
[buildout] [buildout]
extends = {{ template_monitor }} extends =
{{ common_profile }}
{{ template_monitor }}
parts = parts =
monitor-base monitor-base
publish-slave-information publish-slave-information
...@@ -182,23 +181,4 @@ parts = ...@@ -182,23 +181,4 @@ parts =
{{ ' %s' % part }} {{ ' %s' % part }}
{% endfor %} {% endfor %}
# publish-information # publish-information
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
[slap_connection]
# Kept for backward compatibility
computer_id = ${slap-connection:computer-id}
partition_id = ${slap-connection:partition-id}
server_url = ${slap-connection:server-url}
software_release_url = ${slap-connection:software-release-url}
key_file = ${slap-connection:key-file}
cert_file = ${slap-connection:cert-file}
[slap-parameter]
slave_instance_list =
-frontend-quantity = 1
-frontend-type = single-default
{% endif %} {% endif %}
software/caddy-frontend/instance-common.cfg.in 0 → 100644
View file @ 9d866327
[buildout]
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
[slap_connection]
# Kept for backward compatibility
computer_id = ${slap-connection:computer-id}
partition_id = ${slap-connection:partition-id}
server_url = ${slap-connection:server-url}
software_release_url = ${slap-connection:software-release-url}
key_file = ${slap-connection:key-file}
cert_file = ${slap-connection:cert-file}
\ No newline at end of file
software/caddy-frontend/instance.cfg deleted 100644 → 0
View file @ 8d39cd73
[buildout]
parts =
dynamic-template-caddy-replicate
switch-softwaretype
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
[slap-parameters]
recipe = slapos.cookbook:slapconfiguration
computer = $${slap-connection:computer-id}
partition = $${slap-connection:partition-id}
url = $${slap-connection:server-url}
key = $${slap-connection:key-file}
cert = $${slap-connection:cert-file}
[jinja2-template-base]
recipe = slapos.recipe.template:jinja2
rendered = $${buildout:directory}/$${:filename}
extra-context =
context =
import json_module json
key eggs_directory buildout:eggs-directory
key develop_eggs_directory buildout:develop-eggs-directory
key slap_software_type slap-parameters:slap-software-type
key slapparameter_dict slap-parameters:configuration
key slave_instance_list slap-parameters:slave-instance-list
$${:extra-context}
[switch-softwaretype]
recipe = slapos.cookbook:softwaretype
default = $${dynamic-template-caddy-replicate:rendered}
RootSoftwareInstance = $${dynamic-template-caddy-replicate:rendered}
custom-personal = $${dynamic-template-caddy-replicate:rendered}
single-default = ${template-caddy-frontend:output}
single-custom-personal = ${template-caddy-frontend:output}
replicate = $${dynamic-template-caddy-replicate:rendered}
[dynamic-template-caddy-replicate]
< = jinja2-template-base
template = ${template-caddy-replicate:target}
filename = instance-caddy-replicate.cfg
extensions = jinja2.ext.do
extra-context =
import subprocess_module subprocess
raw caddy_backend_url_validator ${caddy-backend-url-validator:output}
raw template_publish_slave_information ${template-replicate-publish-slave-information:target}
# Must match the key id in [switch-softwaretype] which uses this section.
raw software_type RootSoftwareInstance-default-custom-personal-replicate
raw template_monitor ${monitor2-template:rendered}
software/caddy-frontend/instance.cfg.in 0 → 100644
View file @ 9d866327
[buildout]
extends = {{ common_profile }}
parts =
dynamic-template-caddy-replicate
switch-softwaretype
[jinja2-template-base]
recipe = slapos.recipe.template:jinja2
rendered = ${buildout:directory}/${:filename}
extra-context =
context =
import json_module json
key slap_software_type instance-parameter:slap-software-type
key slapparameter_dict instance-parameter:configuration
key slave_instance_list instance-parameter:slave-instance-list
section instance_parameter instance-parameter
${:extra-context}
[switch-softwaretype]
recipe = slapos.cookbook:softwaretype
default = ${dynamic-template-caddy-replicate:rendered}
RootSoftwareInstance = ${dynamic-template-caddy-replicate:rendered}
custom-personal = ${dynamic-template-caddy-replicate:rendered}
single-default = ${dynamic-template-caddy-frontend:rendered}
single-custom-personal = ${dynamic-template-caddy-frontend:rendered}
replicate = ${dynamic-template-caddy-replicate:rendered}
[dynamic-template-caddy-frontend-parameters]
{% for key,value in template_frontend_parameter_dict.iteritems() %}
{{ key }} = {{ dumps(value) }}
{% endfor -%}
[dynamic-template-caddy-frontend]
< = jinja2-template-base
template = {{ template_caddy_frontend }}
filename = instance-caddy-frontend.cfg
extensions = jinja2.ext.do
extra-context =
section parameter_dict dynamic-template-caddy-frontend-parameters
[dynamic-template-caddy-replicate]
< = jinja2-template-base
template = {{ template_caddy_replicate }}
filename = instance-caddy-replicate.cfg
extensions = jinja2.ext.do
extra-context =
import subprocess_module subprocess
raw caddy_backend_url_validator {{ caddy_backend_url_validator }}
raw template_publish_slave_information {{ template_replicate_publish_slave_information }}
# Must match the key id in [switch-softwaretype] which uses this section.
raw software_type RootSoftwareInstance-default-custom-personal-replicate
raw template_monitor {{ monitor2_template }}
raw common_profile {{ common_profile }}
[instance-parameter]
# Fetches parameters defined in SlapOS Master for this instance.
# Always the same.
recipe = slapos.cookbook:slapconfiguration.serialised
computer = ${slap-connection:computer-id}
partition = ${slap-connection:partition-id}
url = ${slap-connection:server-url}
key = ${slap-connection:key-file}
cert = ${slap-connection:cert-file}
# Define default parameter(s) that will be used later, in case user didn't
# specify it
# All parameters are available through the configuration.XX syntax.
# All possible parameters should have a default.
configuration.domain = example.org
configuration.public-ipv4 =
configuration.port = 4443
configuration.plain_http_port = 8080
configuration.plain_nginx_port = 8081
configuration.nginx_port = 9443
configuration.server-admin = admin@example.com
# BBB: apache_custom_https and apache_custom_http
configuration.apache_custom_https = ""
configuration.apache_custom_http = ""
configuration.caddy_custom_https = ""
configuration.caddy_custom_http = ""
configuration.apache-key =
configuration.apache-certificate =
configuration.apache-ca-certificate =
configuration.open-port = 80 443
configuration.extra_slave_instance_list =
configuration.disk-cache-size = 8G
configuration.ram-cache-size = 1G
configuration.trafficserver-autoconf-port = 8083
configuration.trafficserver-mgmt-port = 8084
configuration.re6st-verification-url = http://[2001:67c:1254:4::1]/index.html
configuration.enable-http2-by-default = true
configuration.mpm-graceful-shutdown-timeout = 5
configuration.monitor-httpd-port = 8072
configuration.frontend-name =
\ No newline at end of file
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
View file @ 9d866327
...@@ -20,8 +20,7 @@ recipe = slapos.recipe.template:jinja2 ...@@ -20,8 +20,7 @@ recipe = slapos.recipe.template:jinja2
extensions = jinja2.ext.do extensions = jinja2.ext.do
extra-context = extra-context =
context = context =
key eggs_directory buildout:eggs-directory raw common_profile {{ common_profile }}
key develop_eggs_directory buildout:develop-eggs-directory
${:extra-context} ${:extra-context}
{% do logrotate_dict.pop('recipe') %} {% do logrotate_dict.pop('recipe') %}
...@@ -395,6 +394,7 @@ slave-instance-information-list = {{ json_module.dumps(slave_instance_informatio ...@@ -395,6 +394,7 @@ slave-instance-information-list = {{ json_module.dumps(slave_instance_informatio
monitor-base-url = {{ monitor_base_url }} monitor-base-url = {{ monitor_base_url }}
[buildout] [buildout]
extends = {{ common_profile }}
parts += parts +=
slave-log-directories slave-log-directories
{% for part in part_list %} {% for part in part_list %}
...@@ -409,9 +409,6 @@ parts += ...@@ -409,9 +409,6 @@ parts +=
tunnel-6to4-base-nginx_http_port tunnel-6to4-base-nginx_http_port
tunnel-6to4-base-nginx_https_port tunnel-6to4-base-nginx_https_port
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
cache-access = {{ cache_access }} cache-access = {{ cache_access }}
{% endif %} {% endif %}
software/caddy-frontend/templates/replicate-publish-slave-information.cfg.in
View file @ 9d866327
...@@ -41,11 +41,8 @@ log-access-url = {{ json_module.dumps(slave_information.pop('log-access-urls', 1 ...@@ -41,11 +41,8 @@ log-access-url = {{ json_module.dumps(slave_information.pop('log-access-urls', 1
{% endfor %} {% endfor %}
[buildout] [buildout]
extends = {{ common_profile }}
parts = parts =
{% for part in part_list %} {% for part in part_list %}
{{ ' %s' % part }} {{ ' %s' % part }}
{% endfor %} {% endfor %}
\ No newline at end of file
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
\ No newline at end of file
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