summary refs log tree commit diff
path: root/docs/workers.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-02-13 10:29:31 +0000
committerErik Johnston <erik@matrix.org>2019-02-13 10:29:31 +0000
commit341c35614a9c46f2c03d69e7be1d33f0d21ae8ba (patch)
treefb6ab41d62e3d8fa9508bae9a71202b7b9d3ef6f /docs/workers.rst
parentMerge branch 'release-v0.99.0' into matrix-org-hotfixes (diff)
parentFixup changelog (diff)
downloadsynapse-341c35614a9c46f2c03d69e7be1d33f0d21ae8ba.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'docs/workers.rst')
-rw-r--r--docs/workers.rst5
1 files changed, 2 insertions, 3 deletions
diff --git a/docs/workers.rst b/docs/workers.rst

index 101e950020..dd3a84ba0d 100644 --- a/docs/workers.rst +++ b/docs/workers.rst
@@ -26,9 +26,8 @@ Configuration To make effective use of the workers, you will need to configure an HTTP reverse-proxy such as nginx or haproxy, which will direct incoming requests to the correct worker, or to the main synapse instance. Note that this includes -requests made to the federation port. The caveats regarding running a -reverse-proxy on the federation port still apply (see -https://github.com/matrix-org/synapse/blob/master/README.rst#reverse-proxying-the-federation-port). +requests made to the federation port. See `<reverse_proxy.rst>`_ for +information on setting up a reverse proxy. To enable workers, you need to add two replication listeners to the master synapse, e.g.::