fix mariadb volume, disable blackfire, update mercure conf

.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=Ct0JFujZq34FO8q40s2DFvdi1R15wrc2x6qS4hSNspqoM2zr0Ckolr6HfnlGkGU2BxmseCE9j8hl74Z0Eac7lykNs46jpQUYdrAauo0yYoSkL9cqxJct3WCxMhyLWFhx
-MERCURE_SUBSCRIBER_JWT_KEY=Ct0JFujZq34FO8q40s2DFvdi1R15wrc2x6qS4hSNspqoM2zr0Ckolr6HfnlGkGU2BxmseCE9j8hl74Z0Eac7lykNs46jpQUYdrAauo0yYoSkL9cqxJct3WCxMhyLWFhx
+MERCURE_PUBLISHER_JWT_KEY=UfQm7bdbXSO0TDnxGREM6BPtwUgls7ZWJhAl21VsuwW8rSvyHG3yqOkPEpr9sEmo
+MERCURE_SUBSCRIBER_JWT_KEY=UfQm7bdbXSO0TDnxGREM6BPtwUgls7ZWJhAl21VsuwW8rSvyHG3yqOkPEpr9sEmo

README.md

@@ -334,6 +334,10 @@ TODO: à quoi il sert?
 Serveur sur lequel est présent la version Symfony 5.3 du Back.
 Penser à copier le dossier ap2i/jwt vers config
 
+#### Docker: `mercure`
+
+Serveur [Caddy](https://caddyserver.com/) servant de hub [Mercure](https://mercure.rocks/)
+
 #### Docker: `python39`
 
 Héberge différents scripts python, dont [clonedb](https://gitlab.2iopenservice.com/opentalent/clonedb).

docker-compose.yaml

@@ -29,7 +29,7 @@ services:
       - 3306:3306
     volumes:
       - ./apps/opentalent-platform/migration:/usr/src:cached
-      - ./mysqldata:/var/lib/mysql
+      - mysqldata:/var/lib/mysql
       - ./apps/env:/env:cached
       - ./apps/metabase:/usr/metabase:cached
     environment:
@@ -138,10 +138,7 @@ services:
     environment:
       VIRTUAL_HOST: ${MERCURE_VIRTUAL_HOST}
       SERVER_NAME: ${MERCURE_VIRTUAL_HOST}
-      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_JWT_KEY: ${MERCURE_JWT_KEY}
       MERCURE_EXTRA_DIRECTIVES: |
         cors_origins https://local.ap2i.opentalent.fr http://ap2i
     volumes:
@@ -374,21 +371,21 @@ services:
     depends_on:
       - nginx-proxy
 
-  blackfire:
-    hostname: blackfire
-    container_name: blackfire
-    image: blackfire/blackfire
-    environment:
-      - BLACKFIRE_LOG_LEVEL=4
-      - BLACKFIRE_SERVER_ID=${BLACKFIRE_SERVER_ID}
-      - BLACKFIRE_SERVER_TOKEN=${BLACKFIRE_SERVER_TOKEN}
-      - BLACKFIRE_CLIENT_ID=${BLACKFIRE_CLIENT_ID}
-      - BLACKFIRE_CLIENT_TOKEN=${BLACKFIRE_CLIENT_TOKEN}
-      - VIRTUAL_HOST=${BLACK_FIRE_VIRTUAL_HOST}
-      - VIRTUAL_PORT=${BLACK_FIRE_PORT}
-    depends_on:
-      - php70
-      - ap2i
+#  blackfire:
+#    hostname: blackfire
+#    container_name: blackfire
+#    image: blackfire/blackfire
+#    environment:
+#      - BLACKFIRE_LOG_LEVEL=4
+#      - BLACKFIRE_SERVER_ID=${BLACKFIRE_SERVER_ID}
+#      - BLACKFIRE_SERVER_TOKEN=${BLACKFIRE_SERVER_TOKEN}
+#      - BLACKFIRE_CLIENT_ID=${BLACKFIRE_CLIENT_ID}
+#      - BLACKFIRE_CLIENT_TOKEN=${BLACKFIRE_CLIENT_TOKEN}
+#      - VIRTUAL_HOST=${BLACK_FIRE_VIRTUAL_HOST}
+#      - VIRTUAL_PORT=${BLACK_FIRE_PORT}
+#    depends_on:
+#      - php70
+#      - ap2i
 
   phpdoc:
     hostname: phpdoc

docker/mercure/caddy/Caddyfile

@@ -1,6 +1,7 @@
 # Learn how to configure the Mercure.rocks Hub on https://mercure.rocks/docs/hub/config
 {
     auto_https off
+    debug
     {$GLOBAL_OPTIONS}
 }
 
@@ -15,17 +16,19 @@ route {
 
     mercure {
         # Transport to use (default to Bolt)
-        transport_url {$MERCURE_TRANSPORT_URL:bolt://mercure.db}
+        transport_url bolt:///var/run/mercure.db?size=100&cleanup_frequency=0.4
         # Publisher JWT key
-        publisher_jwt {env.MERCURE_PUBLISHER_JWT_KEY} {env.MERCURE_PUBLISHER_JWT_ALG}
+        publisher_jwt {env.MERCURE_JWT_KEY} HS256
         # Subscriber JWT key
-        subscriber_jwt {env.MERCURE_SUBSCRIBER_JWT_KEY} {env.MERCURE_SUBSCRIBER_JWT_ALG}
+        subscriber_jwt {env.MERCURE_JWT_KEY} HS256
         # Permissive configuration for the development environment
         cors_origins *
         publish_origins *
         demo
         anonymous
+        debug {env.DEBUG}
         subscriptions
+
         # Extra directives
         {$MERCURE_EXTRA_DIRECTIVES}
     }