summary refs log tree commit diff
path: root/docs/sample_config.yaml
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-03-10 18:42:15 +0000
committerGitHub <noreply@github.com>2020-03-10 18:42:15 +0000
commit6640460d054e8f4444046a34bdf638921b31c01e (patch)
tree065818deeadd4d46e0f14ba1023fd68b5aaf7dba /docs/sample_config.yaml
parentMerge pull request #7055 from matrix-org/babolivier/get_time_of_last_push_act... (diff)
parentRephrase default message (diff)
downloadsynapse-6640460d054e8f4444046a34bdf638921b31c01e.tar.xz
Merge pull request #7058 from matrix-org/babolivier/saml_error_html
SAML2: render a comprehensible error page if something goes wrong
Diffstat (limited to 'docs/sample_config.yaml')
-rw-r--r--docs/sample_config.yaml7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml

index 6f6f6fd54b..01957a90dd 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml
@@ -1347,6 +1347,13 @@ saml2_config: # #grandfathered_mxid_source_attribute: upn + # Path to a file containing HTML content to serve in case an error happens + # when the user gets redirected from the SAML IdP back to Synapse. + # If no file is provided, this defaults to some minimalistic HTML telling the + # user that something went wrong and they should try authenticating again. + # + #error_html_path: /path/to/static/content/saml_error.html + # Enable CAS for registration and login.