diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-08 14:33:17 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-08 14:33:17 +0000 |
commit | cc187debf3193054b736e7049ac2706f54c4de57 (patch) | |
tree | 3b9145795bff0076067070d7f1d4351cd7a622c3 /synapse/config | |
parent | Merge pull request #3633 from matrix-org/neilj/mau_tracker (diff) | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_u... (diff) | |
download | synapse-cc187debf3193054b736e7049ac2706f54c4de57.tar.xz |
Merge pull request #3662 from matrix-org/neilj/reserved_users
Reserved users for MAU limits
Diffstat (limited to 'synapse/config')
-rw-r--r-- | synapse/config/server.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 8fd2319759..114d7a9815 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -74,6 +74,9 @@ class ServerConfig(Config): self.max_mau_value = config.get( "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 |