feat: add caddy server extra

dunglas · Dec 4, 2023 · f31a305 · f31a305
1 parent c5dae59
commit f31a305
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/docs/tls.md b/docs/tls.md
@@ -26,11 +26,11 @@ For instance, to use self-signed certificates created with [mkcert](https://gith
    `mkdir frankenphp/certs -p`
 3. Generate the certificates for your local host (example: "server-name.localhost"):
    `mkcert -cert-file frankenphp/certs/tls.pem -key-file frankenphp/certs/tls.key "server-name.localhost"`
-4. Add these lines to the `./compose.override.yaml` file about `CADDY_EXTRA_CONFIG` environment and volume for the `php` service :
+4. Add these lines to the `./compose.override.yaml` file about `CADDY_SERVER_EXTRA_DIRECTIVES` environment and volume for the `php` service :
     ```diff
     php:
       environment:
-    +    CADDY_EXTRA_CONFIG: "tls /etc/caddy/certs/tls.pem /etc/caddy/certs/tls.key"
+    +    CADDY_SERVER_EXTRA_DIRECTIVES: "tls /etc/caddy/certs/tls.pem /etc/caddy/certs/tls.key"
         # ...
       volumes:
     +    - ./frankenphp/certs:/etc/caddy/certs:ro

diff --git a/frankenphp/Caddyfile b/frankenphp/Caddyfile
@@ -46,6 +46,8 @@
 
 	vulcain
 
+	{$CADDY_SERVER_EXTRA_DIRECTIVES}
+
 	# Disable Topics tracking if not enabled explicitly: https://github.com/jkarlin/topics
 	header ?Permissions-Policy "browsing-topics=()"
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,6 +46,8 @@ @@
     	vulcain
+    	{$CADDY_SERVER_EXTRA_DIRECTIVES}
     	# Disable Topics tracking if not enabled explicitly: https://github.com/jkarlin/topics
     	header ?Permissions-Policy "browsing-topics=()"
@@ Expand Down @@