diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-14 14:51:38 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-14 14:51:38 +0100 |
| commit | 9b5bf3d8581408a417e680c3d5c118a368e51c20 (patch) | |
| tree | 8e024ada77d93f547913d23e9ad20885d3632c0d /synapse/config/server.py | |
| parent | Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei... (diff) | |
| parent | set admin email via config (diff) | |
| download | synapse-9b5bf3d8581408a417e680c3d5c118a368e51c20.tar.xz | |
Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
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 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( |