File tree Expand file tree Collapse file tree 10 files changed +14
-19
lines changed Expand file tree Collapse file tree 10 files changed +14
-19
lines changed Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ Note: For Internet-facing sites consult documentation of your MTA for instructio
3131[mailer]
3232ENABLED = true
3333FROM = gitea@mydomain.com
34- MAILER_TYPE = sendmail
34+ PROTOCOL = sendmail
3535SENDMAIL_PATH = /usr/sbin/sendmail
3636SENDMAIL_ARGS = " --" ; most "sendmail" programs take options, "--" will prevent an email address being interpreted as an option.
3737```
@@ -44,10 +44,9 @@ Directly use SMTP server as relay. This option is useful if you don't want to se
4444[mailer]
4545ENABLED = true
4646FROM = gitea@mydomain.com
47- MAILER_TYPE = smtp
47+ PROTOCOL = smtps
4848SMTP_ADDR = mail.mydomain.com
4949SMTP_PORT = 587
50- IS_TLS_ENABLED = true
5150USER = gitea@mydomain.com
5251PASSWD = `password`
5352```
@@ -80,7 +79,7 @@ SMTP_PORT = 465
8079FROM = example.user@gmail.com
8180USER = example.user
8281PASSWD = `***`
83- MAILER_TYPE = smtp
82+ PROTOCOL = smtp
8483IS_TLS_ENABLED = true
8584```
8685
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ Gitea 具有邮件功能,用于发送事务性邮件(例如注册确认邮
3131[mailer]
3232ENABLED = true
3333FROM = gitea@mydomain.com
34- MAILER_TYPE = sendmail
34+ PROTOCOL = sendmail
3535SENDMAIL_PATH = /usr/sbin/sendmail
3636SENDMAIL_ARGS = " --" ; 大多数 "sendmail" 程序都接受选项,使用 "--" 将防止电子邮件地址被解释为选项。
3737```
@@ -44,10 +44,9 @@ SENDMAIL_ARGS = "--" ; 大多数 "sendmail" 程序都接受选项,使用 "--"
4444[mailer]
4545ENABLED = true
4646FROM = gitea@mydomain.com
47- MAILER_TYPE = smtp
47+ PROTOCOL = smtps
4848SMTP_ADDR = mail.mydomain.com
4949SMTP_PORT = 587
50- IS_TLS_ENABLED = true
5150USER = gitea@mydomain.com
5251PASSWD = `password`
5352```
@@ -80,8 +79,7 @@ SMTP_PORT = 465
8079FROM = example.user@gmail.com
8180USER = example.user
8281PASSWD = `***`
83- MAILER_TYPE = smtp
84- IS_TLS_ENABLED = true
82+ PROTOCOL = smtps
8583```
8684
8785请注意,您需要创建并使用一个 [ 应用密码] ( https://support.google.com/accounts/answer/185833?hl=en ) 并在您的 Google 帐户上启用 2FA。您将无法直接使用您的 Google 帐户密码。
Original file line number Diff line number Diff line change @@ -306,7 +306,7 @@ services:
306306 environment:
307307 - GITEA__mailer__ENABLED=true
308308 - GITEA__mailer__FROM=${GITEA__mailer__FROM:? GITEA__mailer__FROM not set}
309- - GITEA__mailer__MAILER_TYPE =smtp
309+ - GITEA__mailer__PROTOCOL =smtp
310310 - GITEA__mailer__HOST=${GITEA__mailer__HOST:? GITEA__mailer__HOST not set}
311311 - GITEA__mailer__IS_TLS_ENABLED=true
312312 - GITEA__mailer__USER=${GITEA__mailer__USER:- apikey}
Original file line number Diff line number Diff line change @@ -274,7 +274,7 @@ services:
274274 environment:
275275 - GITEA__mailer__ENABLED=true
276276 - GITEA__mailer__FROM=${GITEA__mailer__FROM:? GITEA__mailer__FROM not set}
277- - GITEA__mailer__MAILER_TYPE =smtp
277+ - GITEA__mailer__PROTOCOL =smtp
278278 - GITEA__mailer__HOST=${GITEA__mailer__HOST:? GITEA__mailer__HOST not set}
279279 - GITEA__mailer__IS_TLS_ENABLED=true
280280 - GITEA__mailer__USER=${GITEA__mailer__USER:- apikey}
Original file line number Diff line number Diff line change @@ -303,9 +303,8 @@ services:
303303 environment:
304304 - GITEA__mailer__ENABLED=true
305305 - GITEA__mailer__FROM=${GITEA__mailer__FROM:? GITEA__mailer__FROM not set}
306- - GITEA__mailer__MAILER_TYPE=smtp
306+ - GITEA__mailer__PROTOCOL=smtps
307307 - GITEA__mailer__HOST=${GITEA__mailer__HOST:? GITEA__mailer__HOST not set}
308- - GITEA__mailer__IS_TLS_ENABLED=true
309308 - GITEA__mailer__USER=${GITEA__mailer__USER:- apikey}
310309 - GITEA__mailer__PASSWD=" " " ${GITEA__mailer__PASSWD:? GITEA__mailer__PASSWD not set} " " "
311310```
Original file line number Diff line number Diff line change @@ -287,9 +287,8 @@ services:
287287 environment:
288288 - GITEA__mailer__ENABLED=true
289289 - GITEA__mailer__FROM=${GITEA__mailer__FROM:? GITEA__mailer__FROM not set}
290- - GITEA__mailer__MAILER_TYPE=smtp
290+ - GITEA__mailer__PROTOCOL=smtps
291291 - GITEA__mailer__HOST=${GITEA__mailer__HOST:? GITEA__mailer__HOST not set}
292- - GITEA__mailer__IS_TLS_ENABLED=true
293292 - GITEA__mailer__USER=${GITEA__mailer__USER:- apikey}
294293 - GITEA__mailer__PASSWD=" " " ${GITEA__mailer__PASSWD:? GITEA__mailer__PASSWD not set} " " "
295294```
Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ PATH = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-mssql/data/attachments
5858
5959[mailer]
6060ENABLED = true
61- MAILER_TYPE = dummy
61+ PROTOCOL = dummy
6262FROM = mssql-{{TEST_TYPE}}-test@gitea.io
6363
6464[service]
Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ SSH_TRUSTED_USER_CA_KEYS = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCb4DC1dMFnJ6pXW
5858
5959[mailer]
6060ENABLED = true
61- MAILER_TYPE = dummy
61+ PROTOCOL = dummy
6262FROM = mysql-{{TEST_TYPE}}-test@gitea.io
6363
6464[service]
Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ PATH = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-pgsql/data/attachments
5959
6060[mailer]
6161ENABLED = true
62- MAILER_TYPE = dummy
62+ PROTOCOL = dummy
6363FROM = pgsql-{{TEST_TYPE}}-test@gitea.io
6464
6565[service]
Original file line number Diff line number Diff line change @@ -55,7 +55,7 @@ PATH = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-sqlite/data/attachments
5555
5656[mailer]
5757ENABLED = true
58- MAILER_TYPE = dummy
58+ PROTOCOL = dummy
5959FROM = sqlite-{{TEST_TYPE}}-test@gitea.io
6060
6161[service]
You can’t perform that action at this time.
0 commit comments