diff options
| author | Erik Johnston <erik@matrix.org> | 2018-01-05 10:54:22 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-01-05 10:54:22 +0000 |
| commit | 18e3a16e8b2303e6b638f679b5b8533e329cbe7a (patch) | |
| tree | 93b4f34678d9521e39d54585d6adc66319514bcd /synapse/config/server.py | |
| parent | Merge pull request #2737 from Valodim/master (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-18e3a16e8b2303e6b638f679b5b8533e329cbe7a.tar.xz | |
Merge branch 'release-v0.26.0' of github.com:matrix-org/synapse v0.26.0
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 4d9193536d..edb90a1348 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -41,6 +41,12 @@ class ServerConfig(Config): # false only if we are updating the user directory in a worker self.update_user_directory = config.get("update_user_directory", True) + # 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) + self.filter_timeline_limit = config.get("filter_timeline_limit", -1) # Whether we should block invites sent to users on this server |