瀏覽代碼

Small grammar fixes to the ACME v1 deprecation notice (#6944)

Some small fixes to the copy in #6907.
tags/v1.11.0
Andrew Morgan 4 年之前
committed by GitHub
父節點
當前提交
8f6d9c4cf0
沒有發現已知的金鑰在資料庫的簽署中 GPG Key ID: 4AEE18F83AFDEB23
共有 3 個文件被更改,包括 10 次插入10 次删除
  1. +4
    -5
      INSTALL.md
  2. +1
    -0
      changelog.d/6944.doc
  3. +5
    -5
      synapse/handlers/acme.py

+ 4
- 5
INSTALL.md 查看文件

@@ -420,11 +420,10 @@ so, you will need to edit `homeserver.yaml`, as follows:
Note that, as pointed out in that document, this feature will not
work with installs set up after November 2020.
If you are using your
own certificate, be sure to use a `.pem` file that includes the full
certificate chain including any intermediate certificates (for
instance, if using certbot, use `fullchain.pem` as your certificate,
not `cert.pem`).
If you are using your own certificate, be sure to use a `.pem` file that
includes the full certificate chain including any intermediate certificates
(for instance, if using certbot, use `fullchain.pem` as your certificate, not
`cert.pem`).

For a more detailed guide to configuring your server for federation, see
[federate.md](docs/federate.md)


+ 1
- 0
changelog.d/6944.doc 查看文件

@@ -0,0 +1 @@
Small grammatical fixes to the ACME v1 deprecation notice.

+ 5
- 5
synapse/handlers/acme.py 查看文件

@@ -27,11 +27,11 @@ logger = logging.getLogger(__name__)

ACME_REGISTER_FAIL_ERROR = """
--------------------------------------------------------------------------------
Failed to register with the ACME provider. This is likely happening because the install
is new, and ACME v1 has been deprecated by Let's Encrypt and is disabled for installs set
up after November 2019.
At the moment, Synapse doesn't support ACME v2. For more info and alternative solution,
check out https://github.com/matrix-org/synapse/blob/master/docs/ACME.md#deprecation-of-acme-v1
Failed to register with the ACME provider. This is likely happening because the installation
is new, and ACME v1 has been deprecated by Let's Encrypt and disabled for
new installations since November 2019.
At the moment, Synapse doesn't support ACME v2. For more information and alternative
solutions, please read https://github.com/matrix-org/synapse/blob/master/docs/ACME.md#deprecation-of-acme-v1
--------------------------------------------------------------------------------"""




Loading…
取消
儲存