summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Matos <lee@gitlab.com>2017-04-26 21:38:13 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-04-27 07:49:48 +0200
commitde16bc6d7296701a91143db2de76d4d3cada76bd (patch)
tree1c8a19fb9dcce1971f483910a2d6d908021aae6f
parentced7212e8722266eca275c9e61bdec861c889032 (diff)
downloadgitlab-ce-docs/ldap-clarify-uid.tar.gz
Update ldap.md to clarify uid should list the attribute not the valuedocs/ldap-clarify-uid
[ci skip]
-rw-r--r--doc/administration/auth/ldap.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md
index f6027b2f99e..725fc1f6076 100644
--- a/doc/administration/auth/ldap.md
+++ b/doc/administration/auth/ldap.md
@@ -65,14 +65,14 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
#
# Example: 'Paris' or 'Acme, Ltd.'
label: 'LDAP'
-
+
# Example: 'ldap.mydomain.com'
host: '_your_ldap_server'
# This port is an example, it is sometimes different but it is always an integer and not a string
port: 389
- uid: 'sAMAccountName'
+ uid: 'sAMAccountName' # This should be the attribute, not the value that maps to uid.
method: 'plain' # "tls" or "ssl" or "plain"
-
+
# Examples: 'america\\momo' or 'CN=Gitlab Git,CN=Users,DC=mydomain,DC=com'
bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
password: '_the_password_of_the_bind_user'