Merge pull request 'feat: support other smtp protocols' (#39) from smtp into master
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #39 Reviewed-by: decentral1se <decentral1se@noreply.git.coopcloud.tech>
This commit is contained in:
commit
e313c82857
@ -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
2
abra.sh
@ -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
|
||||||
|
|
||||||
|
@ -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" }}
|
||||||
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" }}
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user