diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index 3c37f88..d578558 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2022.7.013" +version: "2022.7.014" 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/nginx.conf b/3dprinter-octoprint/rootfs/etc/nginx/nginx.conf index e496e8b..86a8eb1 100644 --- a/3dprinter-octoprint/rootfs/etc/nginx/nginx.conf +++ b/3dprinter-octoprint/rootfs/etc/nginx/nginx.conf @@ -39,6 +39,9 @@ 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 542e396..1ddcd17 100644 --- a/3dprinter-octoprint/rootfs/etc/nginx/templates/direct.gtpl +++ b/3dprinter-octoprint/rootfs/etc/nginx/templates/direct.gtpl @@ -1,9 +1,6 @@ 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/; } diff --git a/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl b/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl index cbdc3a9..915709f 100644 --- a/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl +++ b/3dprinter-octoprint/rootfs/etc/nginx/templates/ingress.gtpl @@ -1,9 +1,6 @@ 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;