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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
2fdd395a
Commit
2fdd395a
authored
Feb 11, 2016
by
Patricio Cano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implemented suggestions [ci skip]
parent
f7ee9261
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
12 deletions
+14
-12
doc/integration/ldap.md
doc/integration/ldap.md
+14
-12
No files found.
doc/integration/ldap.md
View file @
2fdd395a
...
...
@@ -125,7 +125,7 @@ Common combinations are `method: 'plain'` and `port: 389`, OR `method: 'ssl'` an
If you are using a GitLab installation from source you can find the LDAP settings in
`/home/git/gitlab/config/gitlab.yml`
:
```
```
yaml
production
:
# snip...
ldap
:
...
...
@@ -327,16 +327,18 @@ existing LDAP server should be named 'main'.
### 3. Add new LDAP servers
Now you can add new LDAP servers via
`/etc/gitlab/gitlab.rb`
(
o
mnibus packages)
Now you can add new LDAP servers via
`/etc/gitlab/gitlab.rb`
(
O
mnibus packages)
or
`gitlab.yml`
(installations from source).
Remember to run
`sudo gitlab-ctl reconfigure`
or
`sudo service gitlab reload`
Remember to
[
reconfigure
](
../../administration/restart_gitlab.md#omnibus-gitlab-reconfigure
)
or
[
restart
](
../../administration/restart_gitlab.md#installations-from-source
)
GitLab for Omnibus packages or installations from source respectively, in order
for the new servers to become available.
Tip:
you can assign labels to the different servers to give them human-friendly
**Tip:**
you can assign labels to the different servers to give them human-friendly
names.
```
```
yaml
ldap
:
servers
:
main
:
...
...
@@ -347,7 +349,7 @@ ldap:
**Omnibus**
```
```
ruby
gitlab_rails
[
'ldap_servers'
]
=
YAML
.
load
<<-
'EOS'
# remember to close this block with 'EOS' below
main: # 'main' is the GitLab 'provider ID' of this LDAP server
label: 'LDAP_1'
...
...
@@ -362,7 +364,7 @@ EOS
**Source**
```
```
yaml
ldap
:
servers
:
main
:
# 'main' is the GitLab 'provider ID' of this LDAP server
...
...
@@ -409,7 +411,7 @@ If you want a shorter or longer LDAP sync time, you can easily set this with the
For Omnibus package installations, simply add
`"sync_time"`
in
`/etc/gitlab/gitlab.rb`
to your LDAP config.
A typical LDAP configuration for GitLab installed with an Omnibus package might look like this:
```
```
ruby
gitlab_rails
[
'ldap_servers'
]
=
YAML
.
load
<<-
EOS
main:
label: 'LDAP'
...
...
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