summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorQuentin Gliech <quenting@element.io>2024-07-15 11:42:59 +0200
committerGitHub <noreply@github.com>2024-07-15 11:42:59 +0200
commit4f6194492a4f16c37e55d15d0434d5357266fed0 (patch)
treee5f66148fe41d0af44bb61a2b798616ddec5350c /synapse/config/server.py
parentAdd room subscriptions to Sliding Sync `/sync` (#17432) (diff)
downloadsynapse-4f6194492a4f16c37e55d15d0434d5357266fed0.tar.xz
Make sure we use the right logic for enabling the media repo. (#17424)
This removes the `enable_media_repo` attribute on the server config in
favour of always using the `can_load_media_repo` in the media config.
This should avoid issues like in #17420 in the future
Diffstat (limited to '')
-rw-r--r--synapse/config/server.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index a2b2305776..8bb97df175 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -395,12 +395,6 @@ class ServerConfig(Config):
                 self.presence_router_config,
             ) = load_module(presence_router_config, ("presence", "presence_router"))
 
-        # whether to enable the media repository endpoints. This should be set
-        # to false if the media repository is running as a separate endpoint;
-        # doing so ensures that we will not run cache cleanup jobs on the
-        # master, potentially causing inconsistency.
-        self.enable_media_repo = config.get("enable_media_repo", True)
-
         # Whether to require authentication to retrieve profile data (avatars,
         # display names) of other users through the client API.
         self.require_auth_for_profile_requests = config.get(