From 18ec586831c9f06394e4f3184cb44471f2a389b0 Mon Sep 17 00:00:00 2001 From: ifaist0s Date: Tue, 22 Jan 2019 12:51:59 +0200 Subject: [PATCH 01/73] Use of deprecated directive FIX: [warn] 31172#31172: the "ssl" directive is deprecated, use the "listen ... ssl" directive instead CAUSE: http://hg.nginx.org/nginx/rev/46c0c7ef4913 --- install/ubuntu/16.04/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/caching.stpl b/install/ubuntu/16.04/templates/web/nginx/caching.stpl index 5e0e40641..e149b98b5 100755 --- a/install/ubuntu/16.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 45a6824990a75d11c8faa578b785b7289cda961a Mon Sep 17 00:00:00 2001 From: ifaist0s Date: Tue, 22 Jan 2019 12:52:36 +0200 Subject: [PATCH 02/73] Use of deprecated directive FIX: [warn] 31172#31172: the "ssl" directive is deprecated, use the "listen ... ssl" directive instead CAUSE: http://hg.nginx.org/nginx/rev/46c0c7ef4913 --- install/ubuntu/16.04/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/hosting.stpl b/install/ubuntu/16.04/templates/web/nginx/hosting.stpl index d778d6333..1ef8994b6 100755 --- a/install/ubuntu/16.04/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From a72ecfbcfb4d4f23040ae0c1e3191357bb1eb08f Mon Sep 17 00:00:00 2001 From: ifaist0s Date: Tue, 22 Jan 2019 12:58:48 +0200 Subject: [PATCH 03/73] Use of deprecated directive FIX: [warn] 31172#31172: the "ssl" directive is deprecated, use the "listen ... ssl" directive instead CAUSE: http://hg.nginx.org/nginx/rev/46c0c7ef4913 --- install/ubuntu/16.04/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/http2.stpl b/install/ubuntu/16.04/templates/web/nginx/http2.stpl index 72e72a90c..f225becd2 100644 --- a/install/ubuntu/16.04/templates/web/nginx/http2.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 6c072a91c4773203e2d07fd2936dea9f8039b8aa Mon Sep 17 00:00:00 2001 From: ifaist0s Date: Tue, 22 Jan 2019 12:59:33 +0200 Subject: [PATCH 04/73] Use of deprecated directive FIX: [warn] 31172#31172: the "ssl" directive is deprecated, use the "listen ... ssl" directive instead CAUSE: http://hg.nginx.org/nginx/rev/46c0c7ef4913 --- install/ubuntu/16.04/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/16.04/templates/web/nginx/default.stpl b/install/ubuntu/16.04/templates/web/nginx/default.stpl index fa5380606..0e669b3dc 100755 --- a/install/ubuntu/16.04/templates/web/nginx/default.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From d334ddc5016d34fabf79c73d59aeb98d2209c81f Mon Sep 17 00:00:00 2001 From: pablobae <33727260+pablobae@users.noreply.github.com> Date: Thu, 7 Feb 2019 16:49:43 +0100 Subject: [PATCH 05/73] Update v-add-firewall-chain Obtains the SSH port from the service configuration file (originally it was hardcoded). This allow the correct creation of ssh chain when this service has a custom port. --- bin/v-add-firewall-chain | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/v-add-firewall-chain b/bin/v-add-firewall-chain index c7b826fa0..5026d264c 100755 --- a/bin/v-add-firewall-chain +++ b/bin/v-add-firewall-chain @@ -47,7 +47,13 @@ is_system_enabled "$FIREWALL_SYSTEM" 'FIREWALL_SYSTEM' # Checking known chains case $chain in - SSH) port=22; protocol=TCP ;; + SSH) # Get ssh port by reading ssh config file. + sshport=$(grep '^Port ' /etc/ssh/sshd_config | head -1 | cut -d ' ' -f 2) + if [ -z "$sshport" ]; then + sshport=22 + fi + port=$sshport; + protocol=TCP ;; FTP) port=21; protocol=TCP ;; MAIL) port='25,465,587,2525,110,995,143,993'; protocol=TCP ;; DNS) port=53; protocol=UDP ;; From 372770931cae3eaa3119fe82c476e4c762135d60 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:05:12 +0300 Subject: [PATCH 06/73] fix for the use of a deprecated directive in nginx --- install/debian/7/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/7/templates/web/nginx/caching.stpl b/install/debian/7/templates/web/nginx/caching.stpl index 5e0e40641..e149b98b5 100755 --- a/install/debian/7/templates/web/nginx/caching.stpl +++ b/install/debian/7/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From edb3fcc2df4def7f4123c59c9428020cc515025d Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:06:25 +0300 Subject: [PATCH 07/73] fix for the use of a deprecated directive in nginx --- install/debian/7/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/7/templates/web/nginx/default.stpl b/install/debian/7/templates/web/nginx/default.stpl index fa5380606..0e669b3dc 100755 --- a/install/debian/7/templates/web/nginx/default.stpl +++ b/install/debian/7/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 21ce107c681b8ee614d879c0d74715119b7dae50 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:07:07 +0300 Subject: [PATCH 08/73] fix for the use of a deprecated directive in nginx --- install/debian/7/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/7/templates/web/nginx/hosting.stpl b/install/debian/7/templates/web/nginx/hosting.stpl index d778d6333..1ef8994b6 100755 --- a/install/debian/7/templates/web/nginx/hosting.stpl +++ b/install/debian/7/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From b22802478d9a000b9e3a9891eea938e415716d2f Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:07:33 +0300 Subject: [PATCH 09/73] fix for the use of a deprecated directive in nginx --- install/debian/7/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/7/templates/web/nginx/http2.stpl b/install/debian/7/templates/web/nginx/http2.stpl index 76dd2f8ec..db83fcd70 100644 --- a/install/debian/7/templates/web/nginx/http2.stpl +++ b/install/debian/7/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; From 7aa71c6ca08af15bbd3b2b1ac2655826db668730 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:10:11 +0300 Subject: [PATCH 10/73] fix for the use of a deprecated directive in nginx --- install/debian/8/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/8/templates/web/nginx/caching.stpl b/install/debian/8/templates/web/nginx/caching.stpl index 52641dbef..3c56004d3 100755 --- a/install/debian/8/templates/web/nginx/caching.stpl +++ b/install/debian/8/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 6a5061a7a9a730372b64d6a8a5d6e7faa015b4da Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:11:03 +0300 Subject: [PATCH 11/73] fix for the use of a deprecated directive in nginx --- install/debian/8/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/8/templates/web/nginx/default.stpl b/install/debian/8/templates/web/nginx/default.stpl index fa5380606..0e669b3dc 100755 --- a/install/debian/8/templates/web/nginx/default.stpl +++ b/install/debian/8/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 5b4d89b47fd07037163f558bf8594748359ddcd3 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:11:21 +0300 Subject: [PATCH 12/73] fix for the use of a deprecated directive in nginx --- install/debian/8/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/8/templates/web/nginx/hosting.stpl b/install/debian/8/templates/web/nginx/hosting.stpl index d778d6333..1ef8994b6 100755 --- a/install/debian/8/templates/web/nginx/hosting.stpl +++ b/install/debian/8/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 232dbf0d0937164d7b9556b8bfeccd3fc32505ad Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:11:55 +0300 Subject: [PATCH 13/73] fix for the use of a deprecated directive in nginx --- install/debian/8/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/8/templates/web/nginx/http2.stpl b/install/debian/8/templates/web/nginx/http2.stpl index 76dd2f8ec..db83fcd70 100644 --- a/install/debian/8/templates/web/nginx/http2.stpl +++ b/install/debian/8/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; From 7a1cdc689ee1b2e4a81c131c121514004b588032 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:13:15 +0300 Subject: [PATCH 14/73] fix for the use of a deprecated directive in nginx --- install/debian/9/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/9/templates/web/nginx/caching.stpl b/install/debian/9/templates/web/nginx/caching.stpl index 52641dbef..3c56004d3 100755 --- a/install/debian/9/templates/web/nginx/caching.stpl +++ b/install/debian/9/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 5ea43b6df656b250aa0ec5e6cf48439143c80881 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:39:05 +0300 Subject: [PATCH 15/73] fix for the use of a deprecated directive in nginx --- install/debian/9/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/9/templates/web/nginx/default.stpl b/install/debian/9/templates/web/nginx/default.stpl index fa5380606..0e669b3dc 100755 --- a/install/debian/9/templates/web/nginx/default.stpl +++ b/install/debian/9/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 6bb56a874257672f7388a1255071c4242092f2ce Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:39:37 +0300 Subject: [PATCH 16/73] fix for the use of a deprecated directive in nginx --- install/debian/9/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/9/templates/web/nginx/hosting.stpl b/install/debian/9/templates/web/nginx/hosting.stpl index d778d6333..1ef8994b6 100755 --- a/install/debian/9/templates/web/nginx/hosting.stpl +++ b/install/debian/9/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From dc3dec644dc3291880ce31d6ca8c2928125aa8b7 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:40:06 +0300 Subject: [PATCH 17/73] fix for the use of a deprecated directive in nginx --- install/debian/9/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/9/templates/web/nginx/http2.stpl b/install/debian/9/templates/web/nginx/http2.stpl index 72e72a90c..f225becd2 100644 --- a/install/debian/9/templates/web/nginx/http2.stpl +++ b/install/debian/9/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 4ed0ca484ca1e7e8249ed8360c240814c1462ad4 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:41:35 +0300 Subject: [PATCH 18/73] fix for the use of a deprecated directive in nginx --- install/rhel/5/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/rhel/5/templates/web/nginx/caching.stpl b/install/rhel/5/templates/web/nginx/caching.stpl index 67b2f6c20..5e1ac757b 100755 --- a/install/rhel/5/templates/web/nginx/caching.stpl +++ b/install/rhel/5/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 3ed733669e8fd259feea3c4d412de3a0c62eb4df Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:41:55 +0300 Subject: [PATCH 19/73] fix for the use of a deprecated directive in nginx --- install/rhel/5/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/rhel/5/templates/web/nginx/default.stpl b/install/rhel/5/templates/web/nginx/default.stpl index 53ad8d1b8..22bbd55a6 100755 --- a/install/rhel/5/templates/web/nginx/default.stpl +++ b/install/rhel/5/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; From 01d9626b6cc1d124c3ecc51980fcd24966515344 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:42:38 +0300 Subject: [PATCH 20/73] fix for the use of a deprecated directive in nginx --- install/rhel/5/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/rhel/5/templates/web/nginx/hosting.stpl b/install/rhel/5/templates/web/nginx/hosting.stpl index aca458a4b..06abc94e1 100755 --- a/install/rhel/5/templates/web/nginx/hosting.stpl +++ b/install/rhel/5/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; From 3188ae9999f5e3a3fc72eea4fe41740c03c11874 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:42:44 +0300 Subject: [PATCH 21/73] fix for the use of a deprecated directive in nginx --- install/rhel/5/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/rhel/5/templates/web/nginx/http2.stpl b/install/rhel/5/templates/web/nginx/http2.stpl index 76dd2f8ec..db83fcd70 100644 --- a/install/rhel/5/templates/web/nginx/http2.stpl +++ b/install/rhel/5/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; From 48f61fcc2cea45c3fc18f05415f8d7a2f7136304 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:47:29 +0300 Subject: [PATCH 22/73] fix for the use of a deprecated directive in nginx --- install/rhel/6/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/rhel/6/templates/web/nginx/caching.stpl b/install/rhel/6/templates/web/nginx/caching.stpl index 67b2f6c20..5e1ac757b 100755 --- a/install/rhel/6/templates/web/nginx/caching.stpl +++ b/install/rhel/6/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 064a16043dfb47dabd9df7b91abe5bf9af77b841 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:47:31 +0300 Subject: [PATCH 23/73] fix for the use of a deprecated directive in nginx --- install/rhel/6/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/rhel/6/templates/web/nginx/default.stpl b/install/rhel/6/templates/web/nginx/default.stpl index 53ad8d1b8..22bbd55a6 100755 --- a/install/rhel/6/templates/web/nginx/default.stpl +++ b/install/rhel/6/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; From 0226e7b862c68e87ce8027f038c6b07e8741558f Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:47:33 +0300 Subject: [PATCH 24/73] fix for the use of a deprecated directive in nginx --- install/rhel/6/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/rhel/6/templates/web/nginx/hosting.stpl b/install/rhel/6/templates/web/nginx/hosting.stpl index aca458a4b..06abc94e1 100755 --- a/install/rhel/6/templates/web/nginx/hosting.stpl +++ b/install/rhel/6/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; From f36148ca017bc1e0768bb2dda733c40c484d5fc3 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:47:36 +0300 Subject: [PATCH 25/73] fix for the use of a deprecated directive in nginx --- install/rhel/6/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/rhel/6/templates/web/nginx/http2.stpl b/install/rhel/6/templates/web/nginx/http2.stpl index 40e79aef1..7874e9b14 100644 --- a/install/rhel/6/templates/web/nginx/http2.stpl +++ b/install/rhel/6/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; From 40a8461b28b4e8b030615fcaf3f93f339e62b5a0 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:49:56 +0300 Subject: [PATCH 26/73] fix for the use of a deprecated directive in nginx --- install/rhel/7/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/rhel/7/templates/web/nginx/caching.stpl b/install/rhel/7/templates/web/nginx/caching.stpl index 67b2f6c20..5e1ac757b 100755 --- a/install/rhel/7/templates/web/nginx/caching.stpl +++ b/install/rhel/7/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 4f086744be2e012bfe3272977df3b010b281dce8 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:50:00 +0300 Subject: [PATCH 27/73] fix for the use of a deprecated directive in nginx --- install/rhel/7/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/rhel/7/templates/web/nginx/default.stpl b/install/rhel/7/templates/web/nginx/default.stpl index 53ad8d1b8..22bbd55a6 100755 --- a/install/rhel/7/templates/web/nginx/default.stpl +++ b/install/rhel/7/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; From b289a46cfbe651701c05b04c850564a9475810e6 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:50:05 +0300 Subject: [PATCH 28/73] fix for the use of a deprecated directive in nginx --- install/rhel/7/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/rhel/7/templates/web/nginx/hosting.stpl b/install/rhel/7/templates/web/nginx/hosting.stpl index aca458a4b..06abc94e1 100755 --- a/install/rhel/7/templates/web/nginx/hosting.stpl +++ b/install/rhel/7/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; From 75283ef755f467d5479ec9559f9855f3005e9784 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 14:50:10 +0300 Subject: [PATCH 29/73] fix for the use of a deprecated directive in nginx --- install/rhel/7/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/rhel/7/templates/web/nginx/http2.stpl b/install/rhel/7/templates/web/nginx/http2.stpl index 76dd2f8ec..db83fcd70 100644 --- a/install/rhel/7/templates/web/nginx/http2.stpl +++ b/install/rhel/7/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; From faa9d4aa625fedaab492835746b3a6d20130b173 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:04:45 +0300 Subject: [PATCH 30/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/12.10/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/caching.stpl b/install/ubuntu/12.10/templates/web/nginx/caching.stpl index 5e0e40641..e149b98b5 100755 --- a/install/ubuntu/12.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 37acc7bf319783936553dff7bc09782dc1e6c49e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:04:49 +0300 Subject: [PATCH 31/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/12.10/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/default.stpl b/install/ubuntu/12.10/templates/web/nginx/default.stpl index fa5380606..0e669b3dc 100755 --- a/install/ubuntu/12.10/templates/web/nginx/default.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 68230531b3c48a8a33aea387f9830a8b11fc4abd Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:04:53 +0300 Subject: [PATCH 32/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/12.10/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/hosting.stpl b/install/ubuntu/12.10/templates/web/nginx/hosting.stpl index d778d6333..1ef8994b6 100755 --- a/install/ubuntu/12.10/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From d4497846970bf4734624821eb50b736a511e9ccd Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:04:58 +0300 Subject: [PATCH 33/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/12.10/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/12.10/templates/web/nginx/http2.stpl b/install/ubuntu/12.10/templates/web/nginx/http2.stpl index 72e72a90c..f225becd2 100644 --- a/install/ubuntu/12.10/templates/web/nginx/http2.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 8ef8d8b722fe4ed3d1bfae9f54c89178656e06a9 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:00 +0300 Subject: [PATCH 34/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/13.04/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/caching.stpl b/install/ubuntu/13.04/templates/web/nginx/caching.stpl index 5e0e40641..e149b98b5 100755 --- a/install/ubuntu/13.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From f64e745e20783538f28cd45ca856bf8f07fe851f Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:02 +0300 Subject: [PATCH 35/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/13.04/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/default.stpl b/install/ubuntu/13.04/templates/web/nginx/default.stpl index fa5380606..0e669b3dc 100755 --- a/install/ubuntu/13.04/templates/web/nginx/default.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 58ddfd4b4dedf23d4c079f42ac8785fda9972742 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:04 +0300 Subject: [PATCH 36/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/13.04/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/hosting.stpl b/install/ubuntu/13.04/templates/web/nginx/hosting.stpl index d778d6333..1ef8994b6 100755 --- a/install/ubuntu/13.04/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From dca488c0f7c51caa055e88d70eba7f9462df7d45 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:06 +0300 Subject: [PATCH 37/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/13.04/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/13.04/templates/web/nginx/http2.stpl b/install/ubuntu/13.04/templates/web/nginx/http2.stpl index 72e72a90c..f225becd2 100644 --- a/install/ubuntu/13.04/templates/web/nginx/http2.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 1806c2a3d6136a1e454d0f6e471a07936c3bf48b Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:09 +0300 Subject: [PATCH 38/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/13.10/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/caching.stpl b/install/ubuntu/13.10/templates/web/nginx/caching.stpl index 5e0e40641..e149b98b5 100755 --- a/install/ubuntu/13.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From ada32d5535ae4ef4ed9037823da198eb0bb770b4 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:11 +0300 Subject: [PATCH 39/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/13.10/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/default.stpl b/install/ubuntu/13.10/templates/web/nginx/default.stpl index fa5380606..0e669b3dc 100755 --- a/install/ubuntu/13.10/templates/web/nginx/default.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 6c6520a18c12ea101f9ed4ed438a7c57c25104c3 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:16 +0300 Subject: [PATCH 40/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/13.10/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/hosting.stpl b/install/ubuntu/13.10/templates/web/nginx/hosting.stpl index d778d6333..1ef8994b6 100755 --- a/install/ubuntu/13.10/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From cf2dc9ccbde6fb8fe841970326ba70f11957323a Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:20 +0300 Subject: [PATCH 41/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/13.10/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/13.10/templates/web/nginx/http2.stpl b/install/ubuntu/13.10/templates/web/nginx/http2.stpl index 72e72a90c..f225becd2 100644 --- a/install/ubuntu/13.10/templates/web/nginx/http2.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From c28167f37a0ca8b12e0df7acf3e19ccf4cbba499 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:24 +0300 Subject: [PATCH 42/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/14.04/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/caching.stpl b/install/ubuntu/14.04/templates/web/nginx/caching.stpl index 5e0e40641..e149b98b5 100755 --- a/install/ubuntu/14.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 1ede3c055c93c7233ffe6293c5a3b162dbe27b27 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:26 +0300 Subject: [PATCH 43/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/14.04/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/default.stpl b/install/ubuntu/14.04/templates/web/nginx/default.stpl index fa5380606..0e669b3dc 100755 --- a/install/ubuntu/14.04/templates/web/nginx/default.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 8cbba0ed3ec3f78b1cc5c9cf11d344d5a82857a2 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:29 +0300 Subject: [PATCH 44/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/14.04/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/hosting.stpl b/install/ubuntu/14.04/templates/web/nginx/hosting.stpl index d778d6333..1ef8994b6 100755 --- a/install/ubuntu/14.04/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From bbf745e0496bbb8eb4d4caad1baf34ed030ca6be Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:31 +0300 Subject: [PATCH 45/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/14.04/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/14.04/templates/web/nginx/http2.stpl b/install/ubuntu/14.04/templates/web/nginx/http2.stpl index 72e72a90c..f225becd2 100644 --- a/install/ubuntu/14.04/templates/web/nginx/http2.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 5230c3d3b0dbd27c6785444f47134f2a9f38a038 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:35 +0300 Subject: [PATCH 46/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/14.10/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/caching.stpl b/install/ubuntu/14.10/templates/web/nginx/caching.stpl index 5e0e40641..e149b98b5 100755 --- a/install/ubuntu/14.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From cd3ccf5370607dc5c1dd4cd23a88250f937d14ef Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:38 +0300 Subject: [PATCH 47/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/14.10/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/default.stpl b/install/ubuntu/14.10/templates/web/nginx/default.stpl index fa5380606..0e669b3dc 100755 --- a/install/ubuntu/14.10/templates/web/nginx/default.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From a4b8ebcf885333179712c18fc7565e29b7d33fc7 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:41 +0300 Subject: [PATCH 48/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/14.10/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/hosting.stpl b/install/ubuntu/14.10/templates/web/nginx/hosting.stpl index d778d6333..1ef8994b6 100755 --- a/install/ubuntu/14.10/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 00ab9be534bb67669e2e30e8c21be348b253587a Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:43 +0300 Subject: [PATCH 49/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/14.10/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/14.10/templates/web/nginx/http2.stpl b/install/ubuntu/14.10/templates/web/nginx/http2.stpl index 72e72a90c..f225becd2 100644 --- a/install/ubuntu/14.10/templates/web/nginx/http2.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 49ab4c345c4564fe79c10e2e3f76ddef8ed9d01d Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:45 +0300 Subject: [PATCH 50/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/12.04/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/caching.stpl b/install/ubuntu/12.04/templates/web/nginx/caching.stpl index 5e0e40641..e149b98b5 100755 --- a/install/ubuntu/12.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 579ed37114cb23b3b83cbe9571acda09813d32ad Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:48 +0300 Subject: [PATCH 51/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/12.04/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/default.stpl b/install/ubuntu/12.04/templates/web/nginx/default.stpl index fa5380606..0e669b3dc 100755 --- a/install/ubuntu/12.04/templates/web/nginx/default.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From c11a1b165bf578bd68c7198630a7206fce08f028 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:49 +0300 Subject: [PATCH 52/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/12.04/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/hosting.stpl b/install/ubuntu/12.04/templates/web/nginx/hosting.stpl index d778d6333..1ef8994b6 100755 --- a/install/ubuntu/12.04/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From e39623308ef89e1c1173c33bb13898c94a53269b Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:05:53 +0300 Subject: [PATCH 53/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/12.04/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/12.04/templates/web/nginx/http2.stpl b/install/ubuntu/12.04/templates/web/nginx/http2.stpl index 72e72a90c..f225becd2 100644 --- a/install/ubuntu/12.04/templates/web/nginx/http2.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 19bd87334bda2bc463f962e79c51b5924bb00950 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:14:51 +0300 Subject: [PATCH 54/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/15.04/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/caching.stpl b/install/ubuntu/15.04/templates/web/nginx/caching.stpl index 5e0e40641..e149b98b5 100755 --- a/install/ubuntu/15.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From b1e826b0a64ebc1980fe315a1b8db92892b12bcc Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:15:03 +0300 Subject: [PATCH 55/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/15.04/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/default.stpl b/install/ubuntu/15.04/templates/web/nginx/default.stpl index fa5380606..0e669b3dc 100755 --- a/install/ubuntu/15.04/templates/web/nginx/default.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 4a04783d666475b59e973d4499f02565e0eb405b Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:15:20 +0300 Subject: [PATCH 56/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/15.04/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/hosting.stpl b/install/ubuntu/15.04/templates/web/nginx/hosting.stpl index d778d6333..1ef8994b6 100755 --- a/install/ubuntu/15.04/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From f85989fdbf9ea4902914951c57dfcc4f039ad825 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:18:03 +0300 Subject: [PATCH 57/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/15.04/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/15.04/templates/web/nginx/http2.stpl b/install/ubuntu/15.04/templates/web/nginx/http2.stpl index 72e72a90c..f225becd2 100644 --- a/install/ubuntu/15.04/templates/web/nginx/http2.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From a90c85e6b5719a5b046ecbc59924cede3180a5f9 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:18:46 +0300 Subject: [PATCH 58/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/15.10/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/default.stpl b/install/ubuntu/15.10/templates/web/nginx/default.stpl index fa5380606..0e669b3dc 100755 --- a/install/ubuntu/15.10/templates/web/nginx/default.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 470b88c764b5972b9424cac62054d4167ce3b314 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:19:32 +0300 Subject: [PATCH 59/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/15.10/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/caching.stpl b/install/ubuntu/15.10/templates/web/nginx/caching.stpl index 5e0e40641..e149b98b5 100755 --- a/install/ubuntu/15.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From a38770a08108fcc3e609897f5cd4648094b2c46e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:19:47 +0300 Subject: [PATCH 60/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/15.10/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/hosting.stpl b/install/ubuntu/15.10/templates/web/nginx/hosting.stpl index d778d6333..1ef8994b6 100755 --- a/install/ubuntu/15.10/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From c1d1f13a0449aacaa91f6c73ae71eb3aa789aacf Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:20:06 +0300 Subject: [PATCH 61/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/15.10/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/15.10/templates/web/nginx/http2.stpl b/install/ubuntu/15.10/templates/web/nginx/http2.stpl index 72e72a90c..f225becd2 100644 --- a/install/ubuntu/15.10/templates/web/nginx/http2.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From caf0890ca1df0eaab811e1939b2bd3a7fbe8a6a2 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:22:01 +0300 Subject: [PATCH 62/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/16.10/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/caching.stpl b/install/ubuntu/16.10/templates/web/nginx/caching.stpl index 5e0e40641..e149b98b5 100755 --- a/install/ubuntu/16.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From eae7202f528b413b5fc0f0e513b095a43afa35ac Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:22:09 +0300 Subject: [PATCH 63/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/16.10/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/default.stpl b/install/ubuntu/16.10/templates/web/nginx/default.stpl index fa5380606..0e669b3dc 100755 --- a/install/ubuntu/16.10/templates/web/nginx/default.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 20027824cfcd632439e0087f7dcaac24bcb14ab7 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:22:17 +0300 Subject: [PATCH 64/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/16.10/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/hosting.stpl b/install/ubuntu/16.10/templates/web/nginx/hosting.stpl index d778d6333..1ef8994b6 100755 --- a/install/ubuntu/16.10/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From d353421ff421becbd2c6bb11c1106a45a5faa230 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:22:28 +0300 Subject: [PATCH 65/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/16.10/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/16.10/templates/web/nginx/http2.stpl b/install/ubuntu/16.10/templates/web/nginx/http2.stpl index 72e72a90c..f225becd2 100644 --- a/install/ubuntu/16.10/templates/web/nginx/http2.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 4d5ecf05e73e8b2650c59d0dcdd8ea7d40df5014 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:23:46 +0300 Subject: [PATCH 66/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/17.04/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/17.04/templates/web/nginx/caching.stpl b/install/ubuntu/17.04/templates/web/nginx/caching.stpl index 5e0e40641..e149b98b5 100755 --- a/install/ubuntu/17.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/17.04/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From b3b1ec3c2e0a10997a1f6e57b8691800a14e447c Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:23:50 +0300 Subject: [PATCH 67/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/17.04/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/17.04/templates/web/nginx/default.stpl b/install/ubuntu/17.04/templates/web/nginx/default.stpl index fa5380606..0e669b3dc 100755 --- a/install/ubuntu/17.04/templates/web/nginx/default.stpl +++ b/install/ubuntu/17.04/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 3912de3ed0454f3b67a56e60fef76ac87ffd9ad9 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:23:55 +0300 Subject: [PATCH 68/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/17.04/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/17.04/templates/web/nginx/hosting.stpl b/install/ubuntu/17.04/templates/web/nginx/hosting.stpl index d778d6333..1ef8994b6 100755 --- a/install/ubuntu/17.04/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/17.04/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 12fdd9713e2ec43fd9cb049a93bcf9dd03cecec4 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:24:14 +0300 Subject: [PATCH 69/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/17.04/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/17.04/templates/web/nginx/http2.stpl b/install/ubuntu/17.04/templates/web/nginx/http2.stpl index 72e72a90c..f225becd2 100644 --- a/install/ubuntu/17.04/templates/web/nginx/http2.stpl +++ b/install/ubuntu/17.04/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From b7a2728ab03cc5d9576ecd21ce74335fde16631e Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:25:40 +0300 Subject: [PATCH 70/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/17.10/templates/web/nginx/caching.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/17.10/templates/web/nginx/caching.stpl b/install/ubuntu/17.10/templates/web/nginx/caching.stpl index 5e0e40641..e149b98b5 100755 --- a/install/ubuntu/17.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/17.10/templates/web/nginx/caching.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 12bc7ab544c0ad4d69947f448203cc0b0f66fdc8 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:25:42 +0300 Subject: [PATCH 71/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/17.10/templates/web/nginx/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/17.10/templates/web/nginx/default.stpl b/install/ubuntu/17.10/templates/web/nginx/default.stpl index fa5380606..0e669b3dc 100755 --- a/install/ubuntu/17.10/templates/web/nginx/default.stpl +++ b/install/ubuntu/17.10/templates/web/nginx/default.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From 452a7ad62efc881d86d3fec5cc7f9c35c6190c5c Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:25:48 +0300 Subject: [PATCH 72/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/17.10/templates/web/nginx/hosting.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/17.10/templates/web/nginx/hosting.stpl b/install/ubuntu/17.10/templates/web/nginx/hosting.stpl index d778d6333..1ef8994b6 100755 --- a/install/ubuntu/17.10/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/17.10/templates/web/nginx/hosting.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port%; + listen %ip%:%proxy_ssl_port% ssl; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; From ae1ec05e6617fe2cabde5a09322de95d4aef20e9 Mon Sep 17 00:00:00 2001 From: Anton Reutov Date: Thu, 28 Feb 2019 15:25:54 +0300 Subject: [PATCH 73/73] fix for the use of a deprecated directive in nginx --- install/ubuntu/17.10/templates/web/nginx/http2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/ubuntu/17.10/templates/web/nginx/http2.stpl b/install/ubuntu/17.10/templates/web/nginx/http2.stpl index 72e72a90c..f225becd2 100644 --- a/install/ubuntu/17.10/templates/web/nginx/http2.stpl +++ b/install/ubuntu/17.10/templates/web/nginx/http2.stpl @@ -1,7 +1,6 @@ server { - listen %ip%:%proxy_ssl_port% http2; + listen %ip%:%proxy_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error;