diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-13 18:00:23 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-13 18:00:23 +0100 |
| commit | 0d43f991a19840a224d3dac78d79f13d78212ee6 (patch) | |
| tree | 778eca81a206707ccf0d8596f8744f71f25233f9 /synapse/config | |
| parent | Run tests under PostgreSQL (#3423) (diff) | |
| download | synapse-0d43f991a19840a224d3dac78d79f13d78212ee6.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.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( |