diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-09 11:42:02 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-09 11:42:02 +0100 |
commit | 3dce9050cf4b175bc84b5fa45f4c480ac5ddeec9 (patch) | |
tree | c371df3e91aa4e6c9c6d573a690e1ab7748def44 /synapse/config/server.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b... (diff) | |
parent | Merge pull request #3655 from matrix-org/neilj/disable_hs (diff) | |
download | synapse-3dce9050cf4b175bc84b5fa45f4c480ac5ddeec9.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_block
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 114d7a9815..3b078d72ca 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -78,6 +78,10 @@ class ServerConfig(Config): "mau_limit_reserved_threepids", [] ) + # Options to disable HS + self.hs_disabled = config.get("hs_disabled", False) + self.hs_disabled_message = config.get("hs_disabled_message", "") + # FIXME: federation_domain_whitelist needs sytests self.federation_domain_whitelist = None federation_domain_whitelist = config.get( |