From 977593745ef74ed7916765f8bfd0bb8a8836cc85 Mon Sep 17 00:00:00 2001
From: Florian Zirker <florian.zirker@kapsweyer.de>
Date: Mon, 14 Jul 2025 12:39:19 +0200
Subject: [PATCH] Fix for double redirect

---
 proxy/caddy/Caddyfile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/proxy/caddy/Caddyfile b/proxy/caddy/Caddyfile
index 8b286cf..9a91c5b 100644
--- a/proxy/caddy/Caddyfile
+++ b/proxy/caddy/Caddyfile
@@ -93,9 +93,9 @@
 	}
 
 	@meet host meet.{$DOMAIN}
-        handle @meet {
-                reverse_proxy jitsi-meet-web:80
-        }
+	handle @meet {
+		reverse_proxy jitsi-meet-web:80
+	}
 
 	# Fallback unhandled (sub)domains
 	handle {
@@ -112,6 +112,12 @@
 	}
 }
 
+# redirect URL without subdomain to www
 {$DOMAIN} {
 	redir https://www.{$DOMAIN}{uri} permanent
 }
+
+# shortcut to prevent double redirect (http --> https AND without subdomain to www)
+http://{$DOMAIN} {
+	redir https://www.{$DOMAIN}{uri} permanent
+}