Commit 8eb1850c authored by Vincent Pelletier's avatar Vincent Pelletier

erp5: Use a saner default for (undocumented) haproxy check path.

Keep it undocumented, as haproxy config in its current state cannot be
sufficient to get properly configured haproxy/apache processes. It needs
a significant rework before it makes sense to document it.
parent 83711d96
...@@ -269,7 +269,7 @@ extra-context = ...@@ -269,7 +269,7 @@ extra-context =
[template-erp5] [template-erp5]
< = download-base < = download-base
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = 7ee011ae179a07f6d272d140e743d80d md5sum = 2988a87bedd1bb932929904e2523d2ff
[template-neo] [template-neo]
< = download-base < = download-base
......
...@@ -148,7 +148,7 @@ config-{{ name }} = {{ ' ${' ~ zope_section_id ~ ':connection-zope-address-list} ...@@ -148,7 +148,7 @@ 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-maxconn = {{ slapparameter_dict.get('haproxy-maxconn', 1) }} config-haproxy-maxconn = {{ slapparameter_dict.get('haproxy-maxconn', 1) }}
config-haproxy-server-check-path = {{ slapparameter_dict.get('haproxy-server-check-path', '/') % {'site-id': site_id} }} config-haproxy-server-check-path = {{ slapparameter_dict.get('haproxy-server-check-path', '/%(site_id)s/getId') % {'site-id': site_id} }}
config-apache-access-control-string = {{ slapparameter_dict.get('apache-access-control-string', 'all') }} config-apache-access-control-string = {{ slapparameter_dict.get('apache-access-control-string', 'all') }}
config-apache-ssl-authentication = {{ slapparameter_dict.get('apache-ssl-authentication', '0') }} config-apache-ssl-authentication = {{ slapparameter_dict.get('apache-ssl-authentication', '0') }}
config-apache-backend-path = {{ slapparameter_dict.get('apache-backend-path', '/') % {'site-id': site_id} }} config-apache-backend-path = {{ slapparameter_dict.get('apache-backend-path', '/') % {'site-id': site_id} }}
......
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