Commit a13e0355 authored by Vincent Pelletier's avatar Vincent Pelletier

erp5.erp5: Move balancer parameters to their own sub-mapping.

Balancer parameters were and are not supported, so this compatibility
breakage is not important.
The goal of this change is to make balancer parameter layout consistent
with other software-types.
Also, balancer's base TCP port is not taken from empty-string parameter
anymore.
parent 7e9ce42f
...@@ -296,7 +296,7 @@ extra-context = ...@@ -296,7 +296,7 @@ extra-context =
[template-erp5] [template-erp5]
< = download-base < = download-base
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = baa8fe283c89cfbc314e033e78ed5705 md5sum = 629e4f00e930ede95ba249e150f554a6
[template-neo] [template-neo]
< = download-base < = download-base
......
...@@ -151,6 +151,7 @@ config-url = ${request-balancer:{{ family_name }}-v6} ...@@ -151,6 +151,7 @@ config-url = ${request-balancer:{{ family_name }}-v6}
{% do publish_dict.__setitem__('family-' ~ family_name, '${' ~ publishable ~ '}' ) -%} {% do publish_dict.__setitem__('family-' ~ family_name, '${' ~ publishable ~ '}' ) -%}
{% endfor -%} {% endfor -%}
{% set balancer_dict = slapparameter_dict.get('balancer', {}) -%}
[request-balancer] [request-balancer]
< = request-common < = request-common
name = balancer name = balancer
...@@ -171,16 +172,16 @@ return = ...@@ -171,16 +172,16 @@ return =
{{ family }}-v6 {{ family }}-v6
{% endfor -%} {% endfor -%}
config-zope-family-dict = {{ dumps(zope_family_parameter_dict) }} config-zope-family-dict = {{ dumps(zope_family_parameter_dict) }}
config-tcpv4-port = {{ dumps(slapparameter_dict.get('', 2150)) }} config-tcpv4-port = {{ dumps(balancer_dict.get('tcpv4-port', 2150)) }}
{% for zope_section_id, name in zope_address_list_id_dict.items() -%} {% for zope_section_id, name in zope_address_list_id_dict.items() -%}
config-{{ name }} = {{ ' ${' ~ zope_section_id ~ ':connection-zope-address-list}' }} config-{{ name }} = {{ ' ${' ~ zope_section_id ~ ':connection-zope-address-list}' }}
{% endfor -%} {% endfor -%}
# XXX: should those really be same for all families ? # XXX: should those really be same for all families ?
config-haproxy-server-check-path = {{ dumps(slapparameter_dict.get('haproxy-server-check-path', '/') % {'site-id': site_id}) }} config-haproxy-server-check-path = {{ dumps(balancer_dict.get('haproxy-server-check-path', '/') % {'site-id': site_id}) }}
config-apache-access-control-string = {{ dumps(slapparameter_dict.get('apache-access-control-string', 'all')) }} config-apache-access-control-string = {{ dumps(balancer_dict.get('apache-access-control-string', 'all')) }}
config-apache-ssl-authentication = {{ dumps(slapparameter_dict.get('apache-ssl-authentication', '0')) }} config-apache-ssl-authentication = {{ dumps(balancer_dict.get('apache-ssl-authentication', '0')) }}
config-apache-backend-path = {{ dumps(slapparameter_dict.get('apache-backend-path', '/') % {'site-id': site_id}) }} config-apache-backend-path = {{ dumps(balancer_dict.get('apache-backend-path', '/') % {'site-id': site_id}) }}
config-ca = {{ dumps(slapparameter_dict.get('ca', {})) }} config-ca = {{ dumps(balancer_dict.get('ca', {})) }}
[request-frontend-base] [request-frontend-base]
{% if has_frontend -%} {% if has_frontend -%}
......
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