diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2017-04-28 22:50:52 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2017-04-28 22:50:52 +0000 |
| commit | c205973763e9fddd291a65d241002a0769f84106 (patch) | |
| tree | d385aae09ade45763b1adb617a3cdd767369fa22 /doc/administration | |
| parent | c3c465ace034d21764a11374902132eeed7a5f5b (diff) | |
| parent | de16bc6d7296701a91143db2de76d4d3cada76bd (diff) | |
| download | gitlab-ce-c205973763e9fddd291a65d241002a0769f84106.tar.gz | |
Merge branch 'docs/ldap-clarify-uid' into 'master'
Update ldap.md to clarify uid should list the attribute not the value
See merge request !10956
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/auth/ldap.md | 6 |
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' |