diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2017-11-30 01:51:38 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2017-11-30 01:51:38 +0000 |
| commit | f397153dfc4020744e1cf8687abb01d4b7885a7a (patch) | |
| tree | 342da238d1e7de6178731ad6a040bf9c3de16ce1 /synapse/config | |
| parent | specify default user_directory_include_pattern (diff) | |
| parent | Merge pull request #2721 from matrix-org/rav/get_user_by_access_token_comments (diff) | |
| download | synapse-f397153dfc4020744e1cf8687abb01d4b7885a7a.tar.xz | |
Merge branch 'develop' into matthew/search-all-local-users
Diffstat (limited to 'synapse/config')
| -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 |