diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-01-21 13:17:07 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-01-21 13:17:07 +0000 |
| commit | b5120f09f14bd42a705b89ef793c427178decd85 (patch) | |
| tree | 7a3e55fdc2fd8dd1328179ab554be8985680c96b /docs | |
| parent | Use execute_batch instead of executemany in places (#9181) (diff) | |
| parent | Prefix idp_id with "oidc-" (#9189) (diff) | |
| download | synapse-b5120f09f14bd42a705b89ef793c427178decd85.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.26.0' into develop
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sample_config.yaml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index b49a5da8cc..87bfe22237 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1728,7 +1728,9 @@ saml2_config: # # idp_icon: An optional icon for this identity provider, which is presented # by identity picker pages. If given, must be an MXC URI of the format -# mxc://<server-name>/<media-id> +# mxc://<server-name>/<media-id>. (An easy way to obtain such an MXC URI +# is to upload an image to an (unencrypted) room and then copy the "url" +# from the source of the event.) # # discover: set to 'false' to disable the use of the OIDC discovery mechanism # to discover endpoints. Defaults to true. @@ -1814,13 +1816,16 @@ saml2_config: # # For backwards compatibility, it is also possible to configure a single OIDC # provider via an 'oidc_config' setting. This is now deprecated and admins are -# advised to migrate to the 'oidc_providers' format. +# advised to migrate to the 'oidc_providers' format. (When doing that migration, +# use 'oidc' for the idp_id to ensure that existing users continue to be +# recognised.) # oidc_providers: # Generic example # #- idp_id: my_idp # idp_name: "My OpenID provider" + # idp_icon: "mxc://example.com/mediaid" # discover: false # issuer: "https://accounts.example.com/" # client_id: "provided-by-your-issuer" @@ -1844,8 +1849,8 @@ oidc_providers: # For use with Github # - #- idp_id: google - # idp_name: Google + #- idp_id: github + # idp_name: Github # discover: false # issuer: "https://github.com/" # client_id: "your-client-id" # TO BE FILLED |