diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-09 10:16:16 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-09 10:16:16 +0100 |
| commit | 5785b93711da5e61cb6d446d090bb7daac5d61c8 (patch) | |
| tree | e7dc98431b7f52526f85439e785f58a51df89553 /synapse/config/server.py | |
| parent | Pull in necessary stores in federation_reader (diff) | |
| parent | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet (diff) | |
| download | synapse-5785b93711da5e61cb6d446d090bb7daac5d61c8.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_federation
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 6a471a0a5e..114d7a9815 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -69,12 +69,15 @@ class ServerConfig(Config): # Options to control access by tracking MAU self.limit_usage_by_mau = config.get("limit_usage_by_mau", False) + self.max_mau_value = 0 if self.limit_usage_by_mau: self.max_mau_value = config.get( "max_mau_value", 0, ) - else: - self.max_mau_value = 0 + self.mau_limits_reserved_threepids = config.get( + "mau_limit_reserved_threepids", [] + ) + # FIXME: federation_domain_whitelist needs sytests self.federation_domain_whitelist = None federation_domain_whitelist = config.get( |