diff options
| author | Travis Ralston <travpc@gmail.com> | 2019-01-29 09:06:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-29 09:06:16 -0700 |
| commit | d02c5ccb1128a8fa6796e207cff09b535cce6e66 (patch) | |
| tree | 2e0179b2848e552b760c7a7886d29a3e403d6c71 | |
| parent | Do not generate self-signed TLS certificates by default. (#4509) (diff) | |
| parent | Create 4498.misc (diff) | |
| download | synapse-d02c5ccb1128a8fa6796e207cff09b535cce6e66.tar.xz | |
Merge pull request #4498 from matrix-org/travis/fix-docs-public_baseurl
Don't recommend :8448 to people on public_baseurl
| -rw-r--r-- | changelog.d/4498.misc | 1 | ||||
| -rw-r--r-- | synapse/config/server.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/4498.misc b/changelog.d/4498.misc new file mode 100644 index 0000000000..8b3bc94a34 --- /dev/null +++ b/changelog.d/4498.misc @@ -0,0 +1 @@ +Clarify documentation for the `public_baseurl` config param diff --git a/synapse/config/server.py b/synapse/config/server.py index 22dcc87d8a..268a43ff00 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -261,7 +261,7 @@ class ServerConfig(Config): # enter into the 'custom HS URL' field on their client. If you # use synapse with a reverse proxy, this should be the URL to reach # synapse via the proxy. - # public_baseurl: https://example.com:8448/ + # public_baseurl: https://example.com/ # Set the soft limit on the number of file descriptors synapse can use # Zero is used to indicate synapse should set the soft limit to the |