diff options
| author | David Robertson <davidr@element.io> | 2021-11-17 14:19:27 +0000 |
|---|---|---|
| committer | David Robertson <davidr@element.io> | 2021-11-17 14:19:27 +0000 |
| commit | 077b74929f8f412395d1156e1b97eb16701059fa (patch) | |
| tree | 25ecb8e93ec3ba275596bfb31efa45018645d47b /synapse/config/registration.py | |
| parent | Correct target of link to the modules page from the Password Auth Providers p... (diff) | |
| parent | 1.47.0 (diff) | |
| download | synapse-077b74929f8f412395d1156e1b97eb16701059fa.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.47'
Diffstat (limited to 'synapse/config/registration.py')
| -rw-r--r-- | synapse/config/registration.py | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py index a3d2a38c4c..5379e80715 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -45,17 +45,6 @@ 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.root.server.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) @@ -240,7 +229,7 @@ class RegistrationConfig(Config): # 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.) + # This setting is ignored unless public_baseurl is also explicitly set.) # #default_identity_server: https://matrix.org @@ -265,8 +254,6 @@ class RegistrationConfig(Config): # by the Matrix Identity Service API specification: # https://matrix.org/docs/spec/identity_service/latest # - # If a delegate is specified, the config option public_baseurl must also be filled out. - # account_threepid_delegates: #email: https://example.com # Delegate email sending to example.com #msisdn: http://localhost:8090 # Delegate SMS sending to this local process |