Skip to content

slapos
slapos
Commit 3309563c authored by Cédric Le Ninivin's avatar Cédric Le Ninivin
Browse files
Options

apache-frontend: fix ipv6 

apache-frontend: remove unecessary sslengine in http
parent 28f4118e
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
software/apache-frontend/apache.conf.in
View file @ 3309563c
...@@ -7,7 +7,7 @@ ServerName {{ domain }} ...@@ -7,7 +7,7 @@ ServerName {{ domain }}
DocumentRoot {{ document_root }} DocumentRoot {{ document_root }}
ServerRoot {{ instance_home }} ServerRoot {{ instance_home }}
{% for ip in (ipv4_addr, ipv6_addr) -%} {% for ip in (ipv4_addr, "[%s]" % ipv6_addr) -%}
{% for port in (http_port, https_port) -%} {% for port in (http_port, https_port) -%}
{{ "Listen %s:%s" % (ip, port) }} {{ "Listen %s:%s" % (ip, port) }}
{% endfor -%} {% endfor -%}
......
software/apache-frontend/default-virtualhost.conf.in
View file @ 3309563c
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
<VirtualHost *:{{ http_port }}> <VirtualHost *:{{ http_port }}>
ServerName {{ slave_parameter.get('domain') }} ServerName {{ slave_parameter.get('domain') }}
ServerAlias {{ slave_parameter.get('domain') }} ServerAlias {{ slave_parameter.get('domain') }}
SSLEngine on
SSLProxyEngine on SSLProxyEngine on
# Rewrite part # Rewrite part
ProxyVia On ProxyVia On
......
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