diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index 641013c..937ca0b 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2023.01.02" +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/octoprint.sh b/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh index e8112c4..9415a67 100644 --- a/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh +++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh @@ -30,7 +30,7 @@ updateConfigRequired() octoprint $BASEDIR config set server.commands.systemRestartCommand "/scripts/system_restart.sh" octoprint $BASEDIR config set server.commands.systemShutdownCommand "/scripts/system_shutdown.sh" octoprint $BASEDIR config set server.host "127.0.0.1" - octoprint $BASEDIR config set --int server.port 5000 + octoprint $BASEDIR config set --int server.port 80 octoprint $BASEDIR config set webcam.ffmpeg "/usr/bin/ffmpeg" } diff --git a/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh index 2e43d00..cf77ef6 100644 --- a/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh +++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh @@ -5,14 +5,14 @@ # ============================================================================== # Generate proxy configuration for any access -# bashio::var.json \ -# | tempio \ -# -template /usr/share/tempio/caddy/Caddyfile.any.gtpl \ -# -out /etc/caddy/sites-enabled/any.caddy +bashio::var.json \ + | tempio \ + -template /usr/share/tempio/caddy/Caddyfile.any.gtpl \ + -out /etc/caddy/sites-enabled/any.caddy # Generate proxy configuration for internal access bashio::var.json \ - internal_hostname "$(bashio::info.hostname)" \ + addon_hostname "$(bashio::addon.hostname)" \ | tempio \ -template /usr/share/tempio/caddy/Caddyfile.internal.gtpl \ -out /etc/caddy/sites-enabled/internal.caddy diff --git a/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run b/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run index 81eaf4c..95750a1 100644 --- a/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run +++ b/3dprinter-octoprint/rootfs/etc/services.d/octoprint/run @@ -7,4 +7,4 @@ bashio::log.info "Starting OctoPrint..." ## Run your program -exec octoprint --basedir /data/config/octoprint serve --iknowwhatimdoing --host 127.0.0.1 --port 5000 +exec octoprint --basedir /data/config/octoprint serve --iknowwhatimdoing --host 127.0.0.1 --port 80 diff --git a/3dprinter-octoprint/rootfs/etc/services.d/proxy/run b/3dprinter-octoprint/rootfs/etc/services.d/proxy/run index 4c93df1..0edf12f 100644 --- a/3dprinter-octoprint/rootfs/etc/services.d/proxy/run +++ b/3dprinter-octoprint/rootfs/etc/services.d/proxy/run @@ -5,7 +5,7 @@ # ============================================================================== # Wait for OctoPrint WebUI to be available -bashio::net.wait_for 5000 +bashio::net.wait_for 80 bashio::log.info "Starting proxy..." diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.any.gtpl b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.any.gtpl index 16428a9..60771a6 100644 --- a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.any.gtpl +++ b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.any.gtpl @@ -1,5 +1,5 @@ # OctoPrint WebUI through any access :5000 { - reverse_proxy http://127.0.0.1:5000 { + reverse_proxy http://127.0.0.1:80 { } } diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.ingress.gtpl b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.ingress.gtpl index 8bfba2b..b356460 100644 --- a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.ingress.gtpl +++ b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.ingress.gtpl @@ -18,7 +18,7 @@ {{ else if eq .mode "reverse_proxy_test" }} rewrite / /reverse_proxy_test {{ end }} - reverse_proxy @ingress 127.0.0.1:5000 { + reverse_proxy @ingress 127.0.0.1:80 { header_up X-Script-Name {{ .ingress_entry }} trusted_proxies 172.30.32.2 # header_up -Origin diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.internal.gtpl b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.internal.gtpl index 7cdb867..08651be 100644 --- a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.internal.gtpl +++ b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.internal.gtpl @@ -1,5 +1,5 @@ # WebUI through internal hostname -{{ .internal_hostname }}:5000 { - reverse_proxy http://127.0.0.1:5000 { +{{ .addon_hostname }}:5000 { + reverse_proxy http://127.0.0.1:80 { } }