maxmustermann/synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'release-v1.3.0' of github.com:matrix-org/synapse into matrix-org-hotfixes

Browse source
This commit is contained in:
Brendan Abolivier 2019-08-13 17:39:30 +01:00
parent a7efbc5416 3039be82ce
commit 8d5762b0dc
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/5848.feature Normal file
View file

@ -0,0 +1 @@
Synapse will no longer serve any media repo admin endpoints when `enable_media_repo` is set to False in the configuration. If a media repo worker is used, the admin APIs relating to the media repo will be served from it instead.

2
synapse/config/repository.py
View file

@ -93,7 +93,7 @@ class ContentRepositoryConfig(Config):
# current worker app is the media repo.
if (
self.enable_media_repo is False
and config.worker_app != "synapse.app.media_repository"
and config.get("worker_app") != "synapse.app.media_repository"
):
self.can_load_media_repo = False
return