From ad6258a50859025f93655d3d8589897015d68729 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:24:20 -0500 Subject: [PATCH 01/46] Update default.stpl --- install/debian/10/templates/web/nginx/php-fpm/default.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/default.stpl b/install/debian/10/templates/web/nginx/php-fpm/default.stpl index 5cb553119..38de83d29 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/default.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/default.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 156a7358e890adc5fa4e0b07786df90fffab4212 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:30:56 -0500 Subject: [PATCH 02/46] Update cms_made_simple.stpl ssl directive is deprecated --- .../debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl index d85bcce38..003e91807 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 01f84bff1c46f8034d8f4a00dce6a40223f7fe17 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:31:18 -0500 Subject: [PATCH 03/46] Update codeigniter2.stpl ssl directive is deprecated --- .../debian/10/templates/web/nginx/php-fpm/codeigniter2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/debian/10/templates/web/nginx/php-fpm/codeigniter2.stpl index 9c24c3ea8..51f1f4085 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 9ae68a35da3bd565a2748c66ba5a0e5872dc96c6 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:31:35 -0500 Subject: [PATCH 04/46] Update codeigniter3.stpl --- .../debian/10/templates/web/nginx/php-fpm/codeigniter3.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/debian/10/templates/web/nginx/php-fpm/codeigniter3.stpl index d71863141..e8dd8bf64 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 4a7ff708ae004bf865c4d6752c259bab4b7177a4 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:31:54 -0500 Subject: [PATCH 05/46] Update datalife_engine.stpl --- .../10/templates/web/nginx/php-fpm/datalife_engine.stpl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/debian/10/templates/web/nginx/php-fpm/datalife_engine.stpl index 4f0b9ec7b..b066d5d2a 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -1,13 +1,12 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; + ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From b21f0e6c32e02ee3795043cab4139df829cbcb84 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:32:34 -0500 Subject: [PATCH 06/46] Update dokuwiki.stpl --- install/debian/10/templates/web/nginx/php-fpm/dokuwiki.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/debian/10/templates/web/nginx/php-fpm/dokuwiki.stpl index f85032bae..c9387bfb4 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From ca4422b717ede1befab3eb367c90a9ee42516f40 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:32:49 -0500 Subject: [PATCH 07/46] Update drupal6.stpl --- install/debian/10/templates/web/nginx/php-fpm/drupal6.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/drupal6.stpl b/install/debian/10/templates/web/nginx/php-fpm/drupal6.stpl index 0af7ce84a..93f8c55a0 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/drupal6.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 4371f625c450feefbe94dd92969f48983a6c059d Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:33:07 -0500 Subject: [PATCH 08/46] Update wordpress2_rewrite.stpl --- .../10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/debian/10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl index 0d933b306..264ca01ae 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl; server_name %domain_idn% %alias_idn%; root %docroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 3ee30043f99d1d3ff25ad565be7608da71be37bb Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:33:23 -0500 Subject: [PATCH 09/46] Update wordpress2.stpl --- install/debian/10/templates/web/nginx/php-fpm/wordpress2.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/debian/10/templates/web/nginx/php-fpm/wordpress2.stpl index e0aeb524a..39cce361a 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 049c8535ed237919b1efdb148f5d1fd808c49349 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:33:40 -0500 Subject: [PATCH 10/46] Update wordpress.stpl --- install/debian/10/templates/web/nginx/php-fpm/wordpress.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/wordpress.stpl b/install/debian/10/templates/web/nginx/php-fpm/wordpress.stpl index 5cb553119..38de83d29 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/wordpress.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 7cbd41a1ebaae76bbae5c828d0e4d26a951c4f7f Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:34:18 -0500 Subject: [PATCH 11/46] Update pyrocms.stpl --- install/debian/10/templates/web/nginx/php-fpm/pyrocms.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/debian/10/templates/web/nginx/php-fpm/pyrocms.stpl index 5ffc9ed5c..c9f918541 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl; server_name %domain_idn% %alias_idn%; root %sdocroot%/public; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 95d5f459f87bae60ae6e298b9fd81708ccb12120 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:34:42 -0500 Subject: [PATCH 12/46] Update owncloud.stpl --- install/debian/10/templates/web/nginx/php-fpm/owncloud.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/owncloud.stpl b/install/debian/10/templates/web/nginx/php-fpm/owncloud.stpl index 891566b93..b43fdc755 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/owncloud.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From d177e8941dde7c530671c4201fb520b90d573371 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:45:39 -0500 Subject: [PATCH 13/46] Update cms_made_simple.stpl --- .../debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl index 003e91807..6d24f8b5b 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port% ssl; + listen %ip%:%web_ssl_port% ssl https; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; From 1cc0bcc140402782d1a1a04bc1710816e9d38b7e Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:45:57 -0500 Subject: [PATCH 14/46] Update cms_made_simple.stpl --- .../debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl index 6d24f8b5b..cf8fad566 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port% ssl https; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; From fddbb696773e709976952d8d894b43e929e0e06a Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:46:12 -0500 Subject: [PATCH 15/46] Update codeigniter2.stpl --- install/debian/10/templates/web/nginx/php-fpm/codeigniter2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/debian/10/templates/web/nginx/php-fpm/codeigniter2.stpl index 51f1f4085..5931f6177 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/codeigniter2.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/codeigniter2.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port% ssl; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; From 267651c31c6ef23201348d0110e567a9bf3a2c2a Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:46:24 -0500 Subject: [PATCH 16/46] Update codeigniter3.stpl --- install/debian/10/templates/web/nginx/php-fpm/codeigniter3.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/debian/10/templates/web/nginx/php-fpm/codeigniter3.stpl index e8dd8bf64..3c2793d1d 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/codeigniter3.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/codeigniter3.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port% ssl; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; From d437c55cd0759dbac5af921b5e1be8094faa981f Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:46:36 -0500 Subject: [PATCH 17/46] Update datalife_engine.stpl --- .../debian/10/templates/web/nginx/php-fpm/datalife_engine.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/debian/10/templates/web/nginx/php-fpm/datalife_engine.stpl index b066d5d2a..bb9a727b8 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/datalife_engine.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/datalife_engine.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port% ssl; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; From 5918df6ebb71135a53e2fb6c37939e1d0bd15654 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:46:52 -0500 Subject: [PATCH 18/46] Update default.stpl --- install/debian/10/templates/web/nginx/php-fpm/default.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/default.stpl b/install/debian/10/templates/web/nginx/php-fpm/default.stpl index 38de83d29..f9c01e40d 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/default.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/default.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port% ssl; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; From ed27947cf706057d041b27fce63b6e20d5718836 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:47:07 -0500 Subject: [PATCH 19/46] Update dokuwiki.stpl --- install/debian/10/templates/web/nginx/php-fpm/dokuwiki.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/debian/10/templates/web/nginx/php-fpm/dokuwiki.stpl index c9387bfb4..a7564705c 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/dokuwiki.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/dokuwiki.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port% ssl; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; From 086f92f7a54de1cadc0e347e79cd81676ce456bb Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:47:19 -0500 Subject: [PATCH 20/46] Update drupal6.stpl --- install/debian/10/templates/web/nginx/php-fpm/drupal6.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/drupal6.stpl b/install/debian/10/templates/web/nginx/php-fpm/drupal6.stpl index 93f8c55a0..6e67a4e06 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/drupal6.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port% ssl; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; From 2b37a1eb11ce632565809e93c72f4fab5a16ff6b Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:47:57 -0500 Subject: [PATCH 21/46] Update drupal7.stpl --- install/debian/10/templates/web/nginx/php-fpm/drupal7.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/drupal7.stpl b/install/debian/10/templates/web/nginx/php-fpm/drupal7.stpl index 030ea9527..32f01a6f3 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/drupal7.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 003a748735418522147f6aa435cdaba066a55a10 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:48:23 -0500 Subject: [PATCH 22/46] Update drupal8.stpl --- install/debian/10/templates/web/nginx/php-fpm/drupal8.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/drupal8.stpl b/install/debian/10/templates/web/nginx/php-fpm/drupal8.stpl index 030ea9527..32f01a6f3 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/drupal8.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From bed654fce9790f2fdb06d3431b5f0bc7bb39c361 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:48:42 -0500 Subject: [PATCH 23/46] Update joomla.stpl --- install/debian/10/templates/web/nginx/php-fpm/joomla.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/joomla.stpl b/install/debian/10/templates/web/nginx/php-fpm/joomla.stpl index 704405f37..d4f96ee3f 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/joomla.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/joomla.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 63ebab9db5eb88d75e1c321c09e271647a52342f Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:48:57 -0500 Subject: [PATCH 24/46] Update laravel.stpl --- install/debian/10/templates/web/nginx/php-fpm/laravel.stpl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/laravel.stpl b/install/debian/10/templates/web/nginx/php-fpm/laravel.stpl index 477f6f01b..db0b4dded 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/laravel.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/laravel.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%/public; index index.php index.html index.htm; @@ -7,8 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 7a3e06941c3ca1c61e31745209bac8f0a69fe23d Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:49:25 -0500 Subject: [PATCH 25/46] Update magento.stpl --- install/debian/10/templates/web/nginx/php-fpm/magento.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/magento.stpl b/install/debian/10/templates/web/nginx/php-fpm/magento.stpl index fdab43aae..f8ac30c90 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/magento.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/magento.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%/pub; @@ -9,7 +9,6 @@ server { error_page 404 403 = /errors/404.php; add_header "X-UA-Compatible" "IE=Edge"; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 22accb9e83eed05be2bd37009a055e3055d03db7 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:49:55 -0500 Subject: [PATCH 26/46] Update modx.stpl --- install/debian/10/templates/web/nginx/php-fpm/modx.stpl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/modx.stpl b/install/debian/10/templates/web/nginx/php-fpm/modx.stpl index f410ab77c..420aeb9ea 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/modx.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/modx.stpl @@ -1,13 +1,12 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; + ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; # if you need to rewrite www to non-www uncomment bellow From add195b6b0077a45a78f3701161f4e15d7e324e4 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:50:20 -0500 Subject: [PATCH 27/46] Update moodle.stpl --- install/debian/10/templates/web/nginx/php-fpm/moodle.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/moodle.stpl b/install/debian/10/templates/web/nginx/php-fpm/moodle.stpl index f15a68c57..8594ec943 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/moodle.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/moodle.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 4a890b1b55af912104d4b13aa9539df9de195a48 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:50:54 -0500 Subject: [PATCH 28/46] Update no-php.stpl --- install/debian/10/templates/web/nginx/php-fpm/no-php.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/no-php.stpl b/install/debian/10/templates/web/nginx/php-fpm/no-php.stpl index bc8b53a37..4bb50383f 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/no-php.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/no-php.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 3b6acaf3a8971a38f13195fb2697936a19239aa0 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:51:12 -0500 Subject: [PATCH 29/46] Update odoo.stpl --- install/debian/10/templates/web/nginx/php-fpm/odoo.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/odoo.stpl b/install/debian/10/templates/web/nginx/php-fpm/odoo.stpl index d6697d7a9..e28afcfcf 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/odoo.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/odoo.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 760ff7fa650636b584db418c4ef8215f62892b6e Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:51:37 -0500 Subject: [PATCH 30/46] Update opencart.stpl --- install/debian/10/templates/web/nginx/php-fpm/opencart.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/opencart.stpl b/install/debian/10/templates/web/nginx/php-fpm/opencart.stpl index 908b9aeb8..52706d213 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/opencart.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/opencart.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From 764df300314e609f3add1a6f9a48f543a4821681 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:51:53 -0500 Subject: [PATCH 31/46] Update owncloud.stpl --- install/debian/10/templates/web/nginx/php-fpm/owncloud.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/owncloud.stpl b/install/debian/10/templates/web/nginx/php-fpm/owncloud.stpl index b43fdc755..1b803f975 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/owncloud.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/owncloud.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port% ssl; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; From 28cb4758ac8b6fb4ac04b0b26d97e33e2b6dc6bf Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:52:13 -0500 Subject: [PATCH 32/46] Update piwik.stpl --- install/debian/10/templates/web/nginx/php-fpm/piwik.stpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/piwik.stpl b/install/debian/10/templates/web/nginx/php-fpm/piwik.stpl index 78c1bb784..1b299343f 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/piwik.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/piwik.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port%; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; @@ -7,7 +7,6 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; From f93dce60b54bec06b9917de0ddbb025eb70a1647 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:52:28 -0500 Subject: [PATCH 33/46] Update pyrocms.stpl --- install/debian/10/templates/web/nginx/php-fpm/pyrocms.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/debian/10/templates/web/nginx/php-fpm/pyrocms.stpl index c9f918541..6d44f20fd 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port% ssl; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%/public; index index.php index.html index.htm; From ac607eafa852d850e7904f0c618d29add914b194 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:52:59 -0500 Subject: [PATCH 34/46] Update wordpress.stpl --- install/debian/10/templates/web/nginx/php-fpm/wordpress.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/wordpress.stpl b/install/debian/10/templates/web/nginx/php-fpm/wordpress.stpl index 38de83d29..f9c01e40d 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/wordpress.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/wordpress.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port% ssl; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; From 7bb3ab659a2717c4206e47e9ad7f5c3edc769d7a Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:53:25 -0500 Subject: [PATCH 35/46] Update wordpress2.stpl --- install/debian/10/templates/web/nginx/php-fpm/wordpress2.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/debian/10/templates/web/nginx/php-fpm/wordpress2.stpl index 39cce361a..01dfee5ba 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/wordpress2.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/wordpress2.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port% ssl; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %sdocroot%; index index.php index.html index.htm; From a61faf24a967abe97d3a10d16c7f3033420bc2fd Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:53:48 -0500 Subject: [PATCH 36/46] Update wordpress2_rewrite.stpl --- .../10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/debian/10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl index 264ca01ae..a5fc46fb8 100644 --- a/install/debian/10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ b/install/debian/10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl @@ -1,5 +1,5 @@ server { - listen %ip%:%web_ssl_port% ssl; + listen %ip%:%web_ssl_port% ssl http2; server_name %domain_idn% %alias_idn%; root %docroot%; index index.php index.html index.htm; From b18e70f5c8cb7ef9b5a13021a972610e5fa7226c Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:58:06 -0500 Subject: [PATCH 37/46] Update force-https-legacy.stpl --- install/debian/10/templates/web/nginx/force-https-legacy.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/force-https-legacy.stpl b/install/debian/10/templates/web/nginx/force-https-legacy.stpl index 56278e864..01a4eea36 100644 --- a/install/debian/10/templates/web/nginx/force-https-legacy.stpl +++ b/install/debian/10/templates/web/nginx/force-https-legacy.stpl @@ -1,7 +1,7 @@ server { 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 46f70ac244d13c19061a5f9739db862fb8b56427 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:58:26 -0500 Subject: [PATCH 38/46] Update force-https-public.stpl --- install/debian/10/templates/web/nginx/force-https-public.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/force-https-public.stpl b/install/debian/10/templates/web/nginx/force-https-public.stpl index 8f0d3fe3d..22951ae5d 100644 --- a/install/debian/10/templates/web/nginx/force-https-public.stpl +++ b/install/debian/10/templates/web/nginx/force-https-public.stpl @@ -1,7 +1,7 @@ server { 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 951f5c932f33b51830b1b0e8f4830c161cbf0ddf Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:58:40 -0500 Subject: [PATCH 39/46] Update force-https-webmail-phpmyadmin.stpl --- .../10/templates/web/nginx/force-https-webmail-phpmyadmin.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/force-https-webmail-phpmyadmin.stpl b/install/debian/10/templates/web/nginx/force-https-webmail-phpmyadmin.stpl index 4fadbbfcb..dac7adaf9 100644 --- a/install/debian/10/templates/web/nginx/force-https-webmail-phpmyadmin.stpl +++ b/install/debian/10/templates/web/nginx/force-https-webmail-phpmyadmin.stpl @@ -1,7 +1,7 @@ server { 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 384e24973ffb5909b6f534e6f2ab73ee6ef536af Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:58:54 -0500 Subject: [PATCH 40/46] Update force-https.stpl --- install/debian/10/templates/web/nginx/force-https.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/force-https.stpl b/install/debian/10/templates/web/nginx/force-https.stpl index 7da96e469..4a8185c82 100644 --- a/install/debian/10/templates/web/nginx/force-https.stpl +++ b/install/debian/10/templates/web/nginx/force-https.stpl @@ -1,7 +1,7 @@ server { 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 6aad1e02323e08a36ef3f63f7f60af345b143ac1 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:59:13 -0500 Subject: [PATCH 41/46] Update hosting-legacy.stpl --- install/debian/10/templates/web/nginx/hosting-legacy.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/hosting-legacy.stpl b/install/debian/10/templates/web/nginx/hosting-legacy.stpl index d62b5171b..cc0370c65 100644 --- a/install/debian/10/templates/web/nginx/hosting-legacy.stpl +++ b/install/debian/10/templates/web/nginx/hosting-legacy.stpl @@ -1,7 +1,7 @@ server { 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 3aca6d837ef7e7e6ac198b24b5a82acd3daba474 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:59:26 -0500 Subject: [PATCH 42/46] Update hosting.stpl --- install/debian/10/templates/web/nginx/hosting.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/hosting.stpl b/install/debian/10/templates/web/nginx/hosting.stpl index 0c456c5e8..30fe0f743 100644 --- a/install/debian/10/templates/web/nginx/hosting.stpl +++ b/install/debian/10/templates/web/nginx/hosting.stpl @@ -1,7 +1,7 @@ server { 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 322df88467d744bd29adc40cc0bd7cc674778b90 Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:59:38 -0500 Subject: [PATCH 43/46] Update private-hosting.stpl --- install/debian/10/templates/web/nginx/private-hosting.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/private-hosting.stpl b/install/debian/10/templates/web/nginx/private-hosting.stpl index d7326a460..60b23c551 100644 --- a/install/debian/10/templates/web/nginx/private-hosting.stpl +++ b/install/debian/10/templates/web/nginx/private-hosting.stpl @@ -1,7 +1,7 @@ server { 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 20f6f3ed285bfab90751b03ff31a87f13ccf91ac Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 04:59:55 -0500 Subject: [PATCH 44/46] Update private-force-https.stpl --- install/debian/10/templates/web/nginx/private-force-https.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/private-force-https.stpl b/install/debian/10/templates/web/nginx/private-force-https.stpl index 38532e6b9..2b4e42cc8 100644 --- a/install/debian/10/templates/web/nginx/private-force-https.stpl +++ b/install/debian/10/templates/web/nginx/private-force-https.stpl @@ -1,7 +1,7 @@ server { 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 9778a945a2b06b94482ea418f1c9c7fde5f7e44a Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 05:00:11 -0500 Subject: [PATCH 45/46] Update hosting-webmail-phpmyadmin.stpl --- .../10/templates/web/nginx/hosting-webmail-phpmyadmin.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/hosting-webmail-phpmyadmin.stpl b/install/debian/10/templates/web/nginx/hosting-webmail-phpmyadmin.stpl index 4fadbbfcb..dac7adaf9 100644 --- a/install/debian/10/templates/web/nginx/hosting-webmail-phpmyadmin.stpl +++ b/install/debian/10/templates/web/nginx/hosting-webmail-phpmyadmin.stpl @@ -1,7 +1,7 @@ server { 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 b1ab212701f9ef1f689611a873984b915224f05b Mon Sep 17 00:00:00 2001 From: j52m <65143495+j52m@users.noreply.github.com> Date: Fri, 25 Dec 2020 05:00:47 -0500 Subject: [PATCH 46/46] Update hosting-public.stpl --- install/debian/10/templates/web/nginx/hosting-public.stpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/debian/10/templates/web/nginx/hosting-public.stpl b/install/debian/10/templates/web/nginx/hosting-public.stpl index 8f0d3fe3d..22951ae5d 100644 --- a/install/debian/10/templates/web/nginx/hosting-public.stpl +++ b/install/debian/10/templates/web/nginx/hosting-public.stpl @@ -1,7 +1,7 @@ server { 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;