summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-08-24 16:51:27 +0100
committerErik Johnston <erik@matrix.org>2018-08-24 16:51:27 +0100
commit05077e06fa527a9b504e34bbd14af53ba66d3f62 (patch)
tree46b20a6a5a0e9ba4abde6f7d3602b3c03a83f375 /synapse/config
parentMerge pull request #3755 from matrix-org/erikj/fix_server_notice_tags (diff)
downloadsynapse-05077e06fa527a9b504e34bbd14af53ba66d3f62.tar.xz
Change admin_uri to admin_contact in config and errors
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/server.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 8eecd28e7d..2faf472189 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -93,7 +93,7 @@ class ServerConfig(Config):
 
         # Admin uri to direct users at should their instance become blocked
         # due to resource constraints
-        self.admin_uri = config.get("admin_uri", None)
+        self.admin_contact = config.get("admin_contact", None)
 
         # FIXME: federation_domain_whitelist needs sytests
         self.federation_domain_whitelist = None
@@ -357,7 +357,7 @@ class ServerConfig(Config):
           # Homeserver blocking
           #
           # How to reach the server admin, used in ResourceLimitError
-          # admin_uri: 'mailto:admin@server.com'
+          # admin_contact: 'mailto:admin@server.com'
           #
           # Global block config
           #