diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-12-05 14:38:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-05 14:38:58 +0100 |
| commit | e8d98466b0d29abd3604470af9f10134f3373506 (patch) | |
| tree | 4f94c471e9de69cff6867c328797dbd3c2f06c46 /synapse/config | |
| parent | Merge pull request #4260 from matrix-org/rav/python3 (diff) | |
| download | synapse-e8d98466b0d29abd3604470af9f10134f3373506.tar.xz | |
Implement .well-known handling (#4262)
Sometimes it's useful for synapse to generate its own .well-known file.
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/registration.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py index 717bbfec61..e365f0c30b 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -37,6 +37,7 @@ class RegistrationConfig(Config): self.bcrypt_rounds = config.get("bcrypt_rounds", 12) self.trusted_third_party_id_servers = config["trusted_third_party_id_servers"] + self.default_identity_server = config.get("default_identity_server") self.allow_guest_access = config.get("allow_guest_access", False) self.invite_3pid_guest = ( @@ -91,6 +92,14 @@ class RegistrationConfig(Config): # accessible to anonymous users. allow_guest_access: False + # The identity server which we suggest that clients should use when users log + # in on this server. + # + # (By default, no suggestion is made, so it is left up to the client. + # This setting is ignored unless public_baseurl is also set.) + # + # default_identity_server: https://matrix.org + # The list of identity servers trusted to verify third party # identifiers by this server. # |