diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-05-14 18:12:00 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-05-14 18:12:00 +0100 |
| commit | ec0b72bc4ed2015c1bc77e91bf50d6632029644c (patch) | |
| tree | 1ad1f1ca00bb65f9af5816714c9d8367b6ea7a3f /docs/reverse_proxy.md | |
| parent | Enforce MSC2209: auth rules for notifications in power level event (#7502) (diff) | |
| parent | remove spurious changelog files (diff) | |
| download | synapse-ec0b72bc4ed2015c1bc77e91bf50d6632029644c.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'docs/reverse_proxy.md')
| -rw-r--r-- | docs/reverse_proxy.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/reverse_proxy.md b/docs/reverse_proxy.md index c7222f73b9..7c300023c6 100644 --- a/docs/reverse_proxy.md +++ b/docs/reverse_proxy.md @@ -9,7 +9,7 @@ of doing so is that it means that you can expose the default https port (443) to Matrix clients without needing to run Synapse with root privileges. -> **NOTE**: Your reverse proxy must not `canonicalise` or `normalise` +**NOTE**: Your reverse proxy must not `canonicalise` or `normalise` the requested URI in any way (for example, by decoding `%xx` escapes). Beware that Apache *will* canonicalise URIs unless you specifify `nocanon`. @@ -18,7 +18,7 @@ When setting up a reverse proxy, remember that Matrix clients and other Matrix servers do not necessarily need to connect to your server via the same server name or port. Indeed, clients will use port 443 by default, whereas servers default to port 8448. Where these are different, we -refer to the 'client port' and the \'federation port\'. See [the Matrix +refer to the 'client port' and the 'federation port'. See [the Matrix specification](https://matrix.org/docs/spec/server_server/latest#resolving-server-names) for more details of the algorithm used for federation connections, and [delegate.md](<delegate.md>) for instructions on setting up delegation. @@ -28,9 +28,9 @@ Let's assume that we expect clients to connect to our server at `https://example.com:8448`. The following sections detail the configuration of the reverse proxy and the homeserver. -## Webserver configuration examples +## Reverse-proxy configuration examples -> **NOTE**: You only need one of these. +**NOTE**: You only need one of these. ### nginx |