summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-08-03 11:22:22 +0100
committerBrendan Abolivier <babolivier@matrix.org>2020-08-03 11:22:22 +0100
commit1678057b56a82467c25259d4727a69097dad0ea3 (patch)
tree1659a57559aecc766616a3d00c6c15972382037d /synapse/config
parentFix cache name (diff)
downloadsynapse-1678057b56a82467c25259d4727a69097dad0ea3.tar.xz
Back out the database hack and replace it with a temporary config setting
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/server.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py

index 848587d232..68d143410f 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py
@@ -530,6 +530,16 @@ class ServerConfig(Config): "request_token_inhibit_3pid_errors", False, ) + # List of users trialing the new experimental default push rules. This setting is + # not included in the sample configuration file on purpose as it's a temporary + # hack, so that some users can trial the new defaults without impacting every + # user on the homeserver. + self.users_new_default_push_rules = ( + config.get("users_new_default_push_rules") or [] + ) + if not isinstance(self.users_new_default_push_rules, list): + raise ConfigError("'users_new_default_push_rules' must be a list") + def has_tls_listener(self) -> bool: return any(listener.tls for listener in self.listeners)