From 39c8fe41c3e50c62e492e76e31b54c20b27624be Mon Sep 17 00:00:00 2001
From: Fredrik Baberg <fredrik.baberg@gmail.com>
Date: Tue, 27 Sep 2022 10:59:35 +0200
Subject: [PATCH] Attempt to fix nginx through setting more headers.

---
 3dprinter-octoprint/config.yaml                           | 2 +-
 3dprinter-octoprint/rootfs/etc/nginx/nginx.conf           | 6 ++++++
 .../rootfs/etc/nginx/templates/ingress.gtpl               | 8 +++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml
index a796a2a..696ae07 100644
--- a/3dprinter-octoprint/config.yaml
+++ b/3dprinter-octoprint/config.yaml
@@ -1,5 +1,5 @@
 name: "3DPrinter-OctoPrint"
-version: "2022.9.009"
+version: "2022.9.010"
 slug: "3dprinter-octoprint"
 description: "OctoPrint as an addon, no additional bells and whistles."
 url: "https://github.com/fredrikbaberg/home-assistant-addons/tree/main/3dprinter-octoprint"
diff --git a/3dprinter-octoprint/rootfs/etc/nginx/nginx.conf b/3dprinter-octoprint/rootfs/etc/nginx/nginx.conf
index b8edbbb..2ed0d9c 100644
--- a/3dprinter-octoprint/rootfs/etc/nginx/nginx.conf
+++ b/3dprinter-octoprint/rootfs/etc/nginx/nginx.conf
@@ -40,6 +40,12 @@ http {
         ''      close;
     }
 
+    # Should get port used, taken from https://stackoverflow.com/questions/60616564/how-to-configure-nginx-x-forwarded-port-to-be-the-originally-request-port
+    map $http_x_forwarded_port $port {
+        default $remote_port;
+        "~^(.*)$" $1;
+    }
+
     include /etc/nginx/includes/upstream.conf;
     include /etc/nginx/servers/*.conf;
 }
diff --git a/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl b/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl
index e64028f..b3bd3b3 100644
--- a/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl
+++ b/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl
@@ -11,13 +11,15 @@ server {
         proxy_set_header Upgrade            $http_upgrade;
         proxy_set_header Connection         "upgrade";
         proxy_set_header X-Real-IP          $remote_addr;
-        proxy_set_header X-Forwarded-For    172.30.32.2; # Intentional, for autologin.
-        proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-For    172.30.32.2; # For autologin through Ingress.
+        #proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Host   $host;
+        proxy_set_header X-Forwarded-Server $host;
+        proxy_set_header X-Forwarded-Port   $port;
         proxy_set_header X-Forwarded-Proto  $scheme;
         proxy_set_header X-Script-Name      {{ .ingress_entry }};
         proxy_http_version                  1.1;
-        client_max_body_size                0;        
+        client_max_body_size                0;
     }
 
     location /webcam/ {