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
Boxiang Sun
gitlab-ce
Commits
951bd2a4
Commit
951bd2a4
authored
Jun 12, 2017
by
Michael Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update more examples
parent
8bc20a8e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
config/gitlab.yml.example
config/gitlab.yml.example
+1
-1
doc/articles/how_to_configure_ldap_gitlab_ce/index.md
doc/articles/how_to_configure_ldap_gitlab_ce/index.md
+3
-2
No files found.
config/gitlab.yml.example
View file @
951bd2a4
...
@@ -709,7 +709,7 @@ test:
...
@@ -709,7 +709,7 @@ test:
host: 127.0.0.1
host: 127.0.0.1
port: 3890
port: 3890
uid: 'uid'
uid: 'uid'
method: 'plain' # "tls" or "ssl
" or "plain"
encryption: 'plain' # "start_tls" or "simple_tls
" or "plain"
base: 'dc=example,dc=com'
base: 'dc=example,dc=com'
user_filter: ''
user_filter: ''
group_base: 'ou=groups,dc=example,dc=com'
group_base: 'ou=groups,dc=example,dc=com'
...
...
doc/articles/how_to_configure_ldap_gitlab_ce/index.md
View file @
951bd2a4
...
@@ -120,7 +120,8 @@ gitlab_rails['ldap_servers'] = {
...
@@ -120,7 +120,8 @@ gitlab_rails['ldap_servers'] = {
'host' => 'ad.example.org',
'host' => 'ad.example.org',
'port' => 636,
'port' => 636,
'uid' => 'sAMAccountName',
'uid' => 'sAMAccountName',
'method' => 'ssl',
'encryption' => 'simple_tls',
'verify_certificates' => true,
'bind_dn' => 'CN=GitLabSRV,CN=Users,DC=GitLab,DC=org',
'bind_dn' => 'CN=GitLabSRV,CN=Users,DC=GitLab,DC=org',
'password' => 'Password1',
'password' => 'Password1',
'active_directory' => true,
'active_directory' => true,
...
@@ -255,7 +256,7 @@ If `allow_username_or_email_login` is enabled in the LDAP configuration, GitLab
...
@@ -255,7 +256,7 @@ If `allow_username_or_email_login` is enabled in the LDAP configuration, GitLab
## LDAP extended features on GitLab EE
## LDAP extended features on GitLab EE
With
[
GitLab Enterprise Edition (EE)
](
https://about.gitlab.com/gi
lt
ab-ee/
)
, besides everything we just described, you'll
With
[
GitLab Enterprise Edition (EE)
](
https://about.gitlab.com/gi
tl
ab-ee/
)
, besides everything we just described, you'll
have extended functionalities with LDAP, such as:
have extended functionalities with LDAP, such as:
-
Group sync
-
Group sync
...
...
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