dunglas · dunglas · Jul 21, 2022 · Jul 5, 2022 · Jul 6, 2022 · Jul 10, 2022
diff --git a/Caddyfile b/Caddyfile
@@ -16,6 +16,8 @@ log {
 	}
 }
 
+{$EXTRA_DIRECTIVES}
+
 route {
 	encode zstd gzip
 

diff --git a/Caddyfile.dev b/Caddyfile.dev
@@ -16,6 +16,8 @@ log {
 	}
 }
 
+{$EXTRA_DIRECTIVES}
+
 route {
 	redir / /.well-known/mercure/ui/
 	encode zstd gzip

diff --git a/charts/mercure/README.md b/charts/mercure/README.md
@@ -21,6 +21,7 @@ To install the chart with the release name `my-release`, run the following comma
 | autoscaling | object | Disabled by default. | Autoscaling must not be enabled unless you are using [the High Availability version](https://mercure.rocks/docs/hub/cluster) (see [values.yaml](values.yaml) for details). |
 | dev | bool | `false` | Enable the development mode, including the debug UI and the demo. |
 | extraDirectives | string | `""` | Inject extra Mercure directives in the Caddyfile. |
+| caddyExtraDirectives | string | `""` | Inject extra Caddy directives in the Caddyfile. |
 | fullnameOverride | string | `""` | A name to substitute for the full names of resources. |
 | globalOptions | string | `""` | Inject global options in the Caddyfile. |
 | image.pullPolicy | string | `"IfNotPresent"` | [Image pull policy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) for updating already existing images on a node. |

diff --git a/charts/mercure/templates/deployment.yaml b/charts/mercure/templates/deployment.yaml
@@ -47,6 +47,11 @@ spec:
                 configMapKeyRef:
                   name: {{ include "mercure.fullname" . }}
                   key: global-options
+            - name: EXTRA_DIRECTIVES
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "mercure.fullname" . }}
+                  key: caddy-extra-directives
             - name: MERCURE_TRANSPORT_URL
               valueFrom:
                 secretKeyRef:

diff --git a/charts/mercure/templates/secrets.yaml b/charts/mercure/templates/secrets.yaml
@@ -11,3 +11,4 @@ data:
   subscriber-jwt-key: {{ .Values.subscriberJwtKey | default (randAlphaNum 40) | b64enc | quote }}
   extra-directives: {{ .Values.extraDirectives | b64enc | quote }}
   license: {{ .Values.license | b64enc | quote }}
+  caddy-extra-directives: {{ .Values.caddyExtraDirectives | b64enc | quote }}
diff --git a/charts/mercure/values.yaml b/charts/mercure/values.yaml
@@ -10,6 +10,8 @@ dev: false
 transportUrl: bolt:///data/mercure.db
 # -- Inject extra Mercure directives in the Caddyfile.
 extraDirectives: ""
+# -- Inject extra Caddy directives in the Caddyfile.
+caddyExtraDirectives: ""
 
 # -- The JWT key to use for publishers, a random key will be generated if empty.
 publisherJwtKey: ""

diff --git a/docs/hub/config.md b/docs/hub/config.md
@@ -71,7 +71,8 @@ The provided `Caddyfile` and the Docker image provide convenient environment var
 
 | 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 |
+| `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                                                                                                    |                     |
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,8 @@ log { @@
     	}
     }
+    {$EXTRA_DIRECTIVES}
     route {
     	encode zstd gzip
@@ Expand Down @@