From 8eb1850c24332f7c505a0779de2d5b5dbfd36ee3 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Tue, 6 Aug 2013 17:19:56 +0200 Subject: [PATCH] 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. --- stack/erp5/buildout.cfg | 2 +- stack/erp5/instance-erp5.cfg.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index 225b399c8..f0ee2a912 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -269,7 +269,7 @@ extra-context = [template-erp5] < = download-base filename = instance-erp5.cfg.in -md5sum = 7ee011ae179a07f6d272d140e743d80d +md5sum = 2988a87bedd1bb932929904e2523d2ff [template-neo] < = download-base diff --git a/stack/erp5/instance-erp5.cfg.in b/stack/erp5/instance-erp5.cfg.in index 9f229363e..b6548781c 100644 --- a/stack/erp5/instance-erp5.cfg.in +++ b/stack/erp5/instance-erp5.cfg.in @@ -148,7 +148,7 @@ config-{{ name }} = {{ ' ${' ~ zope_section_id ~ ':connection-zope-address-list} {% endfor -%} # 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': 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-ssl-authentication = {{ slapparameter_dict.get('apache-ssl-authentication', '0') }} config-apache-backend-path = {{ slapparameter_dict.get('apache-backend-path', '/') % {'site-id': site_id} }} -- 2.30.9