Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
0b78bd7a
Commit
0b78bd7a
authored
Oct 20, 2014
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Keep the legacy LDAP syntax in the documentation
parent
1768e3ec
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
doc/integration/ldap.md
doc/integration/ldap.md
+12
-3
No files found.
doc/integration/ldap.md
View file @
0b78bd7a
...
@@ -24,21 +24,30 @@ If you want to limit all GitLab access to a subset of the LDAP users on your LDA
...
@@ -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
)
.
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)'
# installations from source; legacy syntax
production
:
ldap
:
# snip...
user_filter
:
'
(employeeType=developer)'
user_filter
:
'
(employeeType=developer)'
```
```
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment