summary refs log tree commit diff
path: root/docs/MSC1711_certificates_FAQ.md
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-06-05 16:32:35 +0100
committerRichard van der Hoff <richard@matrix.org>2019-06-05 16:32:35 +0100
commit7603a706eb96305d804da05030a71288fcc255ab (patch)
treed59bcc7827bc6b038d5c3e7bc46677a84007e255 /docs/MSC1711_certificates_FAQ.md
parentUpdate sample config (diff)
parentFix `federation_custom_ca_list` configuration option. (diff)
downloadsynapse-7603a706eb96305d804da05030a71288fcc255ab.tar.xz
Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verification
Diffstat (limited to 'docs/MSC1711_certificates_FAQ.md')
-rw-r--r--docs/MSC1711_certificates_FAQ.md11
1 files changed, 5 insertions, 6 deletions
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.