From 81a4dc5a1f17848bf544dae54582097b93c295cc Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 08 Mar 2016 08:30:08 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
install/tpl/nginx_apps.vhost.master | 4 ++--
install/tpl/nginx_ispconfig.vhost.master | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/install/tpl/nginx_apps.vhost.master b/install/tpl/nginx_apps.vhost.master
index 6fad927..d2dc07b 100644
--- a/install/tpl/nginx_apps.vhost.master
+++ b/install/tpl/nginx_apps.vhost.master
@@ -1,6 +1,6 @@
server {
- listen {apps_vhost_ip};
- listen [::]:{apps_vhost_port};
+ listen {apps_vhost_port};
+ listen [::]:{apps_vhost_port} ipv6only=on;
ssl {ssl_on};
{ssl_comment}ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
{ssl_comment}ssl_certificate /usr/local/ispconfig/interface/ssl/ispserver.crt;
diff --git a/install/tpl/nginx_ispconfig.vhost.master b/install/tpl/nginx_ispconfig.vhost.master
index 6102cef..8498770 100644
--- a/install/tpl/nginx_ispconfig.vhost.master
+++ b/install/tpl/nginx_ispconfig.vhost.master
@@ -1,6 +1,6 @@
server {
listen {vhost_port};
- listen [::]:{vhost_port}
+ listen [::]:{vhost_port} ipv6only=on;
ssl {ssl_on};
{ssl_comment}ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
{ssl_comment}ssl_certificate /usr/local/ispconfig/interface/ssl/ispserver.crt;
@@ -81,4 +81,4 @@
# location /webmail {
# rewrite ^/* /squirrelmail last;
# }
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1