From 782cb765c5937b855ff058df7143d6149f71432b Mon Sep 17 00:00:00 2001 From: Aravinth Manivannan Date: Wed, 10 Jan 2024 20:43:11 +0530 Subject: [PATCH] fix: forgejo mailer config --- .env | 1 + .woodpecker.yml | 25 +++++++++++++------------ docker-compose.yml | 24 ++++++++++++------------ 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.env b/.env index 0c369b0..da18e14 100644 --- a/.env +++ b/.env @@ -1 +1,2 @@ export INSTANCE_URL=http://localhost:3001 +export MAILDEV_URL=http://localhost:1080 diff --git a/.woodpecker.yml b/.woodpecker.yml index b3b91cc..8d6aa1a 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,11 +3,12 @@ steps: image: realaravinth/forgejo-frontend-integration-base # ./Dockerfile environment: - INSTANCE_URL=http://forgejo + - MAILDEV_URL=http://maildev:1080 commands: - npm ci - npx playwright install --with-deps - npx playwright test --project=firefox --grep @setup - - npx playwright test --project=firefox --grep-invert @setup + - npx playwright test --grep-invert @setup services: forgejo: @@ -17,17 +18,17 @@ services: - FORGEJO__federation__ENABLED=true - FORGEJO__server__ROOT_URL=http://forgejo - FORGEJO__server__HTTP_PORT=80 - - FORGEJO__service_ENABLE_NOTIFY_MAIL=true - - FORGEJO__service_REGISTER_EMAIL_CONFIRM=true - - FORGEJO__admin_DEFAULT_EMAIL_NOTIFICATIONS=enabled - - FORGEJO__admin_SEND_NOTIFICATION_EMAIL_ON_NEW_USER=true - - FORGEJO__mailer_ENABLED=true - - FORGEJO__mailer_PROTOCOL=smtp - - FORGEJO__mailer_SMTP_ADDR=maildev - - FORGEJO__mailer_SMTP_PORT=10025 - - FORGEJO__mailer_FROM=forgejo@ci.local - - FORGEJO__mailer_USER=admin - - FORGEJO__mailer_PASSWORD=password + - FORGEJO__service__ENABLE_NOTIFY_MAIL=true + - FORGEJO__service__REGISTER_EMAIL_CONFIRM=true + - FORGEJO__admin__DEFAULT_EMAIL_NOTIFICATIONS=enabled + - FORGEJO__admin__SEND_NOTIFICATION_EMAIL_ON_NEW_USER=true + - FORGEJO__mailer__ENABLED=true + - FORGEJO__mailer__PROTOCOL=smtp + - FORGEJO__mailer__SMTP_ADDR=maildev + - FORGEJO__mailer__SMTP_PORT=10025 + - FORGEJO__mailer__FROM=forgejo@ci.local + - FORGEJO__mailer__USER=admin + - FORGEJO__mailer__PASSWORD=password maildev: image: maildev/maildev:latest diff --git a/docker-compose.yml b/docker-compose.yml index deb26aa..fd8de6d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,19 +7,19 @@ services: environment: FORGEJO__security__INSTALL_LOCK: true FORGEJO__federation__ENABLED: true - FORGEJO__server__ROOT_URL: http://localhost + FORGEJO__server__ROOT_URL: http://localhost:3001 FORGEJO__server__HTTP_PORT: 3001 - FORGEJO__service_ENABLE_NOTIFY_MAIL: true - FORGEJO__service_REGISTER_EMAIL_CONFIRM: true - FORGEJO__admin_DEFAULT_EMAIL_NOTIFICATIONS: enabled - FORGEJO__admin_SEND_NOTIFICATION_EMAIL_ON_NEW_USER: true - FORGEJO__mailer_ENABLED: true - FORGEJO__mailer_PROTOCOL: smtp - FORGEJO__mailer_SMTP_ADDR: maildev - FORGEJO__mailer_SMTP_PORT: 10025 - FORGEJO__mailer_FROM: forgejo@ci.local - FORGEJO__mailer_USER: admin - FORGEJO__mailer_PASSWORD: password + FORGEJO__service__ENABLE_NOTIFY_MAIL: true + FORGEJO__service__REGISTER_EMAIL_CONFIRM: true + FORGEJO__admin__DEFAULT_EMAIL_NOTIFICATIONS: enabled + FORGEJO__admin__SEND_NOTIFICATION_EMAIL_ON_NEW_USER: true + FORGEJO__mailer__ENABLED: true + FORGEJO__mailer__PROTOCOL: "smtp" + FORGEJO__mailer__SMTP_ADDR: "maildev" + FORGEJO__mailer__SMTP_PORT: 10025 + FORGEJO__mailer__FROM: "TEST " + FORGEJO__mailer__USER: admin + FORGEJO__mailer__PASSWD: password maildev: image: maildev/maildev:latest