diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-15 16:31:40 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-15 16:31:40 +0100 |
| commit | fc5d937550816573bd151f5a322629d12846317d (patch) | |
| tree | 5d7e59799bd513718ea3f78431aa8c4c7ab087b3 /synapse/config/server.py | |
| parent | wip cut at sending resource server notices (diff) | |
| parent | Merge pull request #3653 from matrix-org/erikj/split_federation (diff) | |
| download | synapse-fc5d937550816573bd151f5a322629d12846317d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
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..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( |