erp5: Fix IPv6 apache configuration syntax.

dfa557e7 · Vincent Pelletier · Julien Muchembled · 6bae6808 · dfa557e7 · dfa557e7
Commit dfa557e7 authored Sep 03, 2013 by Vincent Pelletier Committed by Julien Muchembled Sep 04, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

stack/erp5/buildout.cfg stack/erp5/buildout.cfg +1 -1

stack/erp5/instance-balancer.cfg.in stack/erp5/instance-balancer.cfg.in +1 -1

No files found.
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -312,7 +312,7 @@ link-binary =
 [template-balancer]
 < = download-base
 filename = instance-balancer.cfg.in
-md5sum = 4157bc5954e1ced1dac1295994c9d715
+md5sum = 7fff2d3a812614aa5671f8306dfc991e

 [template-haproxy-cfg]
 < = download-base

--- a/stack/erp5/instance-balancer.cfg.in
+++ b/stack/erp5/instance-balancer.cfg.in
@@ -73,7 +73,7 @@ command-line = "{{ parameter_dict['haproxy'] }}/sbin/haproxy" -f "${haproxy-cfg:
 [apache]
 recipe = slapos.cookbook:apache.zope.backend
 backend-list = {{ dumps(apache_dict.values()) }}
-ip = {{ dumps([ipv6, ipv4]) }}
+ip = {{ dumps(['[' ~ ipv6 ~ ']', ipv4]) }}
 wrapper = ${directory:bin}/apache
 scheme = https
 key-file = ${directory:apache-conf}/apache.key