diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-15 13:52:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 13:52:25 +0000 |
| commit | 4601129c449824669d8f187f5da83124b522bc93 (patch) | |
| tree | 362d8bf8f2b049d8ce271ffbd3f64d3c910b4720 /synapse/config | |
| parent | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name (diff) | |
| parent | remove changelog referencing another PR (diff) | |
| download | synapse-4601129c449824669d8f187f5da83124b522bc93.tar.xz | |
Merge pull request #3687 from matrix-org/neilj/admin_email
support admin_email config and pass through into blocking errors,
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..2190f3210a 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 uri to direct users at should their instance become blocked + # due to resource constraints + self.admin_uri = config.get("admin_uri", None) + # FIXME: federation_domain_whitelist needs sytests self.federation_domain_whitelist = None federation_domain_whitelist = config.get( |