diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index 17a797b..5c49d6e 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2022.9.006" +version: "2022.9.007" 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 2552013..fd5463c 100644 --- a/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl +++ b/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl @@ -1,29 +1,31 @@ server { listen {{ .interface }}:{{ .port }} default_server; - - include /etc/nginx/includes/server_params.conf; - include /etc/nginx/includes/proxy_params.conf; + server_name $hostname; location / { allow 172.30.32.2; deny all; - proxy_pass http://octoprint/; # make sure to add trailing slash here! + proxy_pass http://octoprint/; 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 172.30.32.2; # Intentional, use autologin local instead of $proxy_add_x_forwarded_for for Ingress. - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-For 172.30.32.2; # Intentional, for autologin. + proxy_set_header X-Forwarded-Host $http_host; + proxy_set_header X-Scheme $scheme; proxy_set_header X-Script-Name {{ .ingress_entry }}; proxy_http_version 1.1; - client_max_body_size 0; - - # proxy_set_header X-XSRF-TOKEN $http_x_xsrf_token; + + client_max_body_size 0; } location /webcam/ { proxy_pass {{ .camera_host }}; } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } }