Make SMTP mailer experimental
See https://git.autonomic.zone/coop-cloud/gitea/issues/10.
This commit is contained in:
parent
48b56b9073
commit
c271eb4ff5
|
@ -25,6 +25,8 @@ SECRET_DB_ROOT_PASSWORD_VERSION=v1
|
||||||
SECRET_JWT_SECRET_VERSION=v1 # length=43
|
SECRET_JWT_SECRET_VERSION=v1 # length=43
|
||||||
SECRET_SECRET_KEY_VERSION=v1 # length=64
|
SECRET_SECRET_KEY_VERSION=v1 # length=64
|
||||||
|
|
||||||
# Email
|
# SMTP Mailer
|
||||||
#GITEA_MAILER_HOST=mail.gandi.net:465
|
# COMPOSE_FILE="compose.yml:compose.smtp.yml"
|
||||||
SECRET_SMTP_PASSWORD_VERSION=v1
|
# GITEA_SMTP_MAILER_ENABLED=1
|
||||||
|
# GITEA_MAILER_HOST=mail.gandi.net:465
|
||||||
|
# SECRET_SMTP_PASSWORD_VERSION=v1
|
||||||
|
|
|
@ -44,6 +44,7 @@ SECRET_KEY = {{ secret "secret_key" }}
|
||||||
[oauth2]
|
[oauth2]
|
||||||
JWT_SECRET = {{ secret "jwt_secret" }}
|
JWT_SECRET = {{ secret "jwt_secret" }}
|
||||||
|
|
||||||
|
{{ if eq (env "GITEA_SMTP_MAILER_ENABLED") "1" }}
|
||||||
[mailer]
|
[mailer]
|
||||||
ENABLED = true
|
ENABLED = true
|
||||||
FROM = {{ env "GITEA_MAILER_FROM" }}
|
FROM = {{ env "GITEA_MAILER_FROM" }}
|
||||||
|
@ -52,6 +53,7 @@ USER = {{ env "GITEA_MAILER_USER" }}
|
||||||
PASSWD = {{ secret "smtp_passwd" }}
|
PASSWD = {{ secret "smtp_passwd" }}
|
||||||
MAILER_TYPE = smtp
|
MAILER_TYPE = smtp
|
||||||
IS_TLS_ENABLED = true
|
IS_TLS_ENABLED = true
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
[markup.restructuredtext]
|
[markup.restructuredtext]
|
||||||
ENABLED = true
|
ENABLED = true
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
version: "3.8"
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
environment:
|
||||||
|
- GITEA_MAILER_FROM
|
||||||
|
- GITEA_MAILER_HOST
|
||||||
|
- GITEA_MAILER_USER
|
||||||
|
secrets:
|
||||||
|
- smtp_passwd
|
||||||
|
# Note(decentral1se): migrate from passwd -> password
|
||||||
|
# See https://git.autonomic.zone/coop-cloud/abra/pulls/33
|
||||||
|
secrets:
|
||||||
|
smtp_passwd:
|
||||||
|
name: ${STACK_NAME}_smtp_passwd_${SECRET_SMTP_PASSWORD_VERSION}
|
||||||
|
external: true
|
|
@ -10,7 +10,6 @@ services:
|
||||||
- internal_token
|
- internal_token
|
||||||
- jwt_secret
|
- jwt_secret
|
||||||
- secret_key
|
- secret_key
|
||||||
- smtp_passwd
|
|
||||||
environment:
|
environment:
|
||||||
- GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION
|
- GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION
|
||||||
- GITEA_APP_NAME
|
- GITEA_APP_NAME
|
||||||
|
@ -24,9 +23,6 @@ services:
|
||||||
- GITEA_ENABLE_NOTIFY_MAIL
|
- GITEA_ENABLE_NOTIFY_MAIL
|
||||||
- GITEA_ENABLE_OPENID_SIGNIN
|
- GITEA_ENABLE_OPENID_SIGNIN
|
||||||
- GITEA_ENABLE_OPENID_SIGNUP
|
- GITEA_ENABLE_OPENID_SIGNUP
|
||||||
- GITEA_MAILER_FROM
|
|
||||||
- GITEA_MAILER_HOST
|
|
||||||
- GITEA_MAILER_USER
|
|
||||||
- GITEA_SSH_PORT
|
- GITEA_SSH_PORT
|
||||||
volumes:
|
volumes:
|
||||||
- "git:/data"
|
- "git:/data"
|
||||||
|
@ -100,9 +96,6 @@ secrets:
|
||||||
secret_key:
|
secret_key:
|
||||||
name: ${STACK_NAME}_secret_key_${SECRET_SECRET_KEY_VERSION}
|
name: ${STACK_NAME}_secret_key_${SECRET_SECRET_KEY_VERSION}
|
||||||
external: true
|
external: true
|
||||||
smtp_passwd:
|
|
||||||
name: ${STACK_NAME}_smtp_passwd_${SECRET_SMTP_PASSWORD_VERSION}
|
|
||||||
external: true
|
|
||||||
volumes:
|
volumes:
|
||||||
git:
|
git:
|
||||||
mariadb:
|
mariadb:
|
||||||
|
|
Loading…
Reference in New Issue