Skip to content

Commit 80217ca

Browse files
Docs: Replace deprecated IS_TLS_ENABLED mailer setting in email setup (#28205)
In the [docs for email setup](https://docs.gitea.com/administration/email-setup) `mailer.IS_TLS_ENABLED` is mentioned which was replaced by `mailer.PROTOCOL` in release 1.18.0 according to https://blog.gitea.com/release-of-1.18.0/ . This change wasn't reflected in the docs for email setup. I just replaced the deprecated mailer setting.
1 parent eacce14 commit 80217ca

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Please note: authentication is only supported when the SMTP server communication
6161

6262
- STARTTLS (also known as Opportunistic TLS) via port 587. Initial connection is done over cleartext, but then be upgraded over TLS if the server supports it.
6363
- SMTPS connection (SMTP over TLS) via the default port 465. Connection to the server use TLS from the beginning.
64-
- Forced SMTPS connection with `IS_TLS_ENABLED=true`. (These are both known as Implicit TLS.)
64+
- Forced SMTPS connection with `PROTOCOL=smtps`. (These are both known as Implicit TLS.)
6565
This is due to protections imposed by the Go internal libraries against STRIPTLS attacks.
6666

6767
Note that Implicit TLS is recommended by [RFC8314](https://tools.ietf.org/html/rfc8314#section-3) since 2018.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ PASSWD = `password`
6161

6262
- 通过端口 587 的 STARTTLS(也称为 Opportunistic TLS)。初始连接是明文的,但如果服务器支持,则可以升级为 TLS。
6363
- 通过默认端口 465 的 SMTPS 连接。连接到服务器从一开始就使用 TLS。
64-
- 使用 `IS_TLS_ENABLED=true` 进行强制的 SMTPS 连接。(这两种方式都被称为 Implicit TLS)
64+
- 使用 `PROTOCOL=smtps` 进行强制的 SMTPS 连接。(这两种方式都被称为 Implicit TLS)
6565
这是由于 Go 内部库对 STRIPTLS 攻击的保护机制。
6666

6767
请注意,自2018年起,[RFC8314](https://tools.ietf.org/html/rfc8314#section-3) 推荐使用 Implicit TLS。

0 commit comments

Comments
 (0)