From e5cf716506a786a3e2ddddf71bc5787620e744ab Mon Sep 17 00:00:00 2001
From: Fredrik Baberg <fredrik.baberg@gmail.com>
Date: Sun, 2 Oct 2022 22:56:13 +0200
Subject: [PATCH] Use suffix for Caddy config files

---
 3dprinter-octoprint/config.yaml                           | 2 +-
 3dprinter-octoprint/rootfs/etc/caddy/Caddyfile            | 2 +-
 3dprinter-octoprint/rootfs/etc/caddy/configs/.gitkeep     | 0
 3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh       | 4 ++--
 .../rootfs/usr/share/tempio/Caddyfile.ingress.gtpl        | 8 ++------
 5 files changed, 6 insertions(+), 10 deletions(-)
 create mode 100644 3dprinter-octoprint/rootfs/etc/caddy/configs/.gitkeep

diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml
index 85a781d..c3ee73c 100644
--- a/3dprinter-octoprint/config.yaml
+++ b/3dprinter-octoprint/config.yaml
@@ -1,5 +1,5 @@
 name: "3DPrinter-OctoPrint"
-version: "2022.9.018"
+version: "2022.9.019"
 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/caddy/Caddyfile b/3dprinter-octoprint/rootfs/etc/caddy/Caddyfile
index 061e629..005a797 100644
--- a/3dprinter-octoprint/rootfs/etc/caddy/Caddyfile
+++ b/3dprinter-octoprint/rootfs/etc/caddy/Caddyfile
@@ -1 +1 @@
-import sites-enabled/*
\ No newline at end of file
+import configs/*.caddy
\ No newline at end of file
diff --git a/3dprinter-octoprint/rootfs/etc/caddy/configs/.gitkeep b/3dprinter-octoprint/rootfs/etc/caddy/configs/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh
index 8c14eb3..8809116 100644
--- a/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh
+++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/proxy.sh
@@ -14,7 +14,7 @@ bashio::var.json \
     camera_host "$(bashio::config 'camera_url')" \
     | tempio \
         -template /usr/share/tempio/Caddyfile.ingress.gtpl \
-        -out /etc/caddy/sites-enabled/ingress
+        -out /etc/caddy/configs/ingress.caddy
 
 # Generate direct access configuration, if enabled.
 if bashio::var.has_value "$(bashio::addon.port 5000)"; then
@@ -23,5 +23,5 @@ if bashio::var.has_value "$(bashio::addon.port 5000)"; then
         port "^$(bashio::addon.port 5000)" \
         | tempio \
             -template /usr/share/tempio/Caddyfile.direct.gtpl \
-            -out /etc/caddy/sites-enabled/direct
+            -out /etc/caddy/configs/direct.caddy
 fi
diff --git a/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl b/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl
index 4e04120..f70cf54 100644
--- a/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl
+++ b/3dprinter-octoprint/rootfs/usr/share/tempio/Caddyfile.ingress.gtpl
@@ -1,14 +1,10 @@
-:{{ .port }} {
+:0899 {
 	@ingress {
-		remote_ip {{ .interface }}
+		remote_ip 172.30.32.2
 	}
 	handle {
 		reverse_proxy @ingress 127.0.0.1:80 {
 			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
-			# flush_interval -1
 		}
 	}
 }