summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-08-03 16:22:58 -0700
committerAndrew Morgan <andrew@amorgan.xyz>2020-08-03 16:22:58 -0700
commit6553158b20f21bc281db1eea238e2cc064886eaf (patch)
tree563a7a5eef2370df9dd857e58f2e8fa601581786 /synapse/config
parentMerge commit '434716e1d' into dinsic (diff)
parentSupport running multiple media repos. (#7706) (diff)
downloadsynapse-6553158b20f21bc281db1eea238e2cc064886eaf.tar.xz
Merge commit 'b44bdd7f7' into dinsic
* commit 'b44bdd7f7':
  Support running multiple media repos. (#7706)
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/repository.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/config/repository.py b/synapse/config/repository.py

index 0ad09feef4..54f565ad5b 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py
@@ -94,6 +94,12 @@ class ContentRepositoryConfig(Config): else: self.can_load_media_repo = True + # Whether this instance should be the one to run the background jobs to + # e.g clean up old URL previews. + self.media_instance_running_background_jobs = config.get( + "media_instance_running_background_jobs", + ) + self.max_upload_size = self.parse_size(config.get("max_upload_size", "10M")) self.max_image_pixels = self.parse_size(config.get("max_image_pixels", "32M")) self.max_spider_size = self.parse_size(config.get("max_spider_size", "10M"))