From f6484bdc2da0a86bd2dda016b46cc4dc9a140e73 Mon Sep 17 00:00:00 2001 From: Fredrik Baberg Date: Tue, 4 Oct 2022 23:28:15 +0200 Subject: [PATCH] Modify to suggestion of Caddy file --- 3dprinter-octoprint/DOCS.md | 3 +++ 3dprinter-octoprint/config.yaml | 5 +++-- 3dprinter-octoprint/rootfs/etc/caddy/Caddyfile | 2 +- 3dprinter-octoprint/rootfs/etc/caddy/env | 2 +- .../rootfs/root/config/octoprint/config.yaml | 1 + .../rootfs/usr/share/tempio/Caddyfile.ingress.gtpl | 13 +++++++------ 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/3dprinter-octoprint/DOCS.md b/3dprinter-octoprint/DOCS.md index e69de29..ef72f39 100644 --- a/3dprinter-octoprint/DOCS.md +++ b/3dprinter-octoprint/DOCS.md @@ -0,0 +1,3 @@ +# Dev +> image: ghcr.io/fredrikbaberg/addon-3dprinter-octoprint-{arch} + diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index db6774f..10663e1 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2022.9.027" +version: "2022.9.029" 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,8 +26,9 @@ ports_description: options: camera_url: "http://b7aa59c4-camera-mjpg-streamer/" recovery: false + ssl_fix: false schema: camera_url: "url?" recovery: "bool" -image: ghcr.io/fredrikbaberg/addon-3dprinter-octoprint-{arch} + ssl_fix: "bool?" tmpfs: true diff --git a/3dprinter-octoprint/rootfs/etc/caddy/Caddyfile b/3dprinter-octoprint/rootfs/etc/caddy/Caddyfile index 005a797..374d551 100644 --- a/3dprinter-octoprint/rootfs/etc/caddy/Caddyfile +++ b/3dprinter-octoprint/rootfs/etc/caddy/Caddyfile @@ -1 +1 @@ -import configs/*.caddy \ No newline at end of file +import configs/*.caddy diff --git a/3dprinter-octoprint/rootfs/etc/caddy/env b/3dprinter-octoprint/rootfs/etc/caddy/env index 33ec339..49daa0e 100644 --- a/3dprinter-octoprint/rootfs/etc/caddy/env +++ b/3dprinter-octoprint/rootfs/etc/caddy/env @@ -1,2 +1,2 @@ XDG_CONFIG_HOME="/data/config" -XDG_DATA_HOME="/data/config" \ No newline at end of file +XDG_DATA_HOME="/data/config" diff --git a/3dprinter-octoprint/rootfs/root/config/octoprint/config.yaml b/3dprinter-octoprint/rootfs/root/config/octoprint/config.yaml index a5b1d15..de0d5ff 100644 --- a/3dprinter-octoprint/rootfs/root/config/octoprint/config.yaml +++ b/3dprinter-octoprint/rootfs/root/config/octoprint/config.yaml @@ -11,6 +11,7 @@ folder: generated: /tmp/octoprint/generated timelapse_tmp: /tmp/octoprint/timelapse/tmp server: + allowFraming: true commands: serverRestartCommand: /scripts/octoprint_restart.sh systemRestartCommand: /scripts/system_restart.sh diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl b/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl index 0ea0587..ab095bb 100644 --- a/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl +++ b/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl @@ -1,14 +1,15 @@ -# { -# debug -# } :8099 { @ingress { remote_ip 172.30.32.2 } - handle { + handle_path {http.request.header.X-Ingress-Path}/* { reverse_proxy @ingress 127.0.0.1:5000 { - # header_up X-Script-Name {{ .ingress_entry }} - header_up X-Script-Name {http.request.header.X-Ingress-Path} + header_up X-Script-Name {http.request.header.X-Ingress-Path}/ + header_up -Origin + header_up Origin 172.30.32.2 + header_up X-Forwarded-For 172.30.32.2 + header_up X-Scheme {scheme} + flush_interval -1 } } }