Commit 030a71b7 authored by Job van der Voort's avatar Job van der Voort

use new syntax in ldap doc

parent 230900b9
...@@ -301,25 +301,25 @@ For Omnibus package installations, simply add `"sync_time"` in `/etc/gitlab/gitl ...@@ -301,25 +301,25 @@ For Omnibus package installations, simply add `"sync_time"` in `/etc/gitlab/gitl
A typical LDAP configuration for GitLab installed with an Omnibus package might look like this: A typical LDAP configuration for GitLab installed with an Omnibus package might look like this:
``` ```
gitlab_rails['ldap_servers'] = [ gitlab_rails['ldap_servers'] = YAML.load <<-EOS
{ main:
"id" => "main", label: 'LDAP'
"label" => "LDAP", host: '_your_ldap_server'
"host" => "hostname of LDAP server", port: 636
"port" => 389, uid: 'sAMAccountName'
"uid" => "sAMAccountName", method: 'ssl' # "tls" or "ssl" or "plain"
"method" => "plain", # 'ssl' or 'plain' bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
"bind_dn" => "CN=query user,CN=Users,DC=mycorp,DC=com", password: '_the_password_of_the_bind_user'
"password" => "query user password", active_directory: true
"active_directory" => true, allow_username_or_email_login: false
"allow_username_or_email_login" => true, base: ''
"base" => "DC=mycorp,DC=com", user_filter: ''
"group_base" => "OU=groups,DC=mycorp,DC=com", sync_time: 1800
"admin_group" => "", ## EE only
"sync_ssh_keys" => false, group_base: ''
"sync_time" => 1800 admin_group: ''
} sync_ssh_keys: false
] EOS
``` ```
Here, `sync_time` is set to `1800` seconds, meaning the LDAP cache will expire every 30 minutes. Here, `sync_time` is set to `1800` seconds, meaning the LDAP cache will expire every 30 minutes.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment