Browse Source

update mercure docker config

Olivier Massot 3 năm trước cách đây
mục cha
commit
b8dbfff082
2 tập tin đã thay đổi với 10 bổ sung9 xóa
  1. 2 2
      .env.skeleton
  2. 8 7
      docker-compose.yaml

+ 2 - 2
.env.skeleton

@@ -72,5 +72,5 @@ JSDOC_VIRTUAL_HOST=local.app-doc.opentalent.fr
 
 # Mercure
 MERCURE_VIRTUAL_HOST=local.mercure.opentalent.fr
-MERCURE_PUBLISHER_JWT_KEY=???
-MERCURE_SUBSCRIBER_JWT_KEY=???
+MERCURE_PUBLISHER_JWT_KEY=Ct0JFujZq34FO8q40s2DFvdi1R15wrc2x6qS4hSNspqoM2zr0Ckolr6HfnlGkGU2BxmseCE9j8hl74Z0Eac7lykNs46jpQUYdrAauo0yYoSkL9cqxJct3WCxMhyLWFhx
+MERCURE_SUBSCRIBER_JWT_KEY=Ct0JFujZq34FO8q40s2DFvdi1R15wrc2x6qS4hSNspqoM2zr0Ckolr6HfnlGkGU2BxmseCE9j8hl74Z0Eac7lykNs46jpQUYdrAauo0yYoSkL9cqxJct3WCxMhyLWFhx

+ 8 - 7
docker-compose.yaml

@@ -91,9 +91,9 @@ services:
       - ./docker/nginx/site_ap2i.conf:/etc/nginx/conf.d/default.conf:cached
     environment:
       - VIRTUAL_HOST=${AP2I_VIRTUAL_HOST}
-      - MERCURE_URL=https://${MERCURE_VIRTUAL_HOST}
-      - MERCURE_PUBLIC_URL=https://${AP2I_VIRTUAL_HOST}/.well-known/mercure
-      - MERCURE_JWT_SECRET=${MERCURE_SUBSCRIBER_JWT_KEY}
+      - MERCURE_URL=${MERCURE_URL}
+      - MERCURE_PUBLIC_URL=${MERCURE_PUBLIC_URL}
+      - MERCURE_JWT_SECRET=${MERCURE_JWT_KEY}
     depends_on:
       - ap2i
 
@@ -138,11 +138,12 @@ services:
     environment:
       VIRTUAL_HOST: ${MERCURE_VIRTUAL_HOST}
       SERVER_NAME: ${MERCURE_VIRTUAL_HOST}
-      MERCURE_PUBLISHER_JWT_KEY: ${MERCURE_PUBLISHER_JWT_KEY}
-      MERCURE_SUBSCRIBER_JWT_KEY: ${MERCURE_SUBSCRIBER_JWT_KEY}
-      # Set the URL of your Symfony project (without trailing slash!) as value of the cors_origins directive
+      JWT_KEY: ${MERCURE_JWT_KEY}
+      CORS_ALLOWED_ORIGINS: https://local.ap2i.opentalent.fr http://ap2i
+      PUBLISH_ALLOWED_ORIGINS: https://local.ap2i.opentalent.fr http://ap2i
+      # DEBUG: 1
       MERCURE_EXTRA_DIRECTIVES: |
-        cors_origins https://local.mercure.opentalent.fr
+        cors_origins https://local.ap2i.opentalent.fr http://ap2i
     volumes:
       - mercure_data:/data
       - mercure_config:/config