gronod/ha-3dprinter-addons
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Add lines according to OctoPrint reverse proxy

Browse Source
This commit is contained in:
Fredrik Baberg 2022-07-11 19:16:11 +02:00
parent 225524894b
commit 9a0dc39669
5 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3dprinter-octoprint/config.yaml
View File

@ -1,5 +1,5 @@
name: "3DPrinter-OctoPrint" name: "3DPrinter-OctoPrint"
version: "2022.7.014" version: "2022.7.015"
slug: "3dprinter-octoprint" slug: "3dprinter-octoprint"
description: "OctoPrint as an addon, no additional bells and whistles." description: "OctoPrint as an addon, no additional bells and whistles."
url: "https://github.com/fredrikbaberg/home-assistant-addons/tree/main/3dprinter-octoprint" url: "https://github.com/fredrikbaberg/home-assistant-addons/tree/main/3dprinter-octoprint"

2
3dprinter-octoprint/rootfs/etc/nginx/includes/upstream.conf
View File

@ -1,3 +1,3 @@
upstream backend { upstream octoprint {
server 127.0.0.1:5000; server 127.0.0.1:5000;
} }

3
3dprinter-octoprint/rootfs/etc/nginx/nginx.conf
View File

@ -39,9 +39,6 @@ http {
'' close; '' close;
} }
include /etc/nginx/includes/server_params.conf;
include /etc/nginx/includes/proxy_params.conf;
include /etc/nginx/includes/upstream.conf; include /etc/nginx/includes/upstream.conf;
include /etc/nginx/servers/*.conf; include /etc/nginx/servers/*.conf;
} }

5
3dprinter-octoprint/rootfs/etc/nginx/templates/direct.gtpl
View File

@ -1,7 +1,10 @@
server { server {
listen {{ .interface }}:{{ .port }} default_server; listen {{ .interface }}:{{ .port }} default_server;
include /etc/nginx/includes/server_params.conf;
include /etc/nginx/includes/proxy_params.conf;
location / { location / {
proxy_pass http://backend/; proxy_pass http://octoprint/;
} }
} }

17
3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl
View File

@ -1,12 +1,25 @@
server { server {
listen {{ .interface }}:{{ .port }} default_server; listen {{ .interface }}:{{ .port }} default_server;
include /etc/nginx/includes/server_params.conf;
include /etc/nginx/includes/proxy_params.conf;
location / { location / {
allow 172.30.32.2; allow 172.30.32.2;
deny all; 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_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 X-Forwarded-For 172.30.32.2;
proxy_set_header Origin 172.30.32.2; proxy_set_header Origin 172.30.32.2;
} }