summary refs log tree commit diff
path: root/synapse/app
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/app
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 'synapse/app')
-rw-r--r--synapse/app/homeserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 2b111847b7..e114ab7ec4 100644
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -217,7 +217,7 @@ class SynapseHomeServer(HomeServer):
             )
 
         if name in ["media", "federation", "client"]:
-            if self.config.server.enable_media_repo:
+            if self.config.media.can_load_media_repo:
                 media_repo = self.get_media_repository_resource()
                 resources.update(
                     {