diff options
| author | Krombel <krombel@krombel.de> | 2017-06-21 14:48:21 +0200 |
|---|---|---|
| committer | Krombel <krombel@krombel.de> | 2017-06-21 14:48:21 +0200 |
| commit | 4202fba82a255eb52783a91d873b91aa8ef2191c (patch) | |
| tree | 73975e960b5a80f7a466cbf62810639662093d4a /synapse/config | |
| parent | replaced json.dumps with encode_canonical_json (diff) | |
| parent | Merge pull request #2292 from matrix-org/erikj/quarantine_media (diff) | |
| download | synapse-4202fba82a255eb52783a91d873b91aa8ef2191c.tar.xz | |
Merge branch 'develop' into avoid_duplicate_filters
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/server.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 3910b9dc31..28b4e5f50c 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -35,6 +35,10 @@ class ServerConfig(Config): # "disable" federation self.send_federation = config.get("send_federation", True) + # Whether to update the user directory or not. This should be set to + # false only if we are updating the user directory in a worker + self.update_user_directory = config.get("update_user_directory", True) + self.filter_timeline_limit = config.get("filter_timeline_limit", -1) if self.public_baseurl is not None: |