Commit a121c35a authored by Vincent Pelletier's avatar Vincent Pelletier

erp5: Publish balancer ipv6 addresses.

parent 9478c934
...@@ -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 = 535e8089acf808efe1d4e55328404ce3 md5sum = 4aca7b8633c12ad6a0fe2ac569648c82
[template-zeo] [template-zeo]
< = download-base < = download-base
......
...@@ -145,15 +145,15 @@ config-webdav = {{ dumps(zope_parameter_dict.get('webdav', False)) }} ...@@ -145,15 +145,15 @@ config-webdav = {{ dumps(zope_parameter_dict.get('webdav', False)) }}
{% endfor -%} {% endfor -%}
{% if has_frontend -%} {% if has_frontend -%}
{% set frontend_name = 'frontend-' ~ family_name -%} {% set frontend_name = 'frontend-' ~ family_name -%}
{% set publishable = frontend_name ~ ':connection-site_url' -%} {% do publish_dict.__setitem__('family-' ~ family_name, '${' ~ frontend_name ~ ':connection-site_url}' ) -%}
[{{ frontend_name }}] [{{ frontend_name }}]
< = request-frontend-base < = request-frontend-base
name = {{ frontend_name }} name = {{ frontend_name }}
config-url = ${request-balancer:{{ family_name }}-v6} config-url = ${request-balancer:{{ family_name }}-v6}
{% else -%} {% else -%}
{% set publishable = 'request-balancer:connection-' ~ family_name -%} {% do publish_dict.__setitem__('family-' ~ family_name, '${request-balancer:connection-' ~ family_name ~ '}' ) -%}
{% do publish_dict.__setitem__('family-' ~ family_name ~ '-v6', '${request-balancer:connection-' ~ family_name ~ '-v6}' ) -%}
{% endif -%} {% endif -%}
{% do publish_dict.__setitem__('family-' ~ family_name, '${' ~ publishable ~ '}' ) -%}
{% endfor -%} {% endfor -%}
{% set balancer_dict = slapparameter_dict.get('balancer', {}) -%} {% set balancer_dict = slapparameter_dict.get('balancer', {}) -%}
......
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