From f0ba54db2d6f47e47ab79292741dbf3f988d6a01 Mon Sep 17 00:00:00 2001 From: Fredrik Baberg Date: Tue, 11 Oct 2022 16:46:40 +0200 Subject: [PATCH] Remove external_port argument --- 3dprinter-octoprint/config.yaml | 2 +- 3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh | 1 - .../rootfs/usr/share/tempio/Caddyfile.gtpl | 12 +++++------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index da53eca..7632d60 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2022.10.0" +version: "2022.10.01" 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/cont-init.d/proxy.sh b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh index 658f7fd..4a144c7 100644 --- a/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh +++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh @@ -8,7 +8,6 @@ bashio::var.json \ interface "$(bashio::addon.ip_address)" \ port "^$(bashio::addon.ingress_port)" \ - external_port "^$(bashio::addon.port 5000)" \ ingress_entry "$(bashio::addon.ingress_entry)" \ camera_host "$(bashio::config 'camera_url')" \ | tempio \ diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.gtpl b/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.gtpl index 00764b6..ec9c1b9 100644 --- a/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.gtpl +++ b/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.gtpl @@ -26,11 +26,9 @@ } } -{{ if .external_port }} - # OctoPrint WebUI - :5000 { - reverse_proxy http://127.0.0.1:5000 { - header_up X-Scheme {scheme} - } +# OctoPrint WebUI +:5000 { + reverse_proxy http://127.0.0.1:5000 { + header_up X-Scheme {scheme} } -{{ end }} +}