summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-09 10:41:43 +0000
committerGitHub <noreply@github.com>2018-08-09 10:41:43 +0000
commit0ad98e38d0c5f6fde18032551cccb291659b9204 (patch)
tree925f1657770ba47599169763dc1be02b6156923d /synapse/config
parentMerge branch 'master' into develop (diff)
parentfix pep8 too many lines (diff)
downloadsynapse-0ad98e38d0c5f6fde18032551cccb291659b9204.tar.xz
Merge pull request #3655 from matrix-org/neilj/disable_hs
Flag to disable HS without disabling federation
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/server.py4
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(