Просмотр исходного кода

Update formatting of SSL blocks in webmail templates

Kristan Kenney 6 лет назад
Родитель
Сommit
854371c007

+ 5 - 4
install/deb/templates/mail/nginx/default.stpl

@@ -1,15 +1,16 @@
 server {
 server {
     listen      %ip%:%proxy_ssl_port% ssl http2;
     listen      %ip%:%proxy_ssl_port% ssl http2;
     server_name %domain% %alias%;
     server_name %domain% %alias%;
-    ssl_certificate     %ssl_pem%;
-    ssl_certificate_key %ssl_key%;
-    ssl_stapling on;
-    ssl_stapling_verify on;
     root        /var/lib/roundcube;
     root        /var/lib/roundcube;
     index       index.php index.html index.htm;
     index       index.php index.html index.htm;
     access_log /var/log/nginx/domains/%domain%.log combined;
     access_log /var/log/nginx/domains/%domain%.log combined;
     error_log  /var/log/nginx/domains/%domain%.error.log error;
     error_log  /var/log/nginx/domains/%domain%.error.log error;
 
 
+    ssl_certificate     %ssl_pem%;
+    ssl_certificate_key %ssl_key%;
+    ssl_stapling on;
+    ssl_stapling_verify on;
+
     location ~ /\.(?!well-known\/) {
     location ~ /\.(?!well-known\/) {
         deny all;
         deny all;
         return 404;
         return 404;

+ 5 - 2
install/deb/templates/mail/nginx/web_system.stpl

@@ -1,13 +1,16 @@
 server {
 server {
     listen      %ip%:%web_ssl_port% ssl http2;
     listen      %ip%:%web_ssl_port% ssl http2;
     server_name %domain% %alias%;
     server_name %domain% %alias%;
-    ssl_certificate     %ssl_pem%;
-    ssl_certificate_key %ssl_key%;
     root        /var/lib/roundcube;
     root        /var/lib/roundcube;
     index       index.php index.html index.htm;
     index       index.php index.html index.htm;
     access_log /var/log/nginx/domains/%domain%.log combined;
     access_log /var/log/nginx/domains/%domain%.log combined;
     error_log  /var/log/nginx/domains/%domain%.error.log error;
     error_log  /var/log/nginx/domains/%domain%.error.log error;
 
 
+    ssl_certificate     %ssl_pem%;
+    ssl_certificate_key %ssl_key%;
+    ssl_stapling on;
+    ssl_stapling_verify on;
+    
     location ~ /\.(?!well-known\/) {
     location ~ /\.(?!well-known\/) {
         deny all;
         deny all;
         return 404;
         return 404;