diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-11-08 14:13:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-08 14:13:10 +0000 |
| commit | 86a497efaa60cf0e456103724c369e5172ea5485 (patch) | |
| tree | 2e07fa7cb1f4994a33fd901f20d97f7e36b3a474 /docs/sample_config.yaml | |
| parent | Address review feedback from #11269 (#11273) (diff) | |
| download | synapse-86a497efaa60cf0e456103724c369e5172ea5485.tar.xz | |
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.
Diffstat (limited to 'docs/sample_config.yaml')
| -rw-r--r-- | docs/sample_config.yaml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index c3a4148f74..d48c08f1d9 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -91,6 +91,8 @@ pid_file: DATADIR/homeserver.pid # Otherwise, it should be the URL to reach Synapse's client HTTP listener (see # 'listeners' below). # +# Defaults to 'https://<server_name>/'. +# #public_baseurl: https://example.com/ # Uncomment the following to tell other servers to send federation traffic on @@ -1265,7 +1267,7 @@ oembed: # in on this server. # # (By default, no suggestion is made, so it is left up to the client. -# This setting is ignored unless public_baseurl is also set.) +# This setting is ignored unless public_baseurl is also explicitly set.) # #default_identity_server: https://matrix.org @@ -1290,8 +1292,6 @@ oembed: # by the Matrix Identity Service API specification: # https://matrix.org/docs/spec/identity_service/latest # -# If a delegate is specified, the config option public_baseurl must also be filled out. -# account_threepid_delegates: #email: https://example.com # Delegate email sending to example.com #msisdn: http://localhost:8090 # Delegate SMS sending to this local process @@ -1981,11 +1981,10 @@ sso: # phishing attacks from evil.site. To avoid this, include a slash after the # hostname: "https://my.client/". # - # If public_baseurl is set, then the login fallback page (used by clients - # that don't natively support the required login flows) is whitelisted in - # addition to any URLs in this list. + # The login fallback page (used by clients that don't natively support the + # required login flows) is whitelisted in addition to any URLs in this list. # - # By default, this list is empty. + # By default, this list contains only the login fallback page. # #client_whitelist: # - https://riot.im/develop |