From b316127970fa8c564659ed689a38cf20ea6c797b Mon Sep 17 00:00:00 2001 From: Kieran Cutting Date: Tue, 12 Jul 2022 10:05:41 +0100 Subject: [PATCH 1/5] Add mail settings to env file --- .env.sample | 10 +++++++++- .gitignore | 1 + compose.yml | 7 +++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index 65f4611..6237de2 100644 --- a/.env.sample +++ b/.env.sample @@ -5,4 +5,12 @@ DOMAIN=ghost.example.com ## Domain aliases #EXTRA_DOMAINS=', `www.ghost.example.com`' LETS_ENCRYPT_ENV=production -PT_ENV=production + +## Mail settings +#MAIL_TRANSPORT=smtp +#MAIL_FROM=admin@example.com +#MAIL_OPTIONS_HOST=mail.example.com +#MAIL_OPTIONS_PORT=587 +#MAIL_OPTIONS_SECURE=false +#MAIL_OPTIONS_AUTH_USER=smtpuser@example.com +#MAIL_OPTIONS_AUTH_PASS=XXXX \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7a6353d..ab40146 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .envrc +.DS_Store \ No newline at end of file diff --git a/compose.yml b/compose.yml index e35d641..c160754 100644 --- a/compose.yml +++ b/compose.yml @@ -11,6 +11,13 @@ services: database__connection__password: ghost database__connection__database: ghost url: https://$DOMAIN + mail__transport: ${MAIL_TRANSPORT} + mail__from: ${MAIL_FROM} + mail__options__host: ${MAIL_OPTIONS_HOST} + mail__options__port: ${MAIL_OPTIONS_PORT} + mail__options__secure: ${MAIL_OPTIONS_SECURE} + #mail__options__auth__user: ${MAIL_OPTIONS_AUTH_USER} + #mail__options__auth__pass: ${MAIL_OPTIONS_AUTH_PASS} # contrary to the default mentioned in the linked documentation, this image defaults to NODE_ENV=production (so development mode needs to be explicitly specified if desired) #NODE_ENV: development networks: -- 2.47.2 From e5e5fe40f20686c8b94fb0239e2e42c179659aed Mon Sep 17 00:00:00 2001 From: Kieran Cutting Date: Tue, 12 Jul 2022 10:12:50 +0100 Subject: [PATCH 2/5] Update Ghost to 5.2.4 --- compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index c160754..9d4657d 100644 --- a/compose.yml +++ b/compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: app: - image: ghost:4-alpine + image: ghost:5-alpine environment: # see https://ghost.org/docs/config/#configuration-options database__client: mysql @@ -40,6 +40,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" - "backupbot.backup=true" - "backupbot.backup.path=/var/lib/ghost/content" + - "coop-cloud.${STACK_NAME}.version=0.1.0+5.2.4" # healthcheck: # test: ["CMD", "curl", "-f", "http://localhost"] # interval: 30s -- 2.47.2 From acd5017bc47e6f8fd71047fee8f9c7ff0b64405f Mon Sep 17 00:00:00 2001 From: Kieran Cutting Date: Tue, 12 Jul 2022 10:14:54 +0100 Subject: [PATCH 3/5] Add git tag --- compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/compose.yml b/compose.yml index 9d4657d..5339968 100644 --- a/compose.yml +++ b/compose.yml @@ -1,5 +1,4 @@ version: "3.8" - services: app: image: ghost:5-alpine -- 2.47.2 From aaec04db86314a05c36c4643bda2dca17c380c1c Mon Sep 17 00:00:00 2001 From: Kieran Cutting Date: Tue, 12 Jul 2022 14:12:59 +0100 Subject: [PATCH 4/5] Add release notes --- release/0.1.0+5.2.4.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 release/0.1.0+5.2.4.txt diff --git a/release/0.1.0+5.2.4.txt b/release/0.1.0+5.2.4.txt new file mode 100644 index 0000000..94b609b --- /dev/null +++ b/release/0.1.0+5.2.4.txt @@ -0,0 +1,7 @@ +This seems stable so far. This release adds mail configs to the env file and updates to the most recent version of Ghost. + +I've only tested the mail settings with SMTP so far, so your mileage may vary. Adding the mail settings means you can add other contributors to your Ghost instance, which you couldn't before. + +If you have any issues, Ghost is using nodemailer for mail under the hood so check their docs for any config options you may need. Happy to help if you do notice anything odd. + +@xynosis (fractals co-op) \ No newline at end of file -- 2.47.2 From e317f2319802d5423f33f53a46eda2c8cb1cf63f Mon Sep 17 00:00:00 2001 From: Kieran Cutting Date: Tue, 12 Jul 2022 14:15:01 +0100 Subject: [PATCH 5/5] Make readme more specific --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c741813..cebe031 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Headless Node.js CMS for professional publishing * **Image**: * **Healthcheck**: * **Backups**: -* **Email**: +* **Email**: Y * **Tests**: * **SSO**: @@ -22,10 +22,9 @@ Headless Node.js CMS for professional publishing 3. `abra app new ${REPO_NAME} --secrets` (optionally with `--pass` if you'd like to save secrets in `pass`) 4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to - your Docker swarm box + your Docker swarm box, and configure mail if you intend to invite anyone else to the site 5. `abra app YOURAPPDOMAIN deploy` 6. Open the configured domain in your browser to finish set-up [`abra`]: https://git.coopcloud.tech/coop-cloud/abra [`coop-cloud/traefik`]: https://git.coopcloud.tech/coop-cloud/traefik -/coop-cloud/traefik -- 2.47.2