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

Update more examples

Browse source
This commit is contained in:
Michael Kozono 2017-06-12 10:17:49 -07:00
parent 8bc20a8e00
commit 951bd2a431
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/gitlab.yml.example
View file

@ -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'

5
doc/articles/how_to_configure_ldap_gitlab_ce/index.md
View file

@ -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
## LDAP extended features on GitLab EE ## LDAP extended features on GitLab EE
With [GitLab Enterprise Edition (EE)](https://about.gitlab.com/giltab-ee/), besides everything we just described, you'll With [GitLab Enterprise Edition (EE)](https://about.gitlab.com/gitlab-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