diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index b32099e..4f485c2 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2022.11.01" +version: "2022.11.02" 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/caddy/Caddyfile b/3dprinter-octoprint/rootfs/etc/caddy/Caddyfile index 2e38c78..bd7a1ab 100644 --- a/3dprinter-octoprint/rootfs/etc/caddy/Caddyfile +++ b/3dprinter-octoprint/rootfs/etc/caddy/Caddyfile @@ -1,4 +1,4 @@ -# This file is a placeholder and will be replaced on +# This file is a placeholder and will be replaced on launch. { debug log { diff --git a/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh index 27cd4e8..531e0d7 100644 --- a/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh +++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh @@ -8,10 +8,10 @@ bashio::var.json \ interface "$(bashio::addon.ip_address)" \ port "^$(bashio::addon.ingress_port)" \ + port "^$(bashio::addon.port 5000)" \ ingress_entry "$(bashio::addon.ingress_entry)" \ camera_host "$(bashio::config 'camera_url')" \ - recovery "$(bashio::config 'recovery')" \ - reverse_proxy_test "$(bashio::config 'reverse_proxy_test')" \ + mode "$(bashio::config 'mode')" \ | tempio \ -template /usr/share/tempio/Caddyfile.gtpl \ -out /etc/caddy/Caddyfile diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.gtpl b/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.gtpl index 431b3f9..3780e32 100644 --- a/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.gtpl +++ b/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.gtpl @@ -12,12 +12,11 @@ } uri strip_prefix {{ .ingress_entry }} handle { - # {{ if .recovery }} - # rewrite / /recovery - # {{ end }} - # {{ if .reverse_proxy_test }} - # rewrite / /reverse_proxy_test - # {{ end }} + {{ if eq .mode "recovery" }} + rewrite / /recovery + {{ else if eq .mode "reverse_proxy_test" }} + rewrite / /reverse_proxy_test + {{ else }} reverse_proxy @ingress 127.0.0.1:80 { header_up X-Script-Name {{ .ingress_entry }} header_up -Origin @@ -26,12 +25,15 @@ header_up X-Scheme {scheme} flush_interval -1 } + {{ end }} } } +{{ if .external_port }} # OctoPrint WebUI :5000 { reverse_proxy http://127.0.0.1:80 { header_up X-Scheme {scheme} } } +{{ end }}