From b98dbaedeb66e59c1aa717db972e3bf529e25d4a Mon Sep 17 00:00:00 2001
From: Menno van Leeuwen <menno@vleeuwen.me>
Date: Wed, 26 Mar 2025 16:55:25 +0100
Subject: [PATCH] feat: enhance Caddyfile configuration with reverse proxy
 settings and enable IPv6 in docker-compose

---
 .../tasks/servers/services/caddy/Caddyfile.j2     | 15 ++++++++++-----
 .../servers/services/caddy/docker-compose.yml.j2  |  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2 b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
index 932755f..60f7ee3 100644
--- a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
+++ b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
@@ -64,16 +64,21 @@ fladder.mvl.sh {
 }
 
 ip.mvl.sh {
-    @http {
-        protocol http
-    }
-    redir @http https://{host}{uri}
-
     reverse_proxy echoip:8080 {
         header_up X-Real-IP {http.request.remote.host}
         header_up X-Forwarded-For {http.request.remote.host}
         header_up X-Forwarded-Proto {scheme}
         header_up X-Forwarded-Host {host}
     }
+
     tls {{ caddy_email }}
 }
+
+http://ip.mvl.sh {
+    reverse_proxy echoip:8080 {
+        header_up X-Real-IP {http.request.remote.host}
+        header_up X-Forwarded-For {http.request.remote.host}
+        header_up X-Forwarded-Proto {scheme}
+        header_up X-Forwarded-Host {host}
+    }
+}
diff --git a/config/ansible/tasks/servers/services/caddy/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/caddy/docker-compose.yml.j2
index 46d8887..85d31df 100644
--- a/config/ansible/tasks/servers/services/caddy/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/caddy/docker-compose.yml.j2
@@ -20,5 +20,5 @@ services:
 
 networks:
   caddy_network:
-    external: true
-    name: caddy_default
\ No newline at end of file
+    name: caddy_default
+    enable_ipv6: true