feat: minor Caddyfile improvements

dunglas · Oct 25, 2023 · f133704 · f133704
1 parent 4f1c54a
commit f133704
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 22 deletions.
diff --git a/Caddyfile b/Caddyfile
@@ -1,6 +1,6 @@
 # Learn how to configure the Mercure.rocks Hub on https://mercure.rocks/docs/hub/config
 {
-	order mercure before request_header
+	order mercure after encode
 
 	{$GLOBAL_OPTIONS}
 }

diff --git a/Caddyfile.dev b/Caddyfile.dev
@@ -1,6 +1,6 @@
 # Learn how to configure the Mercure.rocks Hub on https://mercure.rocks/docs/hub/config
 {
-	order mercure before request_header
+	order mercure after encode
 
 	{$GLOBAL_OPTIONS}
 }

diff --git a/docs/hub/config.md b/docs/hub/config.md
@@ -11,31 +11,23 @@ A minimal `Caddyfile` for the Mercure hub looks like this:
 
 ```Caddyfile
 # The address of your server
-localhost
-
-route {
-    mercure {
-        # Publisher JWT key
-        publisher_jwt !ChangeThisMercureHubJWTSecretKey!
-        # Subscriber JWT key
-        subscriber_jwt !ChangeThisMercureHubJWTSecretKey!
-    }
-
-    respond "Not Found" 404
+localhost {
+	mercure {
+		# Publisher JWT key
+		publisher_jwt !ChangeThisMercureHubJWTSecretKey!
+		# Subscriber JWT key
+		subscriber_jwt !ChangeThisMercureHubJWTSecretKey!
+	}
+
+	respond "Not Found" 404
 }
 ```
 
 Caddy will automatically generate a Let's Encrypt TLS certificate for you! So you can use HTTPS.
-To disable HTTPS entirely, set the [`auto_https`](https://caddyserver.com/docs/caddyfile/options#auto-https) global option to off:
+To disable HTTPS, prefix the name of the server by `http://`:
 
 ```Caddyfile
-{
-    auto_https off
-}
-
-my-domain.test:3000
-
-route {
+http://my-domain.test:3000 {
     # ...
 }
 ```

diff --git a/docs/hub/debug.md b/docs/hub/debug.md
@@ -8,7 +8,7 @@ To enable the profiler, add the `debug` global directive to your `Caddyfile`:
 
 ```Caddyfile
 {
-    debug
+	debug
 }
 
 # ...