feat: compat with MercureBundle 0.3

dunglas · dunglas · commit 691919202c9a · 2021-04-08T20:55:59.000+02:00
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -31,8 +31,9 @@ services:
       - php
     environment:
       SERVER_NAME: ${SERVER_NAME:-localhost, caddy:80}
-      MERCURE_PUBLISHER_JWT_KEY: ${MERCURE_PUBLISHER_JWT_KEY:-!ChangeMe!}
-      MERCURE_SUBSCRIBER_JWT_KEY: ${MERCURE_SUBSCRIBER_JWT_KEY:-!ChangeMe!}
+      MERCURE_URL: ${MERCURE_URL:-http://caddy/.well-known/mercure}
+      MERCURE_PUBLIC_URL: ${MERCURE_PUBLIC_URL:-https://localhost/.well-known/mercure}
+      MERCURE_JWT_SECRET: ${MERCURE_JWT_SECRET:-!ChangeMe!}
     restart: unless-stopped
     volumes:
       - php_socket:/var/run/php
diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile
@@ -19,9 +19,9 @@ route {
         # Transport to use (default to Bolt)
         transport_url {$MERCURE_TRANSPORT_URL:bolt:///data/mercure.db}
         # Publisher JWT key
-        publisher_jwt {env.MERCURE_PUBLISHER_JWT_KEY} {env.MERCURE_PUBLISHER_JWT_ALG}
+        publisher_jwt {env.MERCURE_JWT_SECRET} {env.MERCURE_JWT_ALG}
         # Subscriber JWT key
-        subscriber_jwt {env.MERCURE_SUBSCRIBER_JWT_KEY} {env.MERCURE_SUBSCRIBER_JWT_ALG}
+        subscriber_jwt {env.MERCURE_JWT_SECRET} {env.MERCURE_JWT_ALG}
         # Allow anonymous subscribers (double-check that it's what you want)
         anonymous
         # Enable the subscription API (double-check that it's what you want)
