diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index a3b005d..9d8fbdf 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2022.9.022" +version: "2022.9.023" 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 8809116..dc5527b 100644 --- a/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh +++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh @@ -4,7 +4,7 @@ # Configures proxy # ============================================================================== -mkdir -p /etc/caddy/sites-enabled +mkdir -p /etc/caddy/configs # Generate Ingress configuration bashio::var.json \ diff --git a/3dprinter-octoprint/rootfs/etc/services.d/octoprint/finish b/3dprinter-octoprint/rootfs/etc/services.d/octoprint/finish index 4cea07a..4595fc3 100644 --- a/3dprinter-octoprint/rootfs/etc/services.d/octoprint/finish +++ b/3dprinter-octoprint/rootfs/etc/services.d/octoprint/finish @@ -3,7 +3,8 @@ # Add-on: 3dprinter-octoprint # Take down the S6 supervision tree when OctoPrint fails # ============================================================================== -if -n { s6-test $# -ne 0 } -if -n { s6-test ${1} -eq 256 } -s6-svscanctl -t /var/run/s6/services +# if -n { s6-test $# -ne 0 } +# if -n { s6-test ${1} -eq 256 } +# +# s6-svscanctl -t /var/run/s6/services diff --git a/3dprinter-octoprint/rootfs/etc/services.d/proxy/finish b/3dprinter-octoprint/rootfs/etc/services.d/proxy/finish index f19830d..14df06e 100644 --- a/3dprinter-octoprint/rootfs/etc/services.d/proxy/finish +++ b/3dprinter-octoprint/rootfs/etc/services.d/proxy/finish @@ -3,5 +3,3 @@ # Add-on: 3dprinter-octoprint # Stop reverse proxy # ============================================================================== - -caddy stop diff --git a/3dprinter-octoprint/rootfs/etc/services.d/proxy/run b/3dprinter-octoprint/rootfs/etc/services.d/proxy/run index f7111b6..c0be73b 100644 --- a/3dprinter-octoprint/rootfs/etc/services.d/proxy/run +++ b/3dprinter-octoprint/rootfs/etc/services.d/proxy/run @@ -9,4 +9,4 @@ bashio::net.wait_for 5000 bashio::log.info "Starting proxy..." -caddy start --config /etc/caddy/Caddyfile --watch +exec caddy run --config /etc/caddy/Caddyfile diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl b/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl index f70cf54..2aed2f7 100644 --- a/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl +++ b/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl @@ -1,9 +1,9 @@ -:0899 { +:8099 { @ingress { remote_ip 172.30.32.2 } handle { - reverse_proxy @ingress 127.0.0.1:80 { + reverse_proxy @ingress 127.0.0.1:5000 { header_up X-Script-Name {{ .ingress_entry }} } }