Commit 1be9ed44 authored by Vincent Pelletier's avatar Vincent Pelletier

erp5: Make haproxy check / by default.

Otherwise, it prevents network access to Zope on a freshly created
instance, as site object does not exist.
Leave the parameter undocumented as it is still not organised in a
maintainable way.
parent d13b42b7
...@@ -271,7 +271,7 @@ extra-context = ...@@ -271,7 +271,7 @@ extra-context =
[template-erp5] [template-erp5]
< = download-base < = download-base
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = 5b11875e6beba48db7d45c5d462a6d2d md5sum = 96d3611ffc0f6a6664cc2e9824adacdd
[template-neo] [template-neo]
< = download-base < = download-base
......
...@@ -159,7 +159,7 @@ config-tcpv4-port = {{ dumps(slapparameter_dict.get('', 2150)) }} ...@@ -159,7 +159,7 @@ config-tcpv4-port = {{ dumps(slapparameter_dict.get('', 2150)) }}
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 = {{ slapparameter_dict.get('haproxy-server-check-path', '/%(site-id)s/getId') % {'site-id': site_id} }} config-haproxy-server-check-path = {{ slapparameter_dict.get('haproxy-server-check-path', '/') % {'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