kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Keep the legacy LDAP syntax in the documentation

Browse source
This commit is contained in:
Jacob Vosmaer 2014-10-20 16:22:36 +02:00
parent 1768e3eccb
commit 0b78bd7a42
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
doc/integration/ldap.md
View file

@ -24,21 +24,30 @@ 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)'
```