diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-02-07 19:29:20 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-02-07 19:29:20 +0000 |
| commit | 7cadc4c918c207a574ea15bd1e3793d8a48b7beb (patch) | |
| tree | c832b739edcdf83853896cf2fce5a52a9aed6d5f | |
| parent | Merge branch 'master' into erikj/msc1711_faq (diff) | |
| download | synapse-7cadc4c918c207a574ea15bd1e3793d8a48b7beb.tar.xz | |
cleanups
| -rw-r--r-- | docs/MSC1711_certificates_FAQ.md | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/docs/MSC1711_certificates_FAQ.md b/docs/MSC1711_certificates_FAQ.md index 579c5dffce..0a781d00e3 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 (or a reverse-proxy) a certificate for your matrix domain +#### Option 1: give Synapse 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 @@ -123,8 +123,7 @@ doing one of the following: and `tls_private_key_path`, or: * Use Synapse's [ACME support](./ACME.md), and forward port 80 on the - `server_name` domain to your Synapse instance, or: - + `server_name` domain to your Synapse instance. ### Option 2: run Synapse behind a reverse proxy @@ -133,7 +132,6 @@ your domain, you can simply route all traffic through the reverse proxy by updating the SRV record appropriately (or removing it, if the proxy listens on 8448). - #### Option 3: add a .well-known file to delegate your matrix traffic This will allow you to keep Synapse on a separate domain, without having to |