MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-14 20:53:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5909 from aaronraimist/public_base_url

Browse source 
public_base_url is actually public_baseurl
This commit is contained in:
Richard van der Hoff 2019-08-27 11:49:59 +01:00 committed by GitHub
commit 7837a5f2ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/5909.misc Normal file
View file

@ -0,0 +1 @@
Fix error message which referred to public_base_url instead of public_baseurl.

2
synapse/config/emailconfig.py
View file

@ -115,7 +115,7 @@ class EmailConfig(Config):
missing.append("email." + k) missing.append("email." + k)
if config.get("public_baseurl") is None: if config.get("public_baseurl") is None:
missing.append("public_base_url") missing.append("public_baseurl")
if len(missing) > 0: if len(missing) > 0:
raise RuntimeError( raise RuntimeError(

2
synapse/rest/well_known.py
View file

@ -34,7 +34,7 @@ class WellKnownBuilder(object):
self._config = hs.config self._config = hs.config
def get_well_known(self): def get_well_known(self):
# if we don't have a public_base_url, we can't help much here. # if we don't have a public_baseurl, we can't help much here.
if self._config.public_baseurl is None: if self._config.public_baseurl is None:
return None return None