From d84a021354d4f8bf317e558b1225c6cdd6acb728 Mon Sep 17 00:00:00 2001
From: myvesta <38690722+myvesta@users.noreply.github.com>
Date: Sat, 25 Mar 2023 23:59:28 +0100
Subject: [PATCH] force-https fix

---
 install/debian/10/templates/web/nginx/force-https-legacy.tpl    | 2 +-
 install/debian/10/templates/web/nginx/force-https-public.tpl    | 2 +-
 .../10/templates/web/nginx/force-https-webmail-phpmyadmin.tpl   | 2 +-
 install/debian/10/templates/web/nginx/force-https.tpl           | 2 +-
 install/debian/10/templates/web/nginx/private-force-https.tpl   | 2 +-
 install/debian/11/templates/web/nginx/force-https-legacy.tpl    | 2 +-
 install/debian/11/templates/web/nginx/force-https-public.tpl    | 2 +-
 .../11/templates/web/nginx/force-https-webmail-phpmyadmin.tpl   | 2 +-
 install/debian/11/templates/web/nginx/force-https.tpl           | 2 +-
 install/debian/11/templates/web/nginx/private-force-https.tpl   | 2 +-
 install/debian/8/templates/web/nginx/force-https-legacy.tpl     | 2 +-
 install/debian/8/templates/web/nginx/force-https-public.tpl     | 2 +-
 .../8/templates/web/nginx/force-https-webmail-phpmyadmin.tpl    | 2 +-
 install/debian/8/templates/web/nginx/force-https.tpl            | 2 +-
 install/debian/8/templates/web/nginx/private-force-https.tpl    | 2 +-
 install/debian/9/templates/web/nginx/force-https-legacy.tpl     | 2 +-
 install/debian/9/templates/web/nginx/force-https-public.tpl     | 2 +-
 .../9/templates/web/nginx/force-https-webmail-phpmyadmin.tpl    | 2 +-
 install/debian/9/templates/web/nginx/force-https.tpl            | 2 +-
 install/debian/9/templates/web/nginx/private-force-https.tpl    | 2 +-
 .../nodejs-nginx-templates/node-app-3000-pass-to-https.tpl      | 2 +-
 .../for-download/tools/nodejs-nginx-templates/node-app-3000.tpl | 2 +-
 .../nodejs-nginx-templates/node-app-4000-and-websocket-6001.tpl | 2 +-
 .../force-https-firewall-burst-2-speed-2-conn-4.tpl             | 2 +-
 .../rate-limit-tpl/force-https-firewall-burst-2-speed-2.tpl     | 2 +-
 .../tools/rate-limit-tpl/force-https-firewall-burst-2.tpl       | 2 +-
 .../for-download/tools/rate-limit-tpl/force-https-firewall.tpl  | 2 +-
 .../tools/rocket-nginx-templates/wprocket-force-https.tpl       | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/install/debian/10/templates/web/nginx/force-https-legacy.tpl b/install/debian/10/templates/web/nginx/force-https-legacy.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/10/templates/web/nginx/force-https-legacy.tpl
