From da180c44f4bb42ff7cfce9c435d9aecae86213a3 Mon Sep 17 00:00:00 2001 From: Fredrik Baberg Date: Wed, 5 Oct 2022 10:43:31 +0200 Subject: [PATCH] Cleanup Caddy; update icon --- 3dprinter-octoprint/CHANGELOG.md | 2 ++ 3dprinter-octoprint/config.yaml | 6 +++--- 3dprinter-octoprint/icon.png | Bin 49206 -> 49206 bytes .../usr/share/tempio/Caddyfile.ingress.gtpl | 8 ++------ 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/3dprinter-octoprint/CHANGELOG.md b/3dprinter-octoprint/CHANGELOG.md index 95fb1e4..b8841e8 100644 --- a/3dprinter-octoprint/CHANGELOG.md +++ b/3dprinter-octoprint/CHANGELOG.md @@ -1,2 +1,4 @@ +- Update icon to colored nozzle. +- Cleanup Caddy config. - Fixes to Caddy XDG paths - Change reverse proxy from nginx to Caddy \ No newline at end of file diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index c4abace..0237e28 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2022.9.030" +version: "2022.9.031" 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,9 +26,9 @@ ports_description: options: camera_url: "http://b7aa59c4-camera-mjpg-streamer/" recovery: false - ssl_fix: false + sslFix: false schema: camera_url: "url?" recovery: "bool" - ssl_fix: "bool?" + sslFix: "bool?" tmpfs: true diff --git a/3dprinter-octoprint/icon.png b/3dprinter-octoprint/icon.png index 9222efd99e2dde507055e24f60d2c44c679c5a3b..537eaa5d5ab559d383c3a0afa6fd9d7c47217681 100644 GIT binary patch delta 123 zcmdniz`U)2dBd4-HWit-Ks3>D{^VV;{F57$jtN0TkjaUTGl`NtEP<>GnLW{Q8pwoA Hv1Z8tLtZkE delta 74 zcmdniz`U)2dBd6Ti3Uq2?~3K0+@N#}NDEC`kv1{F7^lc#po|1qjR8o_rdYFN00J^0 Ac>n+a diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl b/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl index 0410c74..b593543 100644 --- a/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl +++ b/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl @@ -2,15 +2,11 @@ @ingress { remote_ip 172.30.32.2 } + uri strip_prefix {{ .ingress_entry }} handle { - uri strip_prefix {{ .ingress_entry }} reverse_proxy @ingress 127.0.0.1:5000 { - header_up X-Script-Name {{ .ingress_entry }} - header_up -Origin - header_up Origin 172.30.32.2 - header_up X-Forwarded-For 172.30.32.2 + header_up X-Script-Name {{ .ingress_entry }}/ header_up X-Scheme {scheme} - flush_interval -1 } } }