summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-13 18:00:23 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-08-13 21:09:47 +0100
commitf4b49152e27593dd6c863e71479a2ab712c4ada2 (patch)
treec34f1fabee9818d6c26152c74ef522061efd46ac /synapse/config
parentName changelog after PR, not bug (diff)
downloadsynapse-f4b49152e27593dd6c863e71479a2ab712c4ada2.tar.xz
support admin_email config and pass through into blocking errors, return AuthError in all cases
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 3b078d72ca..64a5121a45 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -82,6 +82,10 @@ class ServerConfig(Config):
         self.hs_disabled = config.get("hs_disabled", False)
         self.hs_disabled_message = config.get("hs_disabled_message", "")
 
+        # Admin email to direct users at should their instance become blocked
+        # due to resource constraints
+        self.admin_email = config.get("admin_email", None)
+
         # FIXME: federation_domain_whitelist needs sytests
         self.federation_domain_whitelist = None
         federation_domain_whitelist = config.get(