Merge branch 'master' into 'stable-3.1'

Master



See merge request !293

Author: Marius Burkard

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;

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 @@ server {
 #        location /webmail {
 #               rewrite ^/* /squirrelmail last;
 #        }
-}
+}