diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-06-27 00:53:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-27 00:53:48 +0100 |
| commit | 47fa836abb48f514fb5267d07f229f86d5489290 (patch) | |
| tree | d4be4a92b997d01c2af7e59be3977290c168d7b4 | |
| parent | Improve docs on choosing server_name (#5558) (diff) | |
| parent | Create 5313.misc (diff) | |
| download | synapse-47fa836abb48f514fb5267d07f229f86d5489290.tar.xz | |
Merge pull request #5313 from twrist/patch-1
Update HAProxy example rules
| -rw-r--r-- | changelog.d/5313.misc | 1 | ||||
| -rw-r--r-- | docs/reverse_proxy.rst | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changelog.d/5313.misc b/changelog.d/5313.misc new file mode 100644 index 0000000000..2ea01cb9d3 --- /dev/null +++ b/changelog.d/5313.misc @@ -0,0 +1 @@ +Update example haproxy config to a more compatible setup. diff --git a/docs/reverse_proxy.rst b/docs/reverse_proxy.rst index 7619b1097b..e4b870411c 100644 --- a/docs/reverse_proxy.rst +++ b/docs/reverse_proxy.rst @@ -89,8 +89,10 @@ Let's assume that we expect clients to connect to our server at bind :::443 v4v6 ssl crt /etc/ssl/haproxy/ strict-sni alpn h2,http/1.1 # Matrix client traffic - acl matrix hdr(host) -i matrix.example.com - use_backend matrix if matrix + acl matrix-host hdr(host) -i matrix.example.com + acl matrix-path path_beg /_matrix + + use_backend matrix if matrix-host matrix-path frontend matrix-federation bind :::8448 v4v6 ssl crt /etc/ssl/haproxy/synapse.pem alpn h2,http/1.1 |