diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-10-20 18:22:36 +0400 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-10-20 18:22:36 +0400 |
| commit | 0b78bd7a42a341bb227fb544b5b12abf8e152a41 (patch) | |
| tree | 30e643b09db06195e099866dfcaa9e78d1014d18 /doc/integration/ldap.md | |
| parent | 1768e3eccb91689405e411a3ebcb2622e16dcdd8 (diff) | |
Keep the legacy LDAP syntax in the documentation
Diffstat (limited to 'doc/integration/ldap.md')
| -rw-r--r-- | doc/integration/ldap.md | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/doc/integration/ldap.md b/doc/integration/ldap.md index a89c2d38779..869850d29d7 100644 --- a/doc/integration/ldap.md +++ b/doc/integration/ldap.md @@ -24,22 +24,31 @@ If you want to limit all GitLab access to a subset of the LDAP users on your LDA The filter must comply with [RFC 4515](http://tools.ietf.org/search/rfc4515). ```ruby -# For omnibus-gitlab -gitlab_rails['ldap_user_filter'] = '(employeeType=developer)' +# For omnibus packages; new LDAP server syntax gitlab_rails['ldap_servers'] = YAML.load <<-EOS main: # snip... user_filter: '(employeeType=developer)' EOS + +# omnibus package; legacy syntax +gitlab_rails['ldap_user_filter'] = '(employeeType=developer)' ``` ```yaml -# For installations from source +# For installations from source; new LDAP server syntax production: ldap: servers: main: + # snip... user_filter: '(employeeType=developer)' + +# installations from source; legacy syntax +production: + ldap: + # snip... + user_filter: '(employeeType=developer)' ``` Tip: if you want to limit access to the nested members of an Active Directory group you can use the following syntax: |