diff --git a/stack/erp5/buildout.hash.cfg b/stack/erp5/buildout.hash.cfg index faba06cf02df93a819ee5bb4f2df608b22d3aa3a..5bd883c7fc7a9315512e73ced35ae9973d1eb1c3 100644 --- a/stack/erp5/buildout.hash.cfg +++ b/stack/erp5/buildout.hash.cfg @@ -83,7 +83,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e [template-erp5] filename = instance-erp5.cfg.in -md5sum = 64fe4800dc9430aac8e325ba4b3d97ae +md5sum = 52ac560be07f254618631b84d2d58f41 [template-zeo] filename = instance-zeo.cfg.in @@ -95,7 +95,7 @@ md5sum = a2377d5c53fd2a441ea713b428e4844b [template-balancer] filename = instance-balancer.cfg.in -md5sum = d2a339d0bc2f05f3f1f78defffae6ab6 +md5sum = 25d0ebecda78d1440dacd3495d53c928 [template-haproxy-cfg] filename = haproxy.cfg.in diff --git a/stack/erp5/instance-balancer.cfg.in b/stack/erp5/instance-balancer.cfg.in index c06bc7e89faa11f45042e86557f0ea5aa38d9385..06b647a021ea44e618e4550c6ac2c503a7d2bbff 100644 --- a/stack/erp5/instance-balancer.cfg.in +++ b/stack/erp5/instance-balancer.cfg.in @@ -219,7 +219,7 @@ path = ${directory:promise}/apache hostname = {{ ipv4 }} port = {{ apache_dict.values()[0][0] }} -[publish] +[{{ section('publish') }}] recipe = slapos.cookbook:publish.serialised {% for family_name, (apache_port, scheme, _, _) in apache_dict.items() -%} {{ family_name ~ '-v6' }} = {% if ipv6_set %}{{ scheme ~ '://[' ~ ipv6 ~ ']:' ~ apache_port }}{% endif %} @@ -260,7 +260,7 @@ cert = crl = {%- endif %} -[logrotate-apache] +[{{ section('logrotate-apache') }}] < = logrotate-entry-base name = apache log = ${apache-conf-parameter-dict:error-log} ${apache-conf-parameter-dict:access-log} @@ -271,7 +271,7 @@ recipe = slapos.cookbook:mkdirectory apache-conf = ${:etc}/apache bin = ${buildout:directory}/bin etc = ${buildout:directory}/etc -promise = ${directory:etc}/promise +promise = ${:etc}/promise services = ${:etc}/run var = ${buildout:directory}/var run = ${:var}/run @@ -284,7 +284,7 @@ newcerts = ${:ca-dir}/newcerts crl = ${:ca-dir}/crl apachedex = ${monitor-directory:private}/apachedex -[monitor-generate-apachedex-report] +[{{ section('monitor-generate-apachedex-report') }}] recipe = slapos.cookbook:wrapper wrapper-path = ${monitor-directory:reports}/${:command} command-line = "{{ parameter_dict['run-apachedex-location'] }}" "{{ parameter_dict['apachedex-location'] }}" "${directory:apachedex}" --default "${apachedex-parameters:default}" --apache-log-list "${apachedex-parameters:apache-log-list}" --base-list "${apachedex-parameters:base-list}" --skip-base-list "${apachedex-parameters:skip-base-list}" --erp5-base-list "${apachedex-parameters:erp5-base-list}" @@ -316,7 +316,4 @@ extends = {{ logrotate_cfg }} {{ parameter_dict['template-monitor'] }} parts += - publish - logrotate-apache - monitor-generate-apachedex-report {{ part_list | join('\n ') }} diff --git a/stack/erp5/instance-erp5.cfg.in b/stack/erp5/instance-erp5.cfg.in index bbef4b733a8ed130ab49f1eb99fcd12e185874a8..eba011c494284d0843e1d3e87627e58a68dcd815 100644 --- a/stack/erp5/instance-erp5.cfg.in +++ b/stack/erp5/instance-erp5.cfg.in @@ -1,4 +1,4 @@ -{% import "root_common" as root_common with context %} +{% import "root_common" as root_common with context -%} {% set frontend_dict = slapparameter_dict.get('frontend', {}) -%} {% set has_frontend = frontend_dict.get('software-url', '') != '' -%} {% set site_id = slapparameter_dict.get('site-id', 'erp5') -%}