diff options
author | Alex Gleason <alex@alexgleason.me> | 2020-08-07 16:28:17 -0500 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2020-08-07 16:28:17 -0500 |
commit | 7b9f7471a36288f1084a34be020780cf530e8195 (patch) | |
tree | be9a6220b81702f07eb96a8fafae2e5a5178c412 /docs/configuration/cheatsheet.md | |
parent | 730bc616e38a90052a602ea7a6902f2baecf0845 (diff) | |
parent | 47698fc322da58894dd41c1bfd5ca0376200dc5e (diff) | |
download | pleroma-7b9f7471a36288f1084a34be020780cf530e8195.tar.gz |
Merge remote-tracking branch 'upstream/develop' into oauth-form
Diffstat (limited to 'docs/configuration/cheatsheet.md')
-rw-r--r-- | docs/configuration/cheatsheet.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index f23cf4fe4..ca587af8e 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -858,9 +858,6 @@ Warning: it's discouraged to use this feature because of the associated security ### :auth -* `Pleroma.Web.Auth.PleromaAuthenticator`: default database authenticator. -* `Pleroma.Web.Auth.LDAPAuthenticator`: LDAP authentication. - Authentication / authorization settings. * `auth_template`: authentication form template. By default it's `show.html` which corresponds to `lib/pleroma/web/templates/o_auth/o_auth/show.html.eex`. @@ -890,6 +887,9 @@ Pleroma account will be created with the same name as the LDAP user name. * `base`: LDAP base, e.g. "dc=example,dc=com" * `uid`: LDAP attribute name to authenticate the user, e.g. when "cn", the filter will be "cn=username,base" +Note, if your LDAP server is an Active Directory server the correct value is commonly `uid: "cn"`, but if you use an +OpenLDAP server the value may be `uid: "uid"`. + ### OAuth consumer mode OAuth consumer mode allows sign in / sign up via external OAuth providers (e.g. Twitter, Facebook, Google, Microsoft, etc.). |