diff options
| author | Erik Johnston <erik@matrix.org> | 2019-03-04 11:54:58 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-03-04 11:54:58 +0000 |
| commit | fbc047f2a5f12ee934e5ccbe7274100aa72166b5 (patch) | |
| tree | 2eabc4f13032883ff61fc635d0be43292a5ad131 /docs/workers.rst | |
| parent | Update newsfile to have a full stop (diff) | |
| parent | Update test_typing to use HomeserverTestCase. (#4771) (diff) | |
| download | synapse-fbc047f2a5f12ee934e5ccbe7274100aa72166b5.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/stop_fed_not_in_room
Diffstat (limited to 'docs/workers.rst')
| -rw-r--r-- | docs/workers.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/workers.rst b/docs/workers.rst index 3ba5879f76..3c18db1b19 100644 --- a/docs/workers.rst +++ b/docs/workers.rst @@ -182,6 +182,7 @@ endpoints matching the following regular expressions:: ^/_matrix/federation/v1/event_auth/ ^/_matrix/federation/v1/exchange_third_party_invite/ ^/_matrix/federation/v1/send/ + ^/_matrix/key/v2/query The above endpoints should all be routed to the federation_reader worker by the reverse-proxy configuration. @@ -223,6 +224,7 @@ following regular expressions:: ^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/members$ ^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/state$ ^/_matrix/client/(api/v1|r0|unstable)/login$ + ^/_matrix/client/(api/v1|r0|unstable)/account/3pid$ Additionally, the following REST endpoints can be handled, but all requests must be routed to the same instance:: |