Merge branch 'master' into erikj/msc1711_faq

This commit is contained in:
Richard van der Hoff 2019-02-07 19:27:42 +00:00
commit 188ad47e73
3 changed files with 17 additions and 12 deletions

View file

@ -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