erp5: Add dynamic apache config template for balancer.

stack/erp5/buildout.hash.cfg

@@ -74,7 +74,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
 
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 37f43c57353e0fa5f15f36846a45da8a
+md5sum = d6e98e66dbff9077d6d8e6d3ea23e48a
 
 [template-zeo]
 filename = instance-zeo.cfg.in
@@ -86,7 +86,7 @@ md5sum = 7415a758c1076888d675aca1d9440b22
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = f0fd49c7d6d9f7c6936afba0d18b7691
+md5sum = a4caf55109bd12740e4f29c3931776b1
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in

stack/erp5/instance-balancer.cfg.in

@@ -21,6 +21,12 @@ per partition. No more (undefined result), no less (IndexError).
 recipe = slapos.recipe.template:jinja2
 mode = 644
 
+{% if slapparameter_dict.get('custom-template-apache-conf', {}) -%}
+{%   set apache_conf_template = slapparameter_dict['custom-template-apache-conf'] -%}
+{% else -%}
+{%   set apache_conf_template = parameter_dict['template-apache-conf'] -%}
+{% endif -%}
+
 [simplefile]
 < = jinja2-template-base
 template = inline:{{ '{{ content }}' }}
@@ -213,7 +219,7 @@ crl = ${apache-ssl-client:crl}
 
 [apache-conf]
 < = jinja2-template-base
-template = {{ parameter_dict['template-apache-conf'] }}
+template = {{ dumps(apache_conf_template) }}
 rendered = ${directory:apache-conf}/apache.conf
 context = section parameter_dict apache-conf-parameter-dict
 

stack/erp5/instance-erp5.cfg.in

@@ -267,6 +267,7 @@ config-{{ name }}-test-runner-address-list = {{ ' ${' ~ zope_section_id ~ ':conn
 # XXX: should those really be same for all families ?
 config-haproxy-server-check-path = {{ dumps(balancer_dict.get('haproxy-server-check-path', '/') % {'site-id': site_id}) }}
 config-ssl = {{ dumps(balancer_dict.get('ssl', {})) }}
+config-custom-template-apache-conf = {{ dumps(balancer_dict.get('custom-template-apache-conf', {})) }}
 config-monitor-passwd = ${monitor-htpasswd:passwd}
 config-name = ${:name}
 config-caucase-url = ${request-caucase:connection-http-url}