Release 6.2.14 - See CHANGELOG.md

tiredofit · Dec 20, 2022 · 3f64048 · 3f64048
1 parent c0031b6
commit 3f64048
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 6.2.14 2022-12-20 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix NGINX_PROXY_URL and NGINX_MAINTENANCE_PROXY_URL if host is https
+
+
 ## 6.2.13 2022-12-20 <dave at tiredofit dot ca>
 
    ### Added

diff --git a/install/assets/functions/10-nginx b/install/assets/functions/10-nginx
@@ -272,12 +272,12 @@ server {
     ###
 
     location / {
-        proxy_pass         ${NGINX_MAINTENANCE_PROXY_URL};
-        proxy_redirect     off;
-        proxy_set_header   Host $host;
-        proxy_set_header   X-Real-IP $remote_addr;
-        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header   X-Forwarded-Host $server_name;
+        proxy_pass              ${NGINX_MAINTENANCE_PROXY_URL};
+        proxy_redirect          off;
+        proxy_set_header        X-Real-IP \$remote_addr;
+        proxy_set_header        X-Forwarded-For \$proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Host \$server_name;
+        proxy_ssl_server_name   on;
     }
 
 ### Don't edit past here
@@ -300,7 +300,6 @@ EOF
 
 }
 EOF
-                file
                 else
                     sanity_var NGINX_MAINTENANCE_REDIRECT_URL "Set NGINX_MAINTENANCE_TYPE=redirect"
                 fi

diff --git a/install/etc/nginx/templates/proxy.template b/install/etc/nginx/templates/proxy.template
@@ -1,18 +1,16 @@
-   server {
-      ### Don't Touch This
-      listen {{NGINX_LISTEN_PORT}};
-      server_name localhost;
-      ###
+    server {
+        ### Don't Touch This
+        listen {{NGINX_LISTEN_PORT}};
+        server_name localhost;
+        ###
 
-      location / {
-         proxy_pass         {{NGINX_PROXY_URL}};
-         proxy_redirect     off;
-         proxy_set_header   Host $host;
-         proxy_set_header   X-Real-IP $remote_addr;
-         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-         proxy_set_header   X-Forwarded-Host $server_name;
-      }
-
-      ### Don't edit past here
-
-}
+        location / {
+            proxy_pass              {{NGINX_PROXY_URL}};
+            proxy_redirect          off;
+            proxy_set_header        X-Real-IP $remote_addr;
+            proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header        X-Forwarded-Host $server_name;
+            proxy_ssl_server_name   on;
+        }
+        ### Don't edit past here
+    }