summaryrefslogtreecommitdiff
path: root/doc/integration/ldap.md
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-10-20 16:18:45 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-10-20 16:18:45 +0200
commit1768e3eccb91689405e411a3ebcb2622e16dcdd8 (patch)
tree97a982c59a2b186d29f177fe0ca436df2c78b49e /doc/integration/ldap.md
parent72abe9f679043a1ac566f60109b21cadace204d7 (diff)
downloadgitlab-ce-1768e3eccb91689405e411a3ebcb2622e16dcdd8.tar.gz
Update the documentation for the LDAP user filter
Diffstat (limited to 'doc/integration/ldap.md')
-rw-r--r--doc/integration/ldap.md9
1 files changed, 8 insertions, 1 deletions
diff --git a/doc/integration/ldap.md b/doc/integration/ldap.md
index ee472ac3e3b..a89c2d38779 100644
--- a/doc/integration/ldap.md
+++ b/doc/integration/ldap.md
@@ -26,13 +26,20 @@ The filter must comply with [RFC 4515](http://tools.ietf.org/search/rfc4515).
```ruby
# For omnibus-gitlab
gitlab_rails['ldap_user_filter'] = '(employeeType=developer)'
+gitlab_rails['ldap_servers'] = YAML.load <<-EOS
+main:
+ # snip...
+ user_filter: '(employeeType=developer)'
+EOS
```
```yaml
# For installations from source
production:
ldap:
- user_filter: '(employeeType=developer)'
+ servers:
+ main:
+ 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: