summaryrefslogtreecommitdiff
path: root/docs/configuration/cheatsheet.md
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-08-07 20:59:44 +0000
committerlain <lain@soykaf.club>2020-08-07 20:59:44 +0000
commit47698fc322da58894dd41c1bfd5ca0376200dc5e (patch)
tree0ad164ee09bba1a82560d192d71d14033f70b195 /docs/configuration/cheatsheet.md
parent39ca4a23c6c4a6cac9b277b8473ab9040a250e68 (diff)
parent54e2af829377b3f21823548e5612bbbb41550432 (diff)
downloadpleroma-47698fc322da58894dd41c1bfd5ca0376200dc5e.tar.gz
pleroma-47698fc322da58894dd41c1bfd5ca0376200dc5e.zip
Merge branch 'fix/ldap-auth-issues' into 'develop'
Fix LDAP auth issues Closes #1646 See merge request pleroma/pleroma!2852
Diffstat (limited to 'docs/configuration/cheatsheet.md')
-rw-r--r--docs/configuration/cheatsheet.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index 89036ded0..ca587af8e 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -887,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.).