summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-03-26 19:01:54 +0100
committerBrendan Abolivier <babolivier@matrix.org>2020-03-26 19:01:54 +0100
commit7083147961d7bc45ce49047c4878da2bf5202f79 (patch)
tree58ba142d060a8c0c06cb776873dc2e08f91cb019
parentWhitelist the login fallback by default for SSO (diff)
downloadsynapse-7083147961d7bc45ce49047c4878da2bf5202f79.tar.xz
Regenerate sample config
-rw-r--r--docs/sample_config.yaml6
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index 2ff0dd05a2..556d4419f5 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -1392,7 +1392,11 @@ sso:
     # phishing attacks from evil.site. To avoid this, include a slash after the
     # hostname: "https://my.client/".
     #
-    # By default, this list is empty.
+    # If public_baseurl is set, then the login fallback page (used by clients
+    # that don't have full support for SSO) is always included in this list.
+    #
+    # By default, this list is empty, except if public_baseurl is set (in which
+    # case the login fallback page is the only element in the list).
     #
     #client_whitelist:
     #  - https://riot.im/develop