diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-12-05 21:00:43 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-12-05 21:00:43 +0000 |
| commit | e126d83f7401456152e07042f8e8b7587adfe1b4 (patch) | |
| tree | fc1a5fcabb0c4094166070cfd5d802cf2cd35546 /synapse/config/registration.py | |
| parent | Merge branch 'develop' into babolivier/msc1802 (diff) | |
| parent | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925) (diff) | |
| download | synapse-e126d83f7401456152e07042f8e8b7587adfe1b4.tar.xz | |
Merge branch 'develop' into babolivier/msc1802
Diffstat (limited to 'synapse/config/registration.py')
| -rw-r--r-- | synapse/config/registration.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py index 1f6dac69da..ee9614c5f7 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -106,6 +106,13 @@ class RegistrationConfig(Config): account_threepid_delegates = config.get("account_threepid_delegates") or {} self.account_threepid_delegate_email = account_threepid_delegates.get("email") self.account_threepid_delegate_msisdn = account_threepid_delegates.get("msisdn") + if self.account_threepid_delegate_msisdn and not self.public_baseurl: + raise ConfigError( + "The configuration option `public_baseurl` is required if " + "`account_threepid_delegate.msisdn` is set, such that " + "clients know where to submit validation tokens to. Please " + "configure `public_baseurl`." + ) self.default_identity_server = config.get("default_identity_server") self.allow_guest_access = config.get("allow_guest_access", False) |