Glebaster/forum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: compat with MercureBundle 0.3 (#128)

Browse Source 
* feat: compat with MercureBundle 0.3

* fix: review
This commit is contained in:
Kévin Dunglas 2021-06-10 23:08:42 +02:00 committed by GitHub
parent 24b9c904ea
commit 1942af61f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker-compose.prod.yml
View File

@ -6,8 +6,9 @@ services:
environment: environment:
APP_ENV: prod APP_ENV: prod
APP_SECRET: ${APP_SECRET} APP_SECRET: ${APP_SECRET}
MERCURE_JWT_SECRET: ${CADDY_MERCURE_JWT_SECRET}
caddy: caddy:
environment: environment:
MERCURE_PUBLISHER_JWT_KEY: ${MERCURE_PUBLISHER_JWT_KEY} MERCURE_PUBLISHER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET}
MERCURE_SUBSCRIBER_JWT_KEY: ${MERCURE_SUBSCRIBER_JWT_KEY} MERCURE_SUBSCRIBER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET}

8
docker-compose.yml
View File

@ -20,7 +20,9 @@ services:
# Run "composer require symfony/orm-pack" to install and configure Doctrine ORM # Run "composer require symfony/orm-pack" to install and configure Doctrine ORM
DATABASE_URL: postgresql://${POSTGRES_USER:-symfony}:${POSTGRES_PASSWORD:-ChangeMe}@database:5432/${POSTGRES_DB:-app}?serverVersion=${POSTGRES_VERSION:-13} DATABASE_URL: postgresql://${POSTGRES_USER:-symfony}:${POSTGRES_PASSWORD:-ChangeMe}@database:5432/${POSTGRES_DB:-app}?serverVersion=${POSTGRES_VERSION:-13}
# Run "composer require symfony/mercure-bundle" to install and configure the Mercure integration # Run "composer require symfony/mercure-bundle" to install and configure the Mercure integration
MERCURE_PUBLISH_URL: ${MERCURE_URL:-http://caddy/.well-known/mercure} MERCURE_URL: ${CADDY_MERCURE_URL:-http://caddy/.well-known/mercure}
MERCURE_PUBLIC_URL: https://${SERVER_NAME:-localhost}/.well-known/mercure
MERCURE_JWT_SECRET: ${CADDY_MERCURE_JWT_SECRET:-!ChangeMe!}
SYMFONY_VERSION: SYMFONY_VERSION:
caddy: caddy:
@ -31,8 +33,8 @@ services:
- php - php
environment: environment:
SERVER_NAME: ${SERVER_NAME:-localhost, caddy:80} SERVER_NAME: ${SERVER_NAME:-localhost, caddy:80}
MERCURE_PUBLISHER_JWT_KEY: ${MERCURE_PUBLISHER_JWT_KEY:-!ChangeMe!} MERCURE_PUBLISHER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET:-!ChangeMe!}
MERCURE_SUBSCRIBER_JWT_KEY: ${MERCURE_SUBSCRIBER_JWT_KEY:-!ChangeMe!} MERCURE_SUBSCRIBER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET:-!ChangeMe!}
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- php_socket:/var/run/php - php_socket:/var/run/php

10
docs/production.md
View File

@ -65,12 +65,11 @@ Go into the directory containing your project (`<project-name>`), and start the
```console ```console
SERVER_NAME=your-domain-name.example.com \ SERVER_NAME=your-domain-name.example.com \
APP_SECRET=ChangeMe \ APP_SECRET=ChangeMe \
MERCURE_PUBLISHER_JWT_KEY=ChangeMe \ CADDY_MERCURE_JWT_SECRET=ChangeMe \
MERCURE_SUBSCRIBER_JWT_KEY=ChangeMe \
docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
``` ```
Be sure to replace `your-domain-name.example.com` by your actual domain name and to set the values of `APP_SECRET`, `MERCURE_PUBLISHER_JWT_KEY` and `MERCURE_SUBSCRIBER_JWT_KEY` to cryptographically secure random values. Be sure to replace `your-domain-name.example.com` by your actual domain name and to set the values of `APP_SECRET`, `CADDY_MERCURE_JWT_SECRET` to cryptographically secure random values.
Your server is up and running, and a Let's Encrypt HTTPS certificate has been automatically generated for you. Your server is up and running, and a Let's Encrypt HTTPS certificate has been automatically generated for you.
Go to `https://your-domain-name.example.com` and enjoy! Go to `https://your-domain-name.example.com` and enjoy!
@ -82,9 +81,8 @@ Alternatively, if you don't want to expose an HTTPS server but only an HTTP one,
```console ```console
SERVER_NAME=:80 \ SERVER_NAME=:80 \
APP_SECRET=ChangeMe \ APP_SECRET=ChangeMe \
MERCURE_PUBLISHER_JWT_KEY=ChangeMe \ CADDY_MERCURE_JWT_SECRET=ChangeMe \
MERCURE_SUBSCRIBER_JWT_KEY=ChangeMe \ -docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
``` ```
## Deploying on Multiple Nodes ## Deploying on Multiple Nodes