diff options
| author | Erik Johnston <erikj@jki.re> | 2018-08-24 17:15:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 17:15:32 +0100 |
| commit | 9fbaed325f7e3ed4edff25636043b885b1cf388d (patch) | |
| tree | 5eb84f8afc267ba3af4199e3da3f9a4d17bbdb0b /synapse/config | |
| parent | Merge pull request #3756 from matrix-org/erikj/fix_tags_server_notices (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact (diff) | |
| download | synapse-9fbaed325f7e3ed4edff25636043b885b1cf388d.tar.xz | |
Merge pull request #3758 from matrix-org/erikj/admin_contact hhs-3
Change admin_uri to admin_contact in config and errors
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/server.py | 4 |
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 # |