-
-
Notifications
You must be signed in to change notification settings - Fork 483
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[MercureBundle] Change Caddy config filename #1328
Merged
symfony-recipes-bot
merged 1 commit into
symfony:main
from
ker0x:fix/mercure-bundle-recipe
Jul 13, 2024
Merged
[MercureBundle] Change Caddy config filename #1328
symfony-recipes-bot
merged 1 commit into
symfony:main
from
ker0x:fix/mercure-bundle-recipe
Jul 13, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Thanks for the PR 😍 How to test these changes in your application
Diff between recipe versionsIn order to help with the review stage, I'm in charge of computing the diff between the various versions of patched recipes. symfony/mercure-bundle0.1 vs 0.2diff --git a/symfony/mercure-bundle/0.1/config/packages/mercure.yaml b/symfony/mercure-bundle/0.2/config/packages/mercure.yaml
index d1947d1..17aaa0c 100644
--- a/symfony/mercure-bundle/0.1/config/packages/mercure.yaml
+++ b/symfony/mercure-bundle/0.2/config/packages/mercure.yaml
@@ -1,4 +1,5 @@
mercure:
+ enable_profiler: '%kernel.debug%'
hubs:
default:
url: '%env(MERCURE_PUBLISH_URL)%' 0.2 vs 0.3diff --git a/symfony/mercure-bundle/0.2/config/packages/mercure.yaml b/symfony/mercure-bundle/0.3/config/packages/mercure.yaml
index 17aaa0c..f2a7395 100644
--- a/symfony/mercure-bundle/0.2/config/packages/mercure.yaml
+++ b/symfony/mercure-bundle/0.3/config/packages/mercure.yaml
@@ -1,6 +1,8 @@
mercure:
- enable_profiler: '%kernel.debug%'
hubs:
default:
- url: '%env(MERCURE_PUBLISH_URL)%'
- jwt: '%env(MERCURE_JWT_TOKEN)%'
+ url: '%env(MERCURE_URL)%'
+ public_url: '%env(MERCURE_PUBLIC_URL)%'
+ jwt:
+ secret: '%env(MERCURE_JWT_SECRET)%'
+ publish: '*'
diff --git a/symfony/mercure-bundle/0.2/manifest.json b/symfony/mercure-bundle/0.3/manifest.json
index ba8f74d..3e21b31 100644
--- a/symfony/mercure-bundle/0.2/manifest.json
+++ b/symfony/mercure-bundle/0.3/manifest.json
@@ -7,9 +7,47 @@
},
"env": {
"#1": "See https://symfony.com/doc/current/mercure.html#configuration",
- "MERCURE_PUBLISH_URL": "http://mercure/.well-known/mercure",
- "#2": "The default token is signed with the secret key: !ChangeMe!",
- "MERCURE_JWT_TOKEN": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtZXJjdXJlIjp7InB1Ymxpc2giOltdfX0.Oo0yg7y4yMa1vr_bziltxuTCqb8JVHKxp-f_FwwOim0"
+ "#2": "The URL of the Mercure hub, used by the app to publish updates (can be a local URL)",
+ "MERCURE_URL": "https://example.com/.well-known/mercure",
+ "#3": "The public URL of the Mercure hub, used by the browser to connect",
+ "MERCURE_PUBLIC_URL": "https://example.com/.well-known/mercure",
+ "#4": "The secret used to sign the JWTs",
+ "MERCURE_JWT_SECRET": "!ChangeThisMercureHubJWTSecretKey!"
+ },
+ "docker-compose": {
+ "docker-compose.yml": {
+ "services": [
+ "mercure:",
+ " image: dunglas/mercure",
+ " restart: unless-stopped",
+ " environment:",
+ " # Uncomment the following line to disable HTTPS,",
+ " #SERVER_NAME: ':80'",
+ " MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'",
+ " MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'",
+ " # Set the URL of your Symfony project (without trailing slash!) as value of the cors_origins directive",
+ " MERCURE_EXTRA_DIRECTIVES: |",
+ " cors_origins http://127.0.0.1:8000",
+ " # Comment the following line to disable the development mode",
+ " command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile",
+ " healthcheck:",
+ " test: [\"CMD\", \"curl\", \"-f\", \"https://localhost/healthz\"]",
+ " timeout: 5s",
+ " retries: 5",
+ " start_period: 60s",
+ " volumes:",
+ " - mercure_data:/data",
+ " - mercure_config:/config"
+ ],
+ "volumes": ["mercure_data:", "mercure_config:"]
+ },
+ "docker-compose.override.yml": {
+ "services": [
+ "mercure:",
+ " ports:",
+ " - \"80\""
+ ]
+ }
},
"aliases": ["mercure"]
} |
dunglas
approved these changes
Jul 13, 2024
fabpot
approved these changes
Jul 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Caddy config file name has changed in a previous version, see dunglas/mercure#919 and https://mercure.rocks/docs/hub/install#docker-compose
cc @dunglas