From 66097392bf6fe30edabb679615211f3b16a04980 Mon Sep 17 00:00:00 2001
From: myvesta <38690722+myvesta@users.noreply.github.com>
Date: Sat, 25 Mar 2023 16:22:49 +0100
Subject: [PATCH] deb8 ttp2->ssl fix

---
 .../debian/8/templates/web/nginx/force-https-legacy.stpl  | 2 +-
 .../debian/8/templates/web/nginx/force-https-public.stpl  | 2 +-
 .../web/nginx/force-https-webmail-phpmyadmin.stpl         | 2 +-
 install/debian/8/templates/web/nginx/force-https.stpl     | 2 +-
 .../debian/8/templates/web/nginx/private-force-https.stpl | 2 +-
 .../debian/8/templates/web/nginx/private-force-https.tpl  | 8 ++++++++
 6 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 install/debian/8/templates/web/nginx/private-force-https.tpl

diff --git a/install/debian/8/templates/web/nginx/force-https-legacy.stpl b/install/debian/8/templates/web/nginx/force-https-legacy.stpl
index 79e55a26..4e51748d 100644
--- a/install/debian/8/templates/web/nginx/force-https-legacy.stpl
+++ b/install/debian/8/templates/web/nginx/force-https-legacy.stpl
@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%proxy_ssl_port% ssl http2;
+    listen      %ip%:%proxy_ssl_port% ssl;
     server_name %domain_idn% %alias_idn%;
 
     ssl_certificate      %ssl_pem%;
diff --git a/install/debian/8/templates/web/nginx/force-https-public.stpl b/install/debian/8/templates/web/nginx/force-https-public.stpl
index ac422df6..9522313b 100644
--- a/install/debian/8/templates/web/nginx/force-https-public.stpl
+++ b/install/debian/8/templates/web/nginx/force-https-public.stpl
@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%proxy_ssl_port% ssl http2;
+    listen      %ip%:%proxy_ssl_port% ssl;
     server_name %domain_idn% %alias_idn%;
 
     ssl_certificate      %ssl_pem%;
diff --git a/install/debian/8/templates/web/nginx/force-https-webmail-phpmyadmin.stpl b/install/debian/8/templates/web/nginx/force-https-webmail-phpmyadmin.stpl
index 7e0e71d1..2d62e72b 100644
--- a/install/debian/8/templates/web/nginx/force-https-webmail-phpmyadmin.stpl
+++ b/install/debian/8/templates/web/nginx/force-https-webmail-phpmyadmin.stpl
@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%proxy_ssl_port% ssl http2;
+    listen      %ip%:%proxy_ssl_port% ssl;
     server_name %domain_idn% %alias_idn%;
 
     ssl_certificate      %ssl_pem%;
diff --git a/install/debian/8/templates/web/nginx/force-https.stpl b/install/debian/8/templates/web/nginx/force-https.stpl
index 33fab443..d138ea63 100644
--- a/install/debian/8/templates/web/nginx/force-https.stpl
+++ b/install/debian/8/templates/web/nginx/force-https.stpl
@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%proxy_ssl_port% ssl http2;
+    listen      %ip%:%proxy_ssl_port% ssl;
     server_name %domain_idn% %alias_idn%;
 
     ssl_certificate      %ssl_pem%;
diff --git a/install/debian/8/templates/web/nginx/private-force-https.stpl b/install/debian/8/templates/web/nginx/private-force-https.stpl
index 64094fb8..c77baf91 100644
--- a/install/debian/8/templates/web/nginx/private-force-https.stpl
+++ b/install/debian/8/templates/web/nginx/private-force-https.stpl
@@ -1,5 +1,5 @@
 server {
-    listen      %ip%:%proxy_ssl_port% ssl http2;
+    listen      %ip%:%proxy_ssl_port% ssl;
     server_name %domain_idn% %alias_idn%;
 
     ssl_certificate      %ssl_pem%;
diff --git a/install/debian/8/templates/web/nginx/private-force-https.tpl b/install/debian/8/templates/web/nginx/private-force-https.tpl
new file mode 100644
index 00000000..8bdbea42
--- /dev/null
+++ b/install/debian/8/templates/web/nginx/private-force-https.tpl
@@ -0,0 +1,8 @@
+server {
+    listen      %ip%:%proxy_port%;
+    server_name %domain_idn% %alias_idn%;
+    location / {
+        rewrite ^(.*) https://$host%$1 permanent;
+    }
+include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
+}