udpate mercure hub config

.env.skeleton

@@ -72,5 +72,7 @@ JSDOC_VIRTUAL_HOST=local.app-doc.opentalent.fr
 
 # Mercure
 MERCURE_VIRTUAL_HOST=local.mercure.opentalent.fr
-MERCURE_PUBLISHER_JWT_KEY=UfQm7bdbXSO0TDnxGREM6BPtwUgls7ZWJhAl21VsuwW8rSvyHG3yqOkPEpr9sEmo
-MERCURE_SUBSCRIBER_JWT_KEY=UfQm7bdbXSO0TDnxGREM6BPtwUgls7ZWJhAl21VsuwW8rSvyHG3yqOkPEpr9sEmo
+MERCURE_URL=https://mercure
+MERCURE_PUBLIC_URL=https://local.mercure.opentalent.fr/.well-known/mercure
+MERCURE_PUBLISHER_JWT_KEY=NQEupdREijrfYvCmF2mnvZQFL9zLKDH9RCYter6tUWzjemPqzicffhc2fSf0yEmM
+MERCURE_SUBSCRIBER_JWT_KEY=NQEupdREijrfYvCmF2mnvZQFL9zLKDH9RCYter6tUWzjemPqzicffhc2fSf0yEmM

README.md

@@ -535,13 +535,13 @@ et le redémarrer:
 
 #### Erreur liée à l'index Elasticsearch (events, champs de recherche...)
 
-Pour regénérer l'index elasticsearch:
+Pour régénérer l'index elasticsearch:
 
 Accéder au docker php70:
 
     docker exec -it php70 bash
 
-Lancer, puis interrompre dès qu'il commence à populate les organizations:
+Lancer, puis interrompre dès qu'il commence à populate les organizations :
 
     php app/console fos:elastica:populate --index search
 

docker-compose.yaml

@@ -91,9 +91,6 @@ services:
       - ./docker/nginx/site_ap2i.conf:/etc/nginx/conf.d/default.conf:cached
     environment:
       - VIRTUAL_HOST=${AP2I_VIRTUAL_HOST}
-      - MERCURE_URL=${MERCURE_URL}
-      - MERCURE_PUBLIC_URL=${MERCURE_PUBLIC_URL}
-      - MERCURE_JWT_SECRET=${MERCURE_JWT_KEY}
     depends_on:
       - ap2i
 
@@ -138,9 +135,8 @@ services:
     environment:
       VIRTUAL_HOST: ${MERCURE_VIRTUAL_HOST}
       SERVER_NAME: ${MERCURE_VIRTUAL_HOST}
-      MERCURE_JWT_KEY: ${MERCURE_JWT_KEY}
-      MERCURE_EXTRA_DIRECTIVES: |
-        cors_origins https://local.ap2i.opentalent.fr http://ap2i
+      MERCURE_PUBLISHER_JWT_KEY: ${MERCURE_PUBLISHER_JWT_KEY}
+      MERCURE_SUBSCRIBER_JWT_KEY: ${MERCURE_SUBSCRIBER_JWT_KEY}
     volumes:
       - mercure_data:/data
       - mercure_config:/config

docker/mercure/caddy/Caddyfile

@@ -1,7 +1,6 @@
 # Learn how to configure the Mercure.rocks Hub on https://mercure.rocks/docs/hub/config
 {
     auto_https off
-    debug
     {$GLOBAL_OPTIONS}
 }
 
@@ -15,22 +14,13 @@ route {
     encode zstd gzip
 
     mercure {
-        # Transport to use (default to Bolt)
         transport_url bolt:///var/run/mercure.db?size=100&cleanup_frequency=0.4
-        # Publisher JWT key
-        publisher_jwt {env.MERCURE_JWT_KEY} HS256
-        # Subscriber JWT key
-        subscriber_jwt {env.MERCURE_JWT_KEY} HS256
-        # Permissive configuration for the development environment
-        cors_origins *
-        publish_origins *
+        publisher_jwt {env.MERCURE_PUBLISHER_JWT_KEY} HS256
+        subscriber_jwt {env.MERCURE_SUBSCRIBER_JWT_KEY} HS256
+        cors_origins https://local.ap2i.opentalent.fr http://ap2i https://local.app.opentalent.fr http://app
+        publish_origins https://local.ap2i.opentalent.fr http://ap2i https://local.mercure.opentalent.fr
         demo
-        anonymous
-        debug {env.DEBUG}
         subscriptions
-
-        # Extra directives
-        {$MERCURE_EXTRA_DIRECTIVES}
     }
 
     respond /healthz 200