diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-09-07 14:25:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 14:25:23 +0100 |
| commit | e33a538af3a4e1892195afd6f7c09c8b4bd76fd4 (patch) | |
| tree | 3d09acf653882af96f71c50d5776fd9a20888f72 | |
| parent | Merge branch 'master' into develop (diff) | |
| parent | Remove end '/'s (diff) | |
| download | synapse-e33a538af3a4e1892195afd6f7c09c8b4bd76fd4.tar.xz | |
Merge pull request #3783 from cwmke/develop
Add apache vhost config to Readme
| -rw-r--r-- | README.rst | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/README.rst b/README.rst index d6f34ba9d1..2471619706 100644 --- a/README.rst +++ b/README.rst @@ -742,6 +742,18 @@ so an example nginx configuration might look like:: } } +and an example apache configuration may look like:: + + <VirtualHost *:443> + 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> + </VirtualHost> + You will also want to set ``bind_addresses: ['127.0.0.1']`` and ``x_forwarded: true`` for port 8008 in ``homeserver.yaml`` to ensure that client IP addresses are recorded correctly. |