Skip to content

slapos
slapos
Commit dfa557e7 authored by Vincent Pelletier's avatar Vincent Pelletier Committed by Julien Muchembled
Browse files
Options

erp5: Fix IPv6 apache configuration syntax.

parent 6bae6808
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
stack/erp5/buildout.cfg
View file @ dfa557e7
...@@ -312,7 +312,7 @@ link-binary = ...@@ -312,7 +312,7 @@ link-binary =
[template-balancer] [template-balancer]
< = download-base < = download-base
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
md5sum = 4157bc5954e1ced1dac1295994c9d715 md5sum = 7fff2d3a812614aa5671f8306dfc991e
[template-haproxy-cfg] [template-haproxy-cfg]
< = download-base < = download-base
......
stack/erp5/instance-balancer.cfg.in
View file @ dfa557e7
...@@ -73,7 +73,7 @@ command-line = "{{ parameter_dict['haproxy'] }}/sbin/haproxy" -f "${haproxy-cfg: ...@@ -73,7 +73,7 @@ command-line = "{{ parameter_dict['haproxy'] }}/sbin/haproxy" -f "${haproxy-cfg:
[apache] [apache]
recipe = slapos.cookbook:apache.zope.backend recipe = slapos.cookbook:apache.zope.backend
backend-list = {{ dumps(apache_dict.values()) }} backend-list = {{ dumps(apache_dict.values()) }}
ip = {{ dumps([ipv6, ipv4]) }} ip = {{ dumps(['[' ~ ipv6 ~ ']', ipv4]) }}
wrapper = ${directory:bin}/apache wrapper = ${directory:bin}/apache
scheme = https scheme = https
key-file = ${directory:apache-conf}/apache.key key-file = ${directory:apache-conf}/apache.key
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7