Default value for public_baseurl (#11210)

We might as well use a default value for `public_baseurl` based on
`server_name` - in many cases, it will be correct.
This commit is contained in:
Richard van der Hoff 2021-11-08 14:13:10 +00:00 committed by GitHub
parent 556a488209
commit 86a497efaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 62 additions and 73 deletions

View file

@ -34,8 +34,7 @@ class WellKnownBuilder:
self._config = hs.config
def get_well_known(self) -> Optional[JsonDict]:
# if we don't have a public_baseurl, we can't help much here.
if self._config.server.public_baseurl is None:
if not self._config.server.serve_client_wellknown:
return None
result = {"m.homeserver": {"base_url": self._config.server.public_baseurl}}