summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid <david@dcyou.fr>2016-10-10 13:33:48 +0000
committerDavid <david@dcyou.fr>2016-10-10 13:33:48 +0000
commit063aa5c9222da3cbbf88cb57ce18ac937b7deb26 (patch)
treee8e815b0120a7798bb8d68ed9d010868bba61cc6
parentb26a3d538178c82d4e7af2076ba999087225666c (diff)
downloadgitlab-ce-063aa5c9222da3cbbf88cb57ce18ac937b7deb26.tar.gz
add an other ldap configuration example
-rw-r--r--doc/administration/auth/ldap.md22
1 files changed, 21 insertions, 1 deletions
diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md
index bf7814875bf..9444357c53e 100644
--- a/doc/administration/auth/ldap.md
+++ b/doc/administration/auth/ldap.md
@@ -162,12 +162,32 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
EOS
```
+An other example:
+```ruby
+gitlab_rails['ldap_enabled'] = true
+gitlab_rails['ldap_servers'] = YAML.load <<-EOS # remember to close this block with 'EOS' below
+main: # 'main' is the GitLab 'provider ID' of this LDAP server
+ label: 'LDAP'
+ host: 'ldap.company.com'
+ port: 3288
+ uid: 'sAMAccountName'
+ method: 'plain' # "tls" or "ssl" or "plain"
+ bind_dn: 'america\\momo'
+ password: 'MYPASSWORD'
+ active_directory: true
+ allow_username_or_email_login: true
+ base: 'DC=company,DC=com'
+ user_filter: '(&(objectclass=user)(|(samaccountname=momo)(samaccountname=toto)))'
+EOS
+```
+
+
**Source configuration**
Use the same format as `gitlab_rails['ldap_servers']` for the contents under
`servers:` in the example below:
-```
+
production:
# snip...
ldap: