diff --git a/3dprinter-octoprint/build.yaml b/3dprinter-octoprint/build.yaml index 778b554..0caee25 100644 --- a/3dprinter-octoprint/build.yaml +++ b/3dprinter-octoprint/build.yaml @@ -9,4 +9,4 @@ labels: org.opencontainers.image.description: "3DPrinter-OctoPrint addon for Home-Assistant." org.opencontainers.image.source: "https://github.com/fredrikbaberg/3dprinter-addons" args: - OCTOPRINT_VERSION: "1.8.3" + OCTOPRINT_VERSION: "1.8.4" diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index 3e09e48..db9aaa4 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2022.9.014" +version: "2022.9.015" 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" @@ -27,7 +27,7 @@ options: camera_url: "http://b7aa59c4-camera-mjpg-streamer/" recovery: false schema: - camera_url: "url" + camera_url: "url?" recovery: "bool" image: ghcr.io/fredrikbaberg/addon-3dprinter-octoprint-{arch} tmpfs: true diff --git a/3dprinter-octoprint/rootfs/etc/nginx/templates/direct.gtpl b/3dprinter-octoprint/rootfs/etc/nginx/templates/direct.gtpl index 2e7b303..696df34 100644 --- a/3dprinter-octoprint/rootfs/etc/nginx/templates/direct.gtpl +++ b/3dprinter-octoprint/rootfs/etc/nginx/templates/direct.gtpl @@ -7,13 +7,13 @@ server { location / { 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 $proxy_add_x_forwarded_for; - proxy_set_header X-Scheme $scheme; + # 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_http_version 1.1; - + client_max_body_size 0; } diff --git a/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl b/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl index db2be98..a2a5eb4 100644 --- a/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl +++ b/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl @@ -7,10 +7,12 @@ server { deny all; proxy_pass http://octoprint/; - proxy_set_header Host $http_host; + proxy_pass_request_headers on; + proxy_set_header Host $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; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Host $http_host; proxy_set_header X-Scheme $scheme;