Commit a4f06b9c authored by Vincent Pelletier's avatar Vincent Pelletier Committed by Julien Muchembled

erp5: Drop haproxy-maxconn root instance parameter.

It is superseded by per-zope value, published by Zope partitions.
parent dfa557e7
...@@ -270,7 +270,7 @@ extra-context = ...@@ -270,7 +270,7 @@ extra-context =
[template-erp5] [template-erp5]
< = download-base < = download-base
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = 65e0f7c9e33b9803c24b102136a10f4c md5sum = 5b11875e6beba48db7d45c5d462a6d2d
[template-neo] [template-neo]
< = download-base < = download-base
......
...@@ -141,7 +141,6 @@ software-type = balancer ...@@ -141,7 +141,6 @@ software-type = balancer
sla-computer_guid = {{ slapparameter_dict.get('balancer-computer-guid', computer_id) }} sla-computer_guid = {{ slapparameter_dict.get('balancer-computer-guid', computer_id) }}
extra-config = extra-config =
tcpv4-port tcpv4-port
haproxy-maxconn
haproxy-server-check-path haproxy-server-check-path
apache-access-control-string apache-access-control-string
apache-ssl-authentication apache-ssl-authentication
...@@ -160,7 +159,6 @@ config-tcpv4-port = {{ dumps(slapparameter_dict.get('', 2150)) }} ...@@ -160,7 +159,6 @@ 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-maxconn = {{ slapparameter_dict.get('haproxy-maxconn', 1) }}
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)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') }}
......
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