From 3309563ce7c676b2733e6debddd807cbdeafc1d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Le=20Ninivin?= <cedric.leninivin@tiolive.com> Date: Thu, 4 Jul 2013 12:05:04 +0200 Subject: [PATCH] apache-frontend: fix ipv6 apache-frontend: remove unecessary sslengine in http --- software/apache-frontend/apache.conf.in | 2 +- software/apache-frontend/default-virtualhost.conf.in | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/software/apache-frontend/apache.conf.in b/software/apache-frontend/apache.conf.in index 1128d99a8..3f6ce66ad 100644 --- a/software/apache-frontend/apache.conf.in +++ b/software/apache-frontend/apache.conf.in @@ -7,7 +7,7 @@ ServerName {{ domain }} DocumentRoot {{ document_root }} 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) -%} {{ "Listen %s:%s" % (ip, port) }} {% endfor -%} diff --git a/software/apache-frontend/default-virtualhost.conf.in b/software/apache-frontend/default-virtualhost.conf.in index 27dcb301c..c4153bd05 100644 --- a/software/apache-frontend/default-virtualhost.conf.in +++ b/software/apache-frontend/default-virtualhost.conf.in @@ -47,7 +47,6 @@ <VirtualHost *:{{ http_port }}> ServerName {{ slave_parameter.get('domain') }} ServerAlias {{ slave_parameter.get('domain') }} - SSLEngine on SSLProxyEngine on # Rewrite part ProxyVia On -- 2.30.9