From bce4a0ba8fa8e5cc4dc33736b3629a9392740643 Mon Sep 17 00:00:00 2001
From: Florian Zirker <florian.zirker@kapsweyer.de>
Date: Wed, 11 Dec 2024 15:35:57 +0100
Subject: [PATCH] improve caddy

---
 .editorconfig             |  9 +++++++
 proxy/Caddyfile           | 49 ++++++++++++++++++++++-----------------
 proxy/docker-compose.yaml |  2 ++
 3 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index b7a329e..8237425 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -22,3 +22,12 @@ end_of_line    = lf
 indent_style   = space
 indent_size    = 4
 tab_width      = 4
+
+[Caddyfile]
+indent_style = tab
+indent_size = 4
+tab_width = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/proxy/Caddyfile b/proxy/Caddyfile
index fcc0f48..7352500 100644
--- a/proxy/Caddyfile
+++ b/proxy/Caddyfile
@@ -1,44 +1,51 @@
 {
-  auto_https off
+	auto_https off
+	log default {
+		output stdout
+		format console
+	}
 }
 
-http://whoami.lan {
-  reverse_proxy whoami:80
+http://whoami.{$DOMAIN} {
+	reverse_proxy whoami:80
 }
 
-http://dashboard.lan {
-  reverse_proxy homer:8080
+http://dashboard.{$DOMAIN} {
+	reverse_proxy homer:8080
 }
 
-http://hassi.lan {
-#  reverse_proxy homeassistant:8123
-  reverse_proxy dockerhost-1.lan:8123
+http://hassi.{$DOMAIN} {
+	# reverse_proxy homeassistant:8123
+	reverse_proxy {host}:8123
 }
 
-http://zigbee2mqtt.lan {
-  reverse_proxy zigbee2mqtt:8080
+http://zigbee2mqtt.{$DOMAIN} {
+	reverse_proxy zigbee2mqtt:8080
 }
 
-http://jellyfin.lan {
-  reverse_proxy jellyfin:8096
+http://jellyfin.{$DOMAIN} {
+	reverse_proxy jellyfin:8096
 }
 
-http://paperless.lan {
-  reverse_proxy paperless-ngx:8000
+http://paperless.{$DOMAIN} {
+	reverse_proxy paperless-ngx:8000
 }
 
-http://download.lan {
-  reverse_proxy pyload:8000
+http://download.{$DOMAIN} {
+	reverse_proxy pyload:8000
 }
 
-http://uptime.lan {
-  reverse_proxy uptime-kuma:3001
+http://uptime.{$DOMAIN} {
+	reverse_proxy uptime-kuma:3001
 }
 
-http://torrent.lan {
-  reverse_proxy transmission:9091
+http://torrent.{$DOMAIN} {
+	reverse_proxy transmission:9091
 }
 
 :80, :443 {
-  respond 404
+	respond "404 Not Found" 404
+	handle_errors {
+		respond "{err.status_code} {err.status_text}" {err.status_code}
+	}
 }
diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml
index b9e91d5..1a53113 100644
--- a/proxy/docker-compose.yaml
+++ b/proxy/docker-compose.yaml
@@ -11,6 +11,8 @@ services:
       - ./Caddyfile:/etc/caddy/Caddyfile:ro
     networks:
       - web
+    environment:
+      - DOMAIN=${DOMAIN}
 
 
   whoami: