Keep the legacy LDAP syntax in the documentation
This commit is contained in:
parent
1768e3eccb
commit
0b78bd7a42
1 changed files with 12 additions and 3 deletions
|
@ -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).
|
The filter must comply with [RFC 4515](http://tools.ietf.org/search/rfc4515).
|
||||||
|
|
||||||
```ruby
|
```ruby
|
||||||
# For omnibus-gitlab
|
# For omnibus packages; new LDAP server syntax
|
||||||
gitlab_rails['ldap_user_filter'] = '(employeeType=developer)'
|
|
||||||
gitlab_rails['ldap_servers'] = YAML.load <<-EOS
|
gitlab_rails['ldap_servers'] = YAML.load <<-EOS
|
||||||
main:
|
main:
|
||||||
# snip...
|
# snip...
|
||||||
user_filter: '(employeeType=developer)'
|
user_filter: '(employeeType=developer)'
|
||||||
EOS
|
EOS
|
||||||
|
|
||||||
|
# omnibus package; legacy syntax
|
||||||
|
gitlab_rails['ldap_user_filter'] = '(employeeType=developer)'
|
||||||
```
|
```
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
# For installations from source
|
# For installations from source; new LDAP server syntax
|
||||||
production:
|
production:
|
||||||
ldap:
|
ldap:
|
||||||
servers:
|
servers:
|
||||||
main:
|
main:
|
||||||
|
# snip...
|
||||||
user_filter: '(employeeType=developer)'
|
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:
|
Tip: if you want to limit access to the nested members of an Active Directory group you can use the following syntax:
|
||||||
|
|
Loading…
Reference in a new issue