summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-06-05 15:12:33 +0100
committerGitHub <noreply@github.com>2019-06-05 15:12:33 +0100
commit95ab2eb4a1e9757bfe881abacce6ff81b3dbc371 (patch)
treed9126f60b44729cb688baf906607b6c37013fbe0
parentMerge pull request #5317 from matrix-org/erikj/make_do_auth_non_essential (diff)
downloadsynapse-95ab2eb4a1e9757bfe881abacce6ff81b3dbc371.tar.xz
Fix notes about well-known and acme (#5357)
fixes #4951
-rw-r--r--changelog.d/5357.doc1
-rw-r--r--docs/MSC1711_certificates_FAQ.md11
2 files changed, 6 insertions, 6 deletions
diff --git a/changelog.d/5357.doc b/changelog.d/5357.doc
new file mode 100644
index 0000000000..27cba49641
--- /dev/null
+++ b/changelog.d/5357.doc
@@ -0,0 +1 @@
+Fix notes about ACME in the MSC1711 faq.
diff --git a/docs/MSC1711_certificates_FAQ.md b/docs/MSC1711_certificates_FAQ.md
index ebfb20f5c8..37f7f669c9 100644
--- a/docs/MSC1711_certificates_FAQ.md
+++ b/docs/MSC1711_certificates_FAQ.md
@@ -145,12 +145,11 @@ You can do this with a `.well-known` file as follows:
  1. Keep the SRV record in place - it is needed for backwards compatibility
     with Synapse 0.34 and earlier.
 
- 2. Give synapse a certificate corresponding to the target domain
-    (`customer.example.net` in the above example). Currently Synapse's ACME
-    support [does not support
-    this](https://github.com/matrix-org/synapse/issues/4552), so you will have
-    to acquire a certificate yourself and give it to Synapse via
-    `tls_certificate_path` and `tls_private_key_path`.
+  2. Give Synapse a certificate corresponding to the target domain
+    (`customer.example.net` in the above example). You can either use Synapse's 
+    built-in [ACME support](./ACME.md) for this (via the `domain` parameter in 
+    the `acme` section), or acquire a certificate yourself and give it to 
+    Synapse via `tls_certificate_path` and `tls_private_key_path`.
 
  3. Restart Synapse to ensure the new certificate is loaded.