Skip to content

Commit 0533187

Browse files
felixvictorlunny
andauthored
Update email-setup.en-us.md (#26068)
The setting `MAILER_TYPE` is deprecated. According to the config cheat sheet, it should be `PROTOCOL`. --------- Co-authored-by: Lunny Xiao <[email protected]>
1 parent 1c6c38f commit 0533187

10 files changed

+14
-19
lines changed

docs/content/administration/email-setup.en-us.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Note: For Internet-facing sites consult documentation of your MTA for instructio
3131
[mailer]
3232
ENABLED = true
3333
34-
MAILER_TYPE = sendmail
34+
PROTOCOL = sendmail
3535
SENDMAIL_PATH = /usr/sbin/sendmail
3636
SENDMAIL_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]
4545
ENABLED = true
4646
47-
MAILER_TYPE = smtp
47+
PROTOCOL = smtps
4848
SMTP_ADDR = mail.mydomain.com
4949
SMTP_PORT = 587
50-
IS_TLS_ENABLED = true
5150
5251
PASSWD = `password`
5352
```
@@ -80,7 +79,7 @@ SMTP_PORT = 465
8079
8180
USER = example.user
8281
PASSWD = `***`
83-
MAILER_TYPE = smtp
82+
PROTOCOL = smtp
8483
IS_TLS_ENABLED = true
8584
```
8685

docs/content/administration/email-setup.zh-cn.md

+3-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Gitea 具有邮件功能,用于发送事务性邮件(例如注册确认邮
3131
[mailer]
3232
ENABLED = true
3333
34-
MAILER_TYPE = sendmail
34+
PROTOCOL = sendmail
3535
SENDMAIL_PATH = /usr/sbin/sendmail
3636
SENDMAIL_ARGS = "--" ; 大多数 "sendmail" 程序都接受选项,使用 "--" 将防止电子邮件地址被解释为选项。
3737
```
@@ -44,10 +44,9 @@ SENDMAIL_ARGS = "--" ; 大多数 "sendmail" 程序都接受选项,使用 "--"
4444
[mailer]
4545
ENABLED = true
4646
47-
MAILER_TYPE = smtp
47+
PROTOCOL = smtps
4848
SMTP_ADDR = mail.mydomain.com
4949
SMTP_PORT = 587
50-
IS_TLS_ENABLED = true
5150
5251
PASSWD = `password`
5352
```
@@ -80,8 +79,7 @@ SMTP_PORT = 465
8079
8180
USER = example.user
8281
PASSWD = `***`
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 帐户密码。

docs/content/installation/with-docker-rootless.en-us.md

+1-1
Original file line numberDiff line numberDiff 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}

docs/content/installation/with-docker-rootless.zh-cn.md

+1-1
Original file line numberDiff line numberDiff 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}

docs/content/installation/with-docker.en-us.md

+1-2
Original file line numberDiff line numberDiff 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
```

docs/content/installation/with-docker.zh-cn.md

+1-2
Original file line numberDiff line numberDiff 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
```

tests/mssql.ini.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ PATH = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-mssql/data/attachments
5858

5959
[mailer]
6060
ENABLED = true
61-
MAILER_TYPE = dummy
61+
PROTOCOL = dummy
6262
FROM = mssql-{{TEST_TYPE}}[email protected]
6363

6464
[service]

tests/mysql.ini.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ SSH_TRUSTED_USER_CA_KEYS = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCb4DC1dMFnJ6pXW
5858

5959
[mailer]
6060
ENABLED = true
61-
MAILER_TYPE = dummy
61+
PROTOCOL = dummy
6262
FROM = mysql-{{TEST_TYPE}}[email protected]
6363

6464
[service]

tests/pgsql.ini.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ PATH = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-pgsql/data/attachments
5959

6060
[mailer]
6161
ENABLED = true
62-
MAILER_TYPE = dummy
62+
PROTOCOL = dummy
6363
FROM = pgsql-{{TEST_TYPE}}[email protected]
6464

6565
[service]

tests/sqlite.ini.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ PATH = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-sqlite/data/attachments
5555

5656
[mailer]
5757
ENABLED = true
58-
MAILER_TYPE = dummy
58+
PROTOCOL = dummy
5959
FROM = sqlite-{{TEST_TYPE}}[email protected]
6060

6161
[service]

0 commit comments

Comments
 (0)