summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAaron Raimist <aaron@raim.ist>2019-08-26 21:01:47 -0500
committerAaron Raimist <aaron@raim.ist>2019-08-26 21:01:56 -0500
commite8e3e033eea2947c3746005f876afca55c601f1d (patch)
tree5348d0faab37d35ff1247ee6a0d44350494fee42 /synapse
parentPropagate opentracing contexts through EDUs (#5852) (diff)
downloadsynapse-e8e3e033eea2947c3746005f876afca55c601f1d.tar.xz
public_base_url is actually public_baseurl
Signed-off-by: Aaron Raimist <aaron@raim.ist>
Diffstat (limited to 'synapse')
-rw-r--r--synapse/config/emailconfig.py2
-rw-r--r--synapse/rest/well_known.py2
2 files changed, 2 insertions, 2 deletions
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