summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrett Bethke <10068296+bb4242@users.noreply.github.com>2021-11-01 09:16:02 -0500
committerGitHub <noreply@github.com>2021-11-01 14:16:02 +0000
commit2014098d014844b89abd39ac86ab7ba39c5340f9 (patch)
treea65676c7d72fac2aad244bd003f9a3bcf8742f8a
parentDocker: avoid changing userid unnecessarily (#11209) (diff)
downloadsynapse-2014098d014844b89abd39ac86ab7ba39c5340f9.tar.xz
Add domain specific matching for haproxy config (#11128)
-rw-r--r--changelog.d/11128.doc1
-rw-r--r--docs/reverse_proxy.md2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/11128.doc b/changelog.d/11128.doc
new file mode 100644

index 0000000000..c024679218 --- /dev/null +++ b/changelog.d/11128.doc
@@ -0,0 +1 @@ +Improve example HAProxy config in the docs to properly handle host headers with port information. This is required for federation over port 443 to work correctly. diff --git a/docs/reverse_proxy.md b/docs/reverse_proxy.md
index 9f18fa1818..f3b3aea732 100644 --- a/docs/reverse_proxy.md +++ b/docs/reverse_proxy.md
@@ -188,7 +188,7 @@ frontend https http-request set-header X-Forwarded-For %[src] # Matrix client traffic - acl matrix-host hdr(host) -i matrix.example.com + acl matrix-host hdr(host) -i matrix.example.com matrix.example.com:443 acl matrix-path path_beg /_matrix acl matrix-path path_beg /_synapse/client