From f5de43c1d53eb757ea08b44612c05da33b9c298e Mon Sep 17 00:00:00 2001 From: Colin W Date: Sat, 16 Mar 2019 13:54:24 -0500 Subject: [PATCH 1/5] Update reverse_proxy.rst Remove location syntax --- docs/reverse_proxy.rst | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/reverse_proxy.rst b/docs/reverse_proxy.rst index 6cd129abf404..d521ddb4c249 100644 --- a/docs/reverse_proxy.rst +++ b/docs/reverse_proxy.rst @@ -78,11 +78,9 @@ Let's assume that we expect clients to connect to our server at SSLEngine on ServerName example.com; - - - ProxyPass http://127.0.0.1:8008/_matrix nocanon - ProxyPassReverse http://127.0.0.1:8008/_matrix - + + ProxyPass /_matrix http://127.0.0.1:8008/_matrix nocanon + ProxyPassReverse /_matrix http://127.0.0.1:8008/_matrix * HAProxy:: From 21132c10628dd0a090e48d30f6b574b4e55a6688 Mon Sep 17 00:00:00 2001 From: Colin W Date: Sat, 16 Mar 2019 13:56:10 -0500 Subject: [PATCH 2/5] Update reverse_proxy.rst Remove location syntax. --- docs/reverse_proxy.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/reverse_proxy.rst b/docs/reverse_proxy.rst index d521ddb4c249..266769e1eb54 100644 --- a/docs/reverse_proxy.rst +++ b/docs/reverse_proxy.rst @@ -69,10 +69,8 @@ Let's assume that we expect clients to connect to our server at SSLEngine on ServerName matrix.example.com; - - ProxyPass http://127.0.0.1:8008/_matrix nocanon - ProxyPassReverse http://127.0.0.1:8008/_matrix - + ProxyPass /_matrix http://127.0.0.1:8008/_matrix nocanon + ProxyPassReverse /_matrix http://127.0.0.1:8008/_matrix From 3fceaddff2756dda58b0cf6a852658b8e378efef Mon Sep 17 00:00:00 2001 From: Colin W Date: Tue, 19 Mar 2019 10:08:38 -0500 Subject: [PATCH 3/5] add changelog file --- changelog.d/4870.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/4870.misc diff --git a/changelog.d/4870.misc b/changelog.d/4870.misc new file mode 100644 index 000000000000..001e3dff7c33 --- /dev/null +++ b/changelog.d/4870.misc @@ -0,0 +1 @@ +Update Apache setup to remove location syntax From 804c17ce54ef4adc66312f74abb9f39c95c1287a Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Thu, 21 Mar 2019 10:07:44 +0000 Subject: [PATCH 4/5] Add missing trailing . --- changelog.d/4870.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/4870.misc b/changelog.d/4870.misc index 001e3dff7c33..d59f1e370758 100644 --- a/changelog.d/4870.misc +++ b/changelog.d/4870.misc @@ -1 +1 @@ -Update Apache setup to remove location syntax +Update Apache setup to remove location syntax. From 4c093515be7d3c814f38c6ec4fee687600adab21 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Thu, 21 Mar 2019 14:05:19 +0000 Subject: [PATCH 5/5] add attribution to changelog --- changelog.d/4870.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/4870.misc b/changelog.d/4870.misc index d59f1e370758..f287b7d3b0fd 100644 --- a/changelog.d/4870.misc +++ b/changelog.d/4870.misc @@ -1 +1 @@ -Update Apache setup to remove location syntax. +Update Apache setup to remove location syntax. Thanks to @cwmke!