From 742ec4668e89291a847acc72840ac830b68050d2 Mon Sep 17 00:00:00 2001
From: Kumi <git@kumi.email>
Date: Sun, 31 Dec 2023 14:37:59 +0100
Subject: [PATCH] Refactor Caddyfile routing directives

Simplified the routing and handling directives in the Caddyfile by removing explicit regular expressions for HTML files and reorganizing asset handling. All requests are now served with a more generalized approach, improving readability and potential maintainability of the server configuration. This change encapsulates asset file serving and reverse proxying under specific handles, ensuring a cleaner and more structured configuration.
---
 Caddyfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Caddyfile b/Caddyfile
index 6d4ee20..29fdd21 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -11,16 +11,16 @@ private.coffee www.private.coffee {
 	respond /.well-known/matrix/server `{"m.server": "matrix.private.coffee:443"}`
 	respond /.well-known/matrix/client `{"m.homeserver":{"base_url":"https://matrix.private.coffee"}}`
 
-	@html {
-		path_regexp html /(.*).html
-	}
-
-	reverse_proxy @html unix//var/run/uwsgi/privatecoffee.sock
-
 	@assets {
 		path assets /assets/*
 	}
 
-	file_server
-	root @assets /srv/private.coffee
+	handle @assets {
+		file_server
+		root * /srv/private.coffee
+	}
+
+	handle {
+		reverse_proxy * unix//var/run/uwsgi/privatecoffee.sock
+	}
 }