diff options
| author | Erik Johnston <erik@matrix.org> | 2017-07-06 10:36:25 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-07-06 10:36:25 +0100 |
| commit | 42b50483be2b022735f8ae2107314d51e92e8471 (patch) | |
| tree | 6b41c2096b105f04244ce80e840d0f998dbe226f /synapse/config/server.py | |
| parent | Merge pull request #2282 from matrix-org/release-v0.21.1 (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-42b50483be2b022735f8ae2107314d51e92e8471.tar.xz | |
Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse v0.22.0
Diffstat (limited to 'synapse/config/server.py')
| -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: |