diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index d578558..2b234f8 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2022.7.014" +version: "2022.7.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" diff --git a/3dprinter-octoprint/rootfs/etc/nginx/includes/upstream.conf b/3dprinter-octoprint/rootfs/etc/nginx/includes/upstream.conf index 3252455..a660320 100644 --- a/3dprinter-octoprint/rootfs/etc/nginx/includes/upstream.conf +++ b/3dprinter-octoprint/rootfs/etc/nginx/includes/upstream.conf @@ -1,3 +1,3 @@ -upstream backend { +upstream octoprint { server 127.0.0.1:5000; } diff --git a/3dprinter-octoprint/rootfs/etc/nginx/nginx.conf b/3dprinter-octoprint/rootfs/etc/nginx/nginx.conf index 86a8eb1..e496e8b 100644 --- a/3dprinter-octoprint/rootfs/etc/nginx/nginx.conf +++ b/3dprinter-octoprint/rootfs/etc/nginx/nginx.conf @@ -39,9 +39,6 @@ http { '' close; } - include /etc/nginx/includes/server_params.conf; - include /etc/nginx/includes/proxy_params.conf; - include /etc/nginx/includes/upstream.conf; include /etc/nginx/servers/*.conf; } diff --git a/3dprinter-octoprint/rootfs/etc/nginx/templates/direct.gtpl b/3dprinter-octoprint/rootfs/etc/nginx/templates/direct.gtpl index 1ddcd17..7e27118 100644 --- a/3dprinter-octoprint/rootfs/etc/nginx/templates/direct.gtpl +++ b/3dprinter-octoprint/rootfs/etc/nginx/templates/direct.gtpl @@ -1,7 +1,10 @@ server { listen {{ .interface }}:{{ .port }} default_server; + include /etc/nginx/includes/server_params.conf; + include /etc/nginx/includes/proxy_params.conf; + location / { - proxy_pass http://backend/; + proxy_pass http://octoprint/; } } diff --git a/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl b/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl index 915709f..7c1a731 100644 --- a/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl +++ b/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl @@ -1,12 +1,25 @@ server { listen {{ .interface }}:{{ .port }} default_server; + include /etc/nginx/includes/server_params.conf; + include /etc/nginx/includes/proxy_params.conf; + location / { allow 172.30.32.2; deny all; - - proxy_pass http://backend/; + + 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_http_version 1.1; + + client_max_body_size 0; + proxy_set_header X-Forwarded-For 172.30.32.2; proxy_set_header Origin 172.30.32.2; }