diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index 398f6dc..1bc53ac 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,10 +1,10 @@ name: "3DPrinter-OctoPrint" -version: "2023.01.01" +version: "2023.01.0" 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" -ingress: true -ingress_stream: true +ingress: false +ingress_stream: false panel_icon: mdi:printer-3d panel_title: 3DPrinter-OctoPrint arch: @@ -24,12 +24,12 @@ ports: ports_description: 5000/tcp: Web-based interface options: - camera_url: "http://b7aa59c4-camera-mjpg-streamer" - mode: normal - trusted_proxies: "" + # camera_url: "http://b7aa59c4-camera-mjpg-streamer" + # mode: normal + # trusted_proxies: "" schema: - camera_url: "url?" - mode: "list(normal|recovery|reverse_proxy_test|camera)?" - trusted_proxies: "str?" + # camera_url: "url?" + # mode: "list(normal|recovery|reverse_proxy_test|camera)?" + # trusted_proxies: "str?" tmpfs: true -# image: ghcr.io/fredrikbaberg/ha-addon-3dprinter-octoprint-{arch} +image: ghcr.io/fredrikbaberg/ha-addon-3dprinter-octoprint-{arch} diff --git a/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh index dc64fdb..59d7c3b 100644 --- a/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh +++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh @@ -4,18 +4,16 @@ # Configures proxy # ============================================================================== -echo "$(bashio::addon.ingress_entry)" -echo "$(bashio::addon.ingress_url)" - # Generate proxy configuration for access by Ingress bashio::var.json \ addon_hostname "$(bashio::addon.hostname)" \ addon_ip "$(bashio::addon.ip_address)" \ camera_host "$(bashio::config 'camera_url')" \ ingress_entry "$(bashio::addon.ingress_entry)" \ + ingress_port "^$(bashio::addon.ingress_port)" \ interface "$(bashio::addon.ip_address)" \ mode "$(bashio::config 'mode')" \ - port "^$(bashio::addon.ingress_port)" \ + supervisor_ip "$(bashio::supervisor.ip_address)" \ trusted_proxies "$(bashio::config 'trusted_proxies')" \ | tempio \ -template /usr/share/tempio/caddy/Caddyfile.ingress.gtpl \ 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 616d316..a5751b1 100644 --- a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.ingress.gtpl +++ b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.ingress.gtpl @@ -1,21 +1,20 @@ -:8099 { +:{{ .ingress_port }} { bind {{ .addon_ip }} @ingress { - remote_ip 172.30.32.2 + remote_ip {{ .supervisor_ip }} } uri strip_prefix {{ .ingress_entry }} handle { - reverse_proxy @ingress 127.0.0.1:80 { - header_up X-Script-Name {{ .ingress_entry }} - trusted_proxies 172.30.32.2 + reverse_proxy @ingress 127.0.0.1:80/ { + # header_up X-Script-Name {{ .ingress_entry }} + # trusted_proxies {{ .supervisor_ip }} } } } -} # :8099 { # @ingress { -# remote_ip 172.30.32.2 +# remote_ip {{ .supervisor_ip }} # } # uri strip_prefix {{ .ingress_entry }} #