mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-07 11:02:20 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
e5da60d75d
13
README.rst
13
README.rst
@ -657,7 +657,8 @@ Using a reverse proxy with Synapse
|
|||||||
|
|
||||||
It is recommended to put a reverse proxy such as
|
It is recommended to put a reverse proxy such as
|
||||||
`nginx <https://nginx.org/en/docs/http/ngx_http_proxy_module.html>`_,
|
`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
|
`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
|
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.
|
Matrix clients without needing to run Synapse with root privileges.
|
||||||
@ -688,7 +689,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>
|
<VirtualHost *:443>
|
||||||
SSLEngine on
|
SSLEngine on
|
||||||
|
1
changelog.d/4072.misc
Normal file
1
changelog.d/4072.misc
Normal file
@ -0,0 +1 @@
|
|||||||
|
The README now contains example for the Caddy web server. Contributed by steamp0rt.
|
Loading…
Reference in New Issue
Block a user