diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-02-07 19:27:42 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-02-07 19:27:42 +0000 |
commit | 188ad47e731afd67a6df586b66321e7f61fb7cc9 (patch) | |
tree | cbd27ee51dd7b5bcf51ace626e9bf8e17203caf4 /docs/MSC1711_certificates_FAQ.md | |
parent | Newsfile (diff) | |
parent | Merge remote-tracking branch 'origin/release-v0.99.0' (diff) | |
download | synapse-188ad47e731afd67a6df586b66321e7f61fb7cc9.tar.xz |
Merge branch 'master' into erikj/msc1711_faq
Diffstat (limited to 'docs/MSC1711_certificates_FAQ.md')
-rw-r--r-- | docs/MSC1711_certificates_FAQ.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/MSC1711_certificates_FAQ.md b/docs/MSC1711_certificates_FAQ.md index a3a36d222e..579c5dffce 100644 --- a/docs/MSC1711_certificates_FAQ.md +++ b/docs/MSC1711_certificates_FAQ.md @@ -112,7 +112,7 @@ _matrix._tcp.example.com. IN SRV 10 5 8000 customer.example.net. In this situation, you have three choices for how to proceed: -#### Option 1: give Synapse a certificate for your matrix domain +#### Option 1: give Synapse (or a reverse-proxy) a certificate for your matrix domain Synapse 1.0 will expect your server to present a TLS certificate for your `server_name` (`example.com` in the above example). You can achieve this by |