diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index dcf8c1e..971aec1 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2023.01.03" +version: "2023.01.04" 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 7233f44..37d9cfe 100644 --- a/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh +++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh @@ -4,20 +4,14 @@ # Configures proxy # ============================================================================== -# Generate proxy configuration for internal access +# Generate proxy configuration for internal and external access bashio::var.json \ addon_hostname "$(bashio::addon.hostname)" \ addon_ip "$(bashio::addon.ip_address)" \ - | tempio \ - -template /usr/share/tempio/caddy/Caddyfile.internal.gtpl \ - -out /etc/caddy/sites-enabled/internal.caddy - -# Generate proxy configuration for external access -bashio::var.json \ trusted_proxies "$(bashio::config 'trusted_proxies')" \ | tempio \ - -template /usr/share/tempio/caddy/Caddyfile.external.gtpl \ - -out /etc/caddy/sites-enabled/external.caddy + -template /usr/share/tempio/caddy/Caddyfile.internal_external.gtpl \ + -out /etc/caddy/sites-enabled/internal_external.caddy # Generate proxy configuration for access by Ingress # bashio::var.json \ diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.external.gtpl b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.external.gtpl deleted file mode 100644 index b1f51a0..0000000 --- a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.external.gtpl +++ /dev/null @@ -1,6 +0,0 @@ -# OctoPrint WebUI through external access -:5000 { - reverse_proxy http://127.0.0.1:80 { - trusted_proxies {{ .trusted_proxies }} - } -} diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.internal.gtpl b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.internal.gtpl deleted file mode 100644 index 896f7ec..0000000 --- a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.internal.gtpl +++ /dev/null @@ -1,6 +0,0 @@ -# Internal access, e.g. for Home-Assistant OctoPrint integration. -:5000 { - bind {{ .addon_ip }} - reverse_proxy http://127.0.0.1:80 { - } -} diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.internal_external.gtpl b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.internal_external.gtpl new file mode 100644 index 0000000..56f2ec8 --- /dev/null +++ b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.internal_external.gtpl @@ -0,0 +1,8 @@ +# Internal and external access. Used for: +# * Home-Assistant OctoPrint integration. +# * Accessing OctoPrint WebUI through external port. +:5000 { + reverse_proxy http://127.0.0.1:80 { + trusted_proxies {{ .trusted_proxies }} + } +}