diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2021-02-11 11:56:03 -0500 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2021-02-11 11:56:03 -0500 |
| commit | 2c9b4a5f16b7950e7ebb2e5f445e7ae925e61113 (patch) | |
| tree | 78e2159e896bb99e7585739c2ed2e4488447bda7 /synapse/config/server.py | |
| parent | Ensure that we never stop reconnecting to redis (#9391) (diff) | |
| parent | Clarify when new ratelimiting was added. (diff) | |
| download | synapse-2c9b4a5f16b7950e7ebb2e5f445e7ae925e61113.tar.xz | |
Merge tag 'v1.27.0rc2' into develop
Synapse 1.27.0rc2 (2021-02-11) ============================== Features -------- - Further improvements to the user experience of registration via single sign-on. ([\#9297](https://github.com/matrix-org/synapse/issues/9297)) Bugfixes -------- - Fix ratelimiting introduced in v1.27.0rc1 for invites to respect the `ratelimit` flag on application services. ([\#9302](https://github.com/matrix-org/synapse/issues/9302)) - Do not automatically calculate `public_baseurl` since it can be wrong in some situations. Reverts behaviour introduced in v1.26.0. ([\#9313](https://github.com/matrix-org/synapse/issues/9313)) Improved Documentation ---------------------- - Clarify the sample configuration for changes made to the template loading code. ([\#9310](https://github.com/matrix-org/synapse/issues/9310))
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index b5e82ba3d0..a635b8a7dc 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -230,11 +230,7 @@ class ServerConfig(Config): self.print_pidfile = config.get("print_pidfile") self.user_agent_suffix = config.get("user_agent_suffix") self.use_frozen_dicts = config.get("use_frozen_dicts", False) - self.public_baseurl = config.get("public_baseurl") or "https://%s/" % ( - self.server_name, - ) - if self.public_baseurl[-1] != "/": - self.public_baseurl += "/" + self.public_baseurl = config.get("public_baseurl") # Whether to enable user presence. self.use_presence = config.get("use_presence", True) @@ -386,6 +382,9 @@ class ServerConfig(Config): config_path=("federation_ip_range_blacklist",), ) + if self.public_baseurl is not None: + if self.public_baseurl[-1] != "/": + self.public_baseurl += "/" self.start_pushers = config.get("start_pushers", True) # (undocumented) option for torturing the worker-mode replication a bit, @@ -813,10 +812,6 @@ class ServerConfig(Config): # Otherwise, it should be the URL to reach Synapse's client HTTP listener (see # 'listeners' below). # - # If this is left unset, it defaults to 'https://<server_name>/'. (Note that - # that will not work unless you configure Synapse or a reverse-proxy to listen - # on port 443.) - # #public_baseurl: https://example.com/ # Set the soft limit on the number of file descriptors synapse can use |