Attempt at #1

Author: nutjob4life

.github/workflows/imaging.yaml

@@ -17,6 +17,7 @@ on:
     push:
         branches:
             -   main
+            -   issue/**
         paths:
             -   'docker/**'
             -   'etc/**'
@@ -40,7 +41,7 @@ jobs:
                     password: ${{secrets.DOCKERHUB_TOKEN}}
             -
                 name: 📚 Repository Checkout
-                uses: actions/checkout@v4
+                uses: actions/checkout@v6
             -
                 name: 🎰 QEMU Multiple Machine Emulation
                 uses: docker/setup-qemu-action@v3
@@ -49,7 +50,7 @@ jobs:
                 uses: docker/setup-buildx-action@v3
             -
                 name: 🧱 Image Construction and Publication
-                uses: docker/build-push-action@v5
+                uses: docker/build-push-action@v6
                 with:
                     context: .
                     file: docker/Dockerfile

etc/default.conf.template

@@ -62,13 +62,16 @@ server {
     location ${PROXY_PATH} {
         proxy_pass       ${PROXY_URL};
         proxy_redirect   ${PROXY_REDIRECT};
-        proxy_set_header Host $http_host;
-        proxy_set_header Origin http://$http_host;
+        proxy_set_header Host              $upstream_host;
+        proxy_set_header X-Forwarded-Host  $upstream_host;
+        proxy_set_header X-Forwarded-Proto $upstream_proto;
+        proxy_set_header X-Forwarded-Port  $upstream_port;
+
         proxy_set_header X-Forwarded-Prefix ${PROXY_PATH};
-        proxy_set_header X-Forwarded-Port ${PROXY_PORT};
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
+
         proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
         # Disclosure reduction
         proxy_hide_header X-Powered-By;
         proxy_ssl_verify off;

etc/nginx.conf

@@ -56,6 +56,22 @@ http {
 
     access_log /var/log/nginx/access.log main;
     include /etc/nginx/conf.d/*.conf;
+
+    map $http_x_forwarded_host $upstream_host {
+        default $http_x_forwarded_host;
+        ""      $http_host;
+    }
+
+    map $http_x_forwarded_proto $upstream_proto {
+        default $http_x_forwarded_proto;
+        ""      $scheme;
+    }
+
+    map $http_x_forwarded_port $upstream_port {
+        default $http_x_forwarded_port;
+        ""      $server_port;
+    }
+
 }
 
 # -*- mode: nginx; tab-width: 4; -*-