coop-cloud/gitea
5
2
Fork 4
Code Issues 3 Pull Requests Releases Wiki Activity

feat: support other smtp protocols #39

Merged
fauno merged 2 commits from smtp into master 2025-01-07 20:12:17 +00:00
Conversation 4 Commits 2 Files Changed 4 +4 -2
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.env.sample
View File

@ -54,6 +54,7 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
# GITEA_MAILER_ADDR=mail.gandi.net # GITEA_MAILER_ADDR=mail.gandi.net
# GITEA_MAILER_PORT=465 # GITEA_MAILER_PORT=465
# SECRET_SMTP_PASSWORD_VERSION=v1 # SECRET_SMTP_PASSWORD_VERSION=v1
# GITEA_MAILER_PROTOCOL=smtps
# OATH2 Options # OATH2 Options
# GITEA_REGISTER_EMAIL_CONFIRM=replace-me # GITEA_REGISTER_EMAIL_CONFIRM=replace-me

2
abra.sh
View File

@ -1,4 +1,4 @@
export APP_INI_VERSION=v19 export APP_INI_VERSION=v20
export DOCKER_SETUP_SH_VERSION=v1 export DOCKER_SETUP_SH_VERSION=v1
export PG_BACKUP_VERSION=v1 export PG_BACKUP_VERSION=v1

2
app.ini.tmpl
View File

@ -71,7 +71,7 @@ JWT_SECRET = {{ secret "jwt_secret" }}
[mailer] [mailer]
ENABLED = true ENABLED = true
FROM = {{ env "GITEA_MAILER_FROM" }} FROM = {{ env "GITEA_MAILER_FROM" }}
PROTOCOL = smtps PROTOCOL = {{ env "GITEA_MAILER_PROTOCOL" }}
decentral1se marked this conversation as resolved
decentral1se commented 2025-01-07 16:48:48 +00:00
Review
Copy Link

This will break new deploys if they don't update their .env. We can either figure out a way to make backwards compatible (toolshed/organising#359) or add a warning in the release notes? I guess that would be a breaking change tho 🤔

This will break new deploys if they don't update their `.env`. We can either figure out a way to make backwards compatible (https://git.coopcloud.tech/toolshed/organising/issues/359) or add a warning in the release notes? I guess that would be a breaking change tho 🤔
SMTP_ADDR = {{ env "GITEA_MAILER_ADDR" }} SMTP_ADDR = {{ env "GITEA_MAILER_ADDR" }}
SMTP_PORT = {{ env "GITEA_MAILER_PORT" }} SMTP_PORT = {{ env "GITEA_MAILER_PORT" }}
USER = {{ env "GITEA_MAILER_USER" }} USER = {{ env "GITEA_MAILER_USER" }}

1
compose.smtp.yml
View File

@ -8,6 +8,7 @@ services:
- GITEA_MAILER_ADDR - GITEA_MAILER_ADDR
- GITEA_MAILER_PORT - GITEA_MAILER_PORT
- GITEA_MAILER_USER - GITEA_MAILER_USER
- "GITEA_MAILER_PROTOCOL=${GITEA_MAILER_FROM:-smtps}"
secrets: secrets:
- smtp_password - smtp_password