diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index f084195..488c7ff 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2022.9.004" +version: "2022.9.005" 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/templates/ingress.gtpl b/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl index b257abc..7873a1d 100644 --- a/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl +++ b/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl @@ -8,20 +8,17 @@ server { allow 172.30.32.2; deny all; - proxy_set_header X-Forwarded-For 172.30.32.2; - proxy_set_header Origin 172.30.32.2; - proxy_pass http://octoprint/; # make sure to add trailing slash here! - proxy_set_header Host $http_host; - 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 $proxy_add_x_forwarded_for; - proxy_set_header X-Scheme $scheme; - proxy_set_header X-Script-Name {{ .ingress_entry }}; + proxy_set_header X-Forwarded-For 172.30.32.2, $proxy_add_x_forwarded_for; # This is intentional, access through Ingress should use "autologin local". + proxy_set_header X-Forwarded-Host $host 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; + # proxy_set_header Host $http_host; + # proxy_set_header Upgrade $http_upgrade; + # proxy_set_header Connection "upgrade"; + # proxy_set_header X-Real-IP $remote_addr; } location /webcam/ {