diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-09-14 09:05:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-14 09:05:36 -0400 |
| commit | 6605470bfb8944d369b8fc73195a380b95b6de9d (patch) | |
| tree | 5c95a32327b9f4d87ccfe003c843cae7ef4b5616 /docs | |
| parent | Add experimental support for sharding event persister. Again. (#8294) (diff) | |
| download | synapse-6605470bfb8944d369b8fc73195a380b95b6de9d.tar.xz | |
Improve SAML error messages (#8248)
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sample_config.yaml | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 2a5b2e0935..fb04ff283d 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1485,11 +1485,14 @@ trusted_key_servers: # At least one of `sp_config` or `config_path` must be set in this section to # enable SAML login. # -# (You will probably also want to set the following options to `false` to +# You will probably also want to set the following options to `false` to # disable the regular login/registration flows: # * enable_registration # * password_config.enabled # +# You will also want to investigate the settings under the "sso" configuration +# section below. +# # Once SAML support is enabled, a metadata file will be exposed at # https://<server>:<port>/_matrix/saml2/metadata.xml, which you may be able to # use to configure your SAML IdP with. Alternatively, you can manually configure @@ -1612,31 +1615,6 @@ saml2_config: # - attribute: department # value: "sales" - # Directory in which Synapse will try to find the template files below. - # If not set, default templates from within the Synapse package will be used. - # - # DO NOT UNCOMMENT THIS SETTING unless you want to customise the templates. - # If you *do* uncomment it, you will need to make sure that all the templates - # below are in the directory. - # - # Synapse will look for the following templates in this directory: - # - # * HTML page to display to users if something goes wrong during the - # authentication process: 'saml_error.html'. - # - # When rendering, this template is given the following variables: - # * code: an HTML error code corresponding to the error that is being - # returned (typically 400 or 500) - # - # * msg: a textual message describing the error. - # - # The variables will automatically be HTML-escaped. - # - # You can see the default templates at: - # https://github.com/matrix-org/synapse/tree/master/synapse/res/templates - # - #template_dir: "res/templates" - # OpenID Connect integration. The following settings can be used to make Synapse # use an OpenID Connect Provider for authentication, instead of its internal |