diff options
| author | Colin W <cwmke@users.noreply.github.com> | 2019-03-21 09:05:56 -0500 |
|---|---|---|
| committer | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-03-21 14:05:56 +0000 |
| commit | ab4e4c6c2f9c044b7ae47e5032e20bc8abf5436b (patch) | |
| tree | 6d8c06b386f83b6d84bab3c111add8592562aaf9 | |
| parent | Merge pull request #4904 from matrix-org/erikj/fix_shutdown (diff) | |
| download | synapse-ab4e4c6c2f9c044b7ae47e5032e20bc8abf5436b.tar.xz | |
Update Apache Setup To Remove Location Syntax (#4870)
This one should close #4841. Many thanks to @dev4223 for bringing it up and finding a solution. Signed-off-by: Colin White
| -rw-r--r-- | changelog.d/4870.misc | 1 | ||||
| -rw-r--r-- | docs/reverse_proxy.rst | 14 |
2 files changed, 6 insertions, 9 deletions
diff --git a/changelog.d/4870.misc b/changelog.d/4870.misc new file mode 100644 index 0000000000..f287b7d3b0 --- /dev/null +++ b/changelog.d/4870.misc @@ -0,0 +1 @@ +Update Apache setup to remove location syntax. Thanks to @cwmke! diff --git a/docs/reverse_proxy.rst b/docs/reverse_proxy.rst index 8e26c50f1b..cc81ceb84b 100644 --- a/docs/reverse_proxy.rst +++ b/docs/reverse_proxy.rst @@ -69,20 +69,16 @@ Let's assume that we expect clients to connect to our server at SSLEngine on ServerName matrix.example.com; - <Location /_matrix> - ProxyPass http://127.0.0.1:8008/_matrix nocanon - ProxyPassReverse http://127.0.0.1:8008/_matrix - </Location> + ProxyPass /_matrix http://127.0.0.1:8008/_matrix nocanon + ProxyPassReverse /_matrix http://127.0.0.1:8008/_matrix </VirtualHost> <VirtualHost *:8448> SSLEngine on ServerName example.com; - - <Location /_matrix> - ProxyPass http://127.0.0.1:8008/_matrix nocanon - ProxyPassReverse http://127.0.0.1:8008/_matrix - </Location> + + ProxyPass /_matrix http://127.0.0.1:8008/_matrix nocanon + ProxyPassReverse /_matrix http://127.0.0.1:8008/_matrix </VirtualHost> * HAProxy:: |