diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-10-23 09:39:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-23 09:39:55 +0100 |
commit | 047ac0cbba25ccffb93d92b46254a58f48ddaf9c (patch) | |
tree | 9266f7559b460b5b48cb79508e215ecacafec114 /README.rst | |
parent | Add warnings about the upgrade to 0.33.7 (diff) | |
parent | README.rst: fix minor grammar (diff) | |
download | synapse-047ac0cbba25ccffb93d92b46254a58f48ddaf9c.tar.xz |
Merge pull request #4072 from steamp0rt/patch-1
Add Caddy example to README
Diffstat (limited to 'README.rst')
-rw-r--r-- | README.rst | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/README.rst b/README.rst index e1ea351f84..9f27c14c4a 100644 --- a/README.rst +++ b/README.rst @@ -651,7 +651,8 @@ Using a reverse proxy with Synapse It is recommended to put a reverse proxy such as `nginx <https://nginx.org/en/docs/http/ngx_http_proxy_module.html>`_, -`Apache <https://httpd.apache.org/docs/current/mod/mod_proxy_http.html>`_ or +`Apache <https://httpd.apache.org/docs/current/mod/mod_proxy_http.html>`_, +`Caddy <https://caddyserver.com/docs/proxy>`_ or `HAProxy <https://www.haproxy.org/>`_ in front of Synapse. One advantage of doing so is that it means that you can expose the default https port (443) to Matrix clients without needing to run Synapse with root privileges. @@ -682,7 +683,15 @@ so an example nginx configuration might look like:: } } -and an example apache configuration may look like:: +an example Caddy configuration might look like:: + + matrix.example.com { + proxy /_matrix http://localhost:8008 { + transparent + } + } + +and an example Apache configuration might look like:: <VirtualHost *:443> SSLEngine on |