From e2cce15af16cd85d5379e8d961680028bfc9e754 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 5 Dec 2019 15:44:02 +0000 Subject: [PATCH 1/2] Remove #6369 changelog --- changelog.d/6369.doc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 changelog.d/6369.doc diff --git a/changelog.d/6369.doc b/changelog.d/6369.doc deleted file mode 100644 index 6db351d7db..0000000000 --- a/changelog.d/6369.doc +++ /dev/null @@ -1 +0,0 @@ -Update documentation and variables in user contributed systemd reference file. From 58fdcbdfe7f064f336f514b921a556c116c757cb Mon Sep 17 00:00:00 2001 From: Mark Nowiasz <36151963+mnowiasz@users.noreply.github.com> Date: Wed, 11 Dec 2019 17:23:38 +0100 Subject: [PATCH 2/2] Update workers.md to make media_repository work (again) (#6519) --- docs/workers.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/workers.md b/docs/workers.md index 4bd60ba0a0..1b5d94f5eb 100644 --- a/docs/workers.md +++ b/docs/workers.md @@ -196,7 +196,7 @@ Handles the media repository. It can handle all endpoints starting with: /_matrix/media/ -And the following regular expressions matching media-specific administration APIs: +... and the following regular expressions matching media-specific administration APIs: ^/_synapse/admin/v1/purge_media_cache$ ^/_synapse/admin/v1/room/.*/media$ @@ -206,6 +206,18 @@ You should also set `enable_media_repo: False` in the shared configuration file to stop the main synapse running background jobs related to managing the media repository. +In the `media_repository` worker configuration file, configure the http listener to +expose the `media` resource. For example: + +```yaml + worker_listeners: + - type: http + port: 8085 + resources: + - names: + - media +``` + Note this worker cannot be load-balanced: only one instance should be active. ### `synapse.app.client_reader`