summary refs log tree commit diff
path: root/docs/workers.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-02-12 17:18:07 +0000
committerErik Johnston <erik@matrix.org>2018-02-12 17:21:23 +0000
commit32c7b8e48b5c79de5b722afb4c2b79c6c712cdc5 (patch)
treef293683ecfa3a535615c94d911f9ce1a8943688e /docs/workers.rst
parentAdd note in docs/workers.rst (diff)
downloadsynapse-32c7b8e48b5c79de5b722afb4c2b79c6c712cdc5.tar.xz
Update workers docs to include http port
Diffstat (limited to 'docs/workers.rst')
-rw-r--r--docs/workers.rst25
1 files changed, 20 insertions, 5 deletions
diff --git a/docs/workers.rst b/docs/workers.rst
index 213d57e47c..b687807e59 100644
--- a/docs/workers.rst
+++ b/docs/workers.rst
@@ -30,17 +30,29 @@ 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).
 
-To enable workers, you need to add a replication listener to the master synapse, e.g.::
+To enable workers, you need to add two replication listeners to the master
+synapse, e.g.::
 
     listeners:
+      # The TCP replication port
       - port: 9092
         bind_address: '127.0.0.1'
         type: replication
+      # The HTTP replication port
+      - port: 9093
+        bind_address: '127.0.0.1'
+        type: http
+        resources:
+         - names: [replication]
 
-Under **no circumstances** should this replication API listener be exposed to the
-public internet; it currently implements no authentication whatsoever and is
+Under **no circumstances** should these replication API listeners be exposed to
+the public internet; it currently implements no authentication whatsoever and is
 unencrypted.
 
+(Roughly, the TCP port is used for streaming data from the master to the
+workers, and the HTTP port for the workers to communicate with the main
+synapse process.)
+
 You then create a set of configs for the various worker processes.  These
 should be worker configuration files, and should be stored in a dedicated
 subdirectory, to allow synctl to manipulate them.
@@ -52,8 +64,10 @@ You should minimise the number of overrides though to maintain a usable config.
 
 You must specify the type of worker application (``worker_app``). The currently
 available worker applications are listed below. You must also specify the
-replication endpoint that it's talking to on the main synapse process
-(``worker_replication_host`` and ``worker_replication_port``).
+replication endpoints that it's talking to on the main synapse process.
+``worker_replication_host`` should specify the host of the main synapse,
+``worker_replication_port`` should point to the TCP replication listener port and
+``worker_replication_http_port`` should point to the HTTP replication port.
 
 For instance::
 
@@ -62,6 +76,7 @@ For instance::
     # The replication listener on the synapse to talk to.
     worker_replication_host: 127.0.0.1
     worker_replication_port: 9092
+    worker_replication_http_port: 9093
 
     worker_listeners:
      - type: http