From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/tpl/nginx_apps.vhost.master | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/install/tpl/nginx_apps.vhost.master b/install/tpl/nginx_apps.vhost.master
index 57a78bc..d2dc07b 100644
--- a/install/tpl/nginx_apps.vhost.master
+++ b/install/tpl/nginx_apps.vhost.master
@@ -1,5 +1,13 @@
server {
- listen {apps_vhost_ip}{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;
+ {ssl_comment}ssl_certificate_key /usr/local/ispconfig/interface/ssl/ispserver.key;
+
+ # redirect to https if accessed with http
+ {ssl_comment}error_page 497 https://$host:{vhost_port}$request_uri;
server_name {apps_vhost_servername};
@@ -199,4 +207,4 @@
alias /var/lib/mailman/archives/public;
autoindex on;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1