feat: simplify Caddyfiles

dunglas · Oct 18, 2023 · 0e54497 · 0e54497
1 parent a548081
commit 0e54497
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 23 deletions.
diff --git a/Caddyfile b/Caddyfile
@@ -1,24 +1,24 @@
 # Learn how to configure the Mercure.rocks Hub on https://mercure.rocks/docs/hub/config
 {
+	order mercure before request_header
+
 	{$GLOBAL_OPTIONS}
 }
 
-{$SERVER_NAME:localhost}
+{$CADDY_EXTRA_CONFIG}
 
-log {
-	format filter {
-		wrap console
-		fields {
-			uri query {
-				replace authorization REDACTED
+{$SERVER_NAME:localhost} {
+	log {
+		format filter {
+			wrap console
+			fields {
+				uri query {
+					replace authorization REDACTED
+				}
 			}
 		}
 	}
-}
 
-{$EXTRA_DIRECTIVES}
-
-route {
 	encode zstd gzip
 
 	mercure {
@@ -32,6 +32,8 @@ route {
 		{$MERCURE_EXTRA_DIRECTIVES}
 	}
 
+	{$CADDY_SERVER_EXTRA_DIRECTIVES}
+
 	header / Content-Type "text/html; charset=utf-8"
 	respond / `<!DOCTYPE html>
 	<html lang=en>

diff --git a/Caddyfile.dev b/Caddyfile.dev
@@ -1,24 +1,24 @@
 # Learn how to configure the Mercure.rocks Hub on https://mercure.rocks/docs/hub/config
 {
+	order mercure before request_header
+
 	{$GLOBAL_OPTIONS}
 }
 
-{$SERVER_NAME:localhost}
+{$CADDY_EXTRA_CONFIG}
 
-log {
-	format filter {
-		wrap console
-		fields {
-			uri query {
-				replace authorization REDACTED
+{$SERVER_NAME:localhost} {
+	log {
+		format filter {
+			wrap console
+			fields {
+				uri query {
+					replace authorization REDACTED
+				}
 			}
 		}
 	}
-}
 
-{$EXTRA_DIRECTIVES}
-
-route {
 	encode zstd gzip
 
 	mercure {
@@ -38,7 +38,8 @@ route {
 		{$MERCURE_EXTRA_DIRECTIVES}
 	}
 
+	{$CADDY_SERVER_EXTRA_DIRECTIVES}
+
 	redir / /.well-known/mercure/ui/
-	respond /healthz 200
 	respond "Not Found" 404
 }