From 8f7ca834385c1ad23cbd0d2cde1b58fdaebb34de Mon Sep 17 00:00:00 2001 From: Fredrik Baberg Date: Mon, 11 Jul 2022 18:45:00 +0200 Subject: [PATCH] Revert parts of nginx config --- 3dprinter-octoprint/config.yaml | 3 ++- .../rootfs/etc/nginx/templates/ingress.gtpl | 19 +++---------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index 92475fd..3c37f88 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2022.7.012" +version: "2022.7.013" 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,4 +27,5 @@ options: recovery: false schema: recovery: "bool" +image: ghcr.io/fredrikbaberg/addon-3dprinter-octoprint-{arch} tmpfs: true diff --git a/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl b/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl index b695a97..cbdc3a9 100644 --- a/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl +++ b/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl @@ -1,29 +1,16 @@ server { listen {{ .interface }}:{{ .port }} default_server; - # include /etc/nginx/includes/server_params.conf; - # include /etc/nginx/includes/proxy_params.conf; + 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_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; - add_header Origin 172.30.32.2; - - # Required when mixing http and https? - add_header Access-Control-Allow-Origin *; + proxy_set_header Origin 172.30.32.2; } }