diff options
| author | Will Hunt <will@half-shot.uk> | 2020-09-28 11:11:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-28 11:11:57 +0100 |
| commit | 6201ea56eeae22258d58db2f7381f96759f5e85e (patch) | |
| tree | 37cb630a46fe96e416110de253ad50d256c0482e /docs/sample_config.yaml | |
| parent | Add support for device messages, start support for device lists (diff) | |
| parent | typo (diff) | |
| download | synapse-6201ea56eeae22258d58db2f7381f96759f5e85e.tar.xz | |
Merge branch 'develop' into hs/super-wip-edus-down-sync
Diffstat (limited to 'docs/sample_config.yaml')
| -rw-r--r-- | docs/sample_config.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index fb04ff283d..845f537795 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1689,6 +1689,11 @@ oidc_config: # #skip_verification: true + # Uncomment to allow a user logging in via OIDC to match a pre-existing account instead + # of failing. This could be used if switching from password logins to OIDC. Defaults to false. + # + #allow_existing_users: true + # An external module can be provided here as a custom solution to mapping # attributes returned from a OIDC provider onto a matrix user. # |