fix(helm): env var renamed in Caddyfile (#888)

dunglas · Apr 5, 2024 · af3dec5 · af3dec5
1 parent 8472eae
commit af3dec5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -13,7 +13,7 @@
                 "MERCURE_EXTRA_DIRECTIVES": "anonymous\nwrite_timeout 10s",
                 "GLOBAL_OPTIONS": "debug",
                 "SERVER_NAME": "localhost, host.docker.internal",
-                "EXTRA_DIRECTIVES": "tls internal"
+                "CADDY_SERVER_EXTRA_DIRECTIVES": "tls internal"
             },
             "args": ["run", "--config", "../../Caddyfile.dev"]
         }

diff --git a/charts/mercure/templates/deployment.yaml b/charts/mercure/templates/deployment.yaml
@@ -47,7 +47,7 @@ spec:
                 configMapKeyRef:
                   name: {{ include "mercure.fullname" . }}
                   key: global-options
-            - name: EXTRA_DIRECTIVES
+            - name: CADDY_SERVER_EXTRA_DIRECTIVES
               valueFrom:
                 secretKeyRef:
                   name: {{ include "mercure.fullname" . }}

diff --git a/docs/hub/config.md b/docs/hub/config.md
@@ -62,18 +62,18 @@ See also [the list of built-in Caddyfile directives](https://caddyserver.com/doc
 
 The provided `Caddyfile` and the Docker image provide convenient environment variables:
 
-| Environment variable         | Description                                                                                                                          | Default value       |
-| ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | ------------------- |
-| `GLOBAL_OPTIONS`             | the [global options block](https://caddyserver.com/docs/caddyfile/options#global-options) to inject in the `Caddyfile`, one per line |                     |
-| `EXTRA_DIRECTIVES`           | [`Caddyfile` statements](https://caddyserver.com/docs/caddyfile)                                                                     |                     |
-| `SERVER_NAME`                | the server name or address                                                                                                           | `localhost`         |
-| `MERCURE_TRANSPORT_URL`      | the value passed to the `transport_url` directive                                                                                    | `bolt://mercure.db` |
-| `MERCURE_PUBLISHER_JWT_KEY`  | the JWT key to use for publishers                                                                                                    |                     |
-| `MERCURE_PUBLISHER_JWT_ALG`  | the JWT algorithm to use for publishers                                                                                              | `HS256`             |
-| `MERCURE_SUBSCRIBER_JWT_KEY` | the JWT key to use for subscribers                                                                                                   |                     |
-| `MERCURE_SUBSCRIBER_JWT_ALG` | the JWT algorithm to use for subscribers                                                                                             | `HS256`             |
-| `MERCURE_EXTRA_DIRECTIVES`   | a list of extra Mercure directives inject in the Caddy file, one per line                                                            |                     |
-| `MERCURE_LICENSE`            | the license to use ([only applicable for the HA version](cluster.md))                                                                |                     |
+| Environment variable           | Description                                                                                                                          | Default value       |
+| ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------ | ------------------- |
+| `GLOBAL_OPTIONS`               | the [global options block](https://caddyserver.com/docs/caddyfile/options#global-options) to inject in the `Caddyfile`, one per line |                     |
+| `CADDY_SERVER_EXTRA_DIRECTIVES`| [`Caddyfile` statements](https://caddyserver.com/docs/caddyfile)                                                                     |                     |
+| `SERVER_NAME`                  | the server name or address                                                                                                           | `localhost`         |
+| `MERCURE_TRANSPORT_URL`        | the value passed to the `transport_url` directive                                                                                    | `bolt://mercure.db` |
+| `MERCURE_PUBLISHER_JWT_KEY`    | the JWT key to use for publishers                                                                                                    |                     |
+| `MERCURE_PUBLISHER_JWT_ALG`    | the JWT algorithm to use for publishers                                                                                              | `HS256`             |
+| `MERCURE_SUBSCRIBER_JWT_KEY`   | the JWT key to use for subscribers                                                                                                   |                     |
+| `MERCURE_SUBSCRIBER_JWT_ALG`   | the JWT algorithm to use for subscribers                                                                                             | `HS256`             |
+| `MERCURE_EXTRA_DIRECTIVES`     | a list of extra Mercure directives inject in the Caddy file, one per line                                                            |                     |
+| `MERCURE_LICENSE`              | the license to use ([only applicable for the HA version](cluster.md))                                                                |                     |
 
 ## JWT Verification