diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-08-27 11:49:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-27 11:49:59 +0100 |
| commit | 7837a5f2eaa795d2865c00d520dc41c502b1f8bd (patch) | |
| tree | a7e4d74e5b91075a50f2de93d7a9b277ddf9ea4b | |
| parent | Add Admin API capability to set adminship of a user (#5878) (diff) | |
| parent | Add changelog (diff) | |
| download | synapse-7837a5f2eaa795d2865c00d520dc41c502b1f8bd.tar.xz | |
Merge pull request #5909 from aaronraimist/public_base_url
public_base_url is actually public_baseurl
| -rw-r--r-- | changelog.d/5909.misc | 1 | ||||
| -rw-r--r-- | synapse/config/emailconfig.py | 2 | ||||
| -rw-r--r-- | synapse/rest/well_known.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/5909.misc b/changelog.d/5909.misc new file mode 100644 index 0000000000..73e35cc48d --- /dev/null +++ b/changelog.d/5909.misc @@ -0,0 +1 @@ +Fix error message which referred to public_base_url instead of public_baseurl. diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py index 36d01a10af..f83c05df44 100644 --- a/synapse/config/emailconfig.py +++ b/synapse/config/emailconfig.py @@ -115,7 +115,7 @@ class EmailConfig(Config): missing.append("email." + k) if config.get("public_baseurl") is None: - missing.append("public_base_url") + missing.append("public_baseurl") if len(missing) > 0: raise RuntimeError( diff --git a/synapse/rest/well_known.py b/synapse/rest/well_known.py index 5e8fda4b65..20177b44e7 100644 --- a/synapse/rest/well_known.py +++ b/synapse/rest/well_known.py @@ -34,7 +34,7 @@ class WellKnownBuilder(object): self._config = hs.config 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: return None |