diff --git a/3dprinter-octoprint/CHANGELOG.md b/3dprinter-octoprint/CHANGELOG.md index 02a981d..d218f6e 100644 --- a/3dprinter-octoprint/CHANGELOG.md +++ b/3dprinter-octoprint/CHANGELOG.md @@ -1,3 +1,6 @@ +- 2022.12.04 + - Correction to name of option (trusted_proxies). + - 2022.12.03 - Add option for trusted proxies. diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index a4a165f..2d5586f 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2022.12.03" +version: "2022.12.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" @@ -26,10 +26,10 @@ ports_description: options: camera_url: "http://b7aa59c4-camera-mjpg-streamer" mode: normal - reverse_proxy: "" + trusted_proxies: "" schema: camera_url: "url?" mode: "list(normal|recovery|reverse_proxy_test|camera)?" - reverse_proxy: "str?" + trusted_proxies: "str?" tmpfs: true image: ghcr.io/fredrikbaberg/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 157766f..a0d2c9a 100644 --- a/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh +++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh @@ -11,7 +11,7 @@ bashio::var.json \ ingress_entry "$(bashio::addon.ingress_entry)" \ camera_host "$(bashio::config 'camera_url')" \ mode "$(bashio::config 'mode')" \ - reverse_proxy "$(bashio::config 'reverse_proxy')" \ + trusted_proxies "$(bashio::config 'trusted_proxies')" \ | tempio \ -template /usr/share/tempio/caddy/Caddyfile.gtpl \ -out /etc/caddy/Caddyfile diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.gtpl b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.gtpl index e225ae4..3ae0a2c 100644 --- a/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.gtpl +++ b/3dprinter-octoprint/rootfs/usr/share/tempio/caddy/Caddyfile.gtpl @@ -42,7 +42,7 @@ :5000 { reverse_proxy http://127.0.0.1:80 { {{ if .trusted_proxies }} - trusted_proxies {{ .trusted_proxies }} + trusted_proxies "{{ .trusted_proxies }}" {{ end }} } }