+++ b/install/debian/10/templates/web/nginx/force-https-legacy.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/10/templates/web/nginx/force-https-public.tpl b/install/debian/10/templates/web/nginx/force-https-public.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/10/templates/web/nginx/force-https-public.tpl
+++ b/install/debian/10/templates/web/nginx/force-https-public.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/10/templates/web/nginx/force-https-webmail-phpmyadmin.tpl b/install/debian/10/templates/web/nginx/force-https-webmail-phpmyadmin.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/10/templates/web/nginx/force-https-webmail-phpmyadmin.tpl
+++ b/install/debian/10/templates/web/nginx/force-https-webmail-phpmyadmin.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/10/templates/web/nginx/force-https.tpl b/install/debian/10/templates/web/nginx/force-https.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/10/templates/web/nginx/force-https.tpl
+++ b/install/debian/10/templates/web/nginx/force-https.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/10/templates/web/nginx/private-force-https.tpl b/install/debian/10/templates/web/nginx/private-force-https.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/10/templates/web/nginx/private-force-https.tpl
+++ b/install/debian/10/templates/web/nginx/private-force-https.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/11/templates/web/nginx/force-https-legacy.tpl b/install/debian/11/templates/web/nginx/force-https-legacy.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/11/templates/web/nginx/force-https-legacy.tpl
+++ b/install/debian/11/templates/web/nginx/force-https-legacy.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/11/templates/web/nginx/force-https-public.tpl b/install/debian/11/templates/web/nginx/force-https-public.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/11/templates/web/nginx/force-https-public.tpl
+++ b/install/debian/11/templates/web/nginx/force-https-public.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/11/templates/web/nginx/force-https-webmail-phpmyadmin.tpl b/install/debian/11/templates/web/nginx/force-https-webmail-phpmyadmin.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/11/templates/web/nginx/force-https-webmail-phpmyadmin.tpl
+++ b/install/debian/11/templates/web/nginx/force-https-webmail-phpmyadmin.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/11/templates/web/nginx/force-https.tpl b/install/debian/11/templates/web/nginx/force-https.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/11/templates/web/nginx/force-https.tpl
+++ b/install/debian/11/templates/web/nginx/force-https.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/11/templates/web/nginx/private-force-https.tpl b/install/debian/11/templates/web/nginx/private-force-https.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/11/templates/web/nginx/private-force-https.tpl
+++ b/install/debian/11/templates/web/nginx/private-force-https.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/8/templates/web/nginx/force-https-legacy.tpl b/install/debian/8/templates/web/nginx/force-https-legacy.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/8/templates/web/nginx/force-https-legacy.tpl
+++ b/install/debian/8/templates/web/nginx/force-https-legacy.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/8/templates/web/nginx/force-https-public.tpl b/install/debian/8/templates/web/nginx/force-https-public.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/8/templates/web/nginx/force-https-public.tpl
+++ b/install/debian/8/templates/web/nginx/force-https-public.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/8/templates/web/nginx/force-https-webmail-phpmyadmin.tpl b/install/debian/8/templates/web/nginx/force-https-webmail-phpmyadmin.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/8/templates/web/nginx/force-https-webmail-phpmyadmin.tpl
+++ b/install/debian/8/templates/web/nginx/force-https-webmail-phpmyadmin.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/8/templates/web/nginx/force-https.tpl b/install/debian/8/templates/web/nginx/force-https.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/8/templates/web/nginx/force-https.tpl
+++ b/install/debian/8/templates/web/nginx/force-https.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/8/templates/web/nginx/private-force-https.tpl b/install/debian/8/templates/web/nginx/private-force-https.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/8/templates/web/nginx/private-force-https.tpl
+++ b/install/debian/8/templates/web/nginx/private-force-https.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/9/templates/web/nginx/force-https-legacy.tpl b/install/debian/9/templates/web/nginx/force-https-legacy.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/9/templates/web/nginx/force-https-legacy.tpl
+++ b/install/debian/9/templates/web/nginx/force-https-legacy.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/9/templates/web/nginx/force-https-public.tpl b/install/debian/9/templates/web/nginx/force-https-public.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/9/templates/web/nginx/force-https-public.tpl
+++ b/install/debian/9/templates/web/nginx/force-https-public.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/9/templates/web/nginx/force-https-webmail-phpmyadmin.tpl b/install/debian/9/templates/web/nginx/force-https-webmail-phpmyadmin.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/9/templates/web/nginx/force-https-webmail-phpmyadmin.tpl
+++ b/install/debian/9/templates/web/nginx/force-https-webmail-phpmyadmin.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/9/templates/web/nginx/force-https.tpl b/install/debian/9/templates/web/nginx/force-https.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/9/templates/web/nginx/force-https.tpl
+++ b/install/debian/9/templates/web/nginx/force-https.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/install/debian/9/templates/web/nginx/private-force-https.tpl b/install/debian/9/templates/web/nginx/private-force-https.tpl
index 8bdbea42..5a463370 100644
--- a/install/debian/9/templates/web/nginx/private-force-https.tpl
+++ b/install/debian/9/templates/web/nginx/private-force-https.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://$host%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000-pass-to-https.tpl b/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000-pass-to-https.tpl
index 851ac0dc..5a463370 100644
--- a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000-pass-to-https.tpl
+++ b/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000-pass-to-https.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://%domain_idn%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000.tpl b/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000.tpl
index 851ac0dc..5a463370 100644
--- a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000.tpl
+++ b/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://%domain_idn%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-4000-and-websocket-6001.tpl b/src/deb/for-download/tools/nodejs-nginx-templates/node-app-4000-and-websocket-6001.tpl
index 958b2594..ee8db90e 100644
--- a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-4000-and-websocket-6001.tpl
+++ b/src/deb/for-download/tools/nodejs-nginx-templates/node-app-4000-and-websocket-6001.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://%domain_idn%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 
     location /app {
diff --git a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2-conn-4.tpl b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2-conn-4.tpl
index 851ac0dc..5a463370 100644
--- a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2-conn-4.tpl
+++ b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2-conn-4.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://%domain_idn%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2.tpl b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2.tpl
index 851ac0dc..5a463370 100644
--- a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2.tpl
+++ b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://%domain_idn%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2.tpl b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2.tpl
index 851ac0dc..5a463370 100644
--- a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2.tpl
+++ b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://%domain_idn%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall.tpl b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall.tpl
index 851ac0dc..5a463370 100644
--- a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall.tpl
+++ b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://%domain_idn%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }
diff --git a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-https.tpl b/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-https.tpl
index 851ac0dc..5a463370 100644
--- a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-https.tpl
+++ b/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-https.tpl
@@ -2,7 +2,7 @@ server {
     listen      %ip%:%proxy_port%;
     server_name %domain_idn% %alias_idn%;
     location / {
-        rewrite ^(.*) https://%domain_idn%$1 permanent;
+        rewrite ^(.*) https://$host$1 permanent;
     }
 include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt;
 }