diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-07-26 12:42:12 +0000 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-07-26 14:54:15 +0200 |
commit | 5e93a42b5d3bfda8de54de7b703f52e8dab39ed8 (patch) | |
tree | 6c7260440b368ea63786f8717b05c34743cd54ef /doc/articles/how_to_configure_ldap_gitlab_ce/index.md | |
parent | 6678b4e5a64696f70f88345f1b9d93def9912fa2 (diff) | |
download | gitlab-ce-5e93a42b5d3bfda8de54de7b703f52e8dab39ed8.tar.gz |
Merge branch 'mk-add-ldap-ssl-certificate-verification' into 'master'add-ldap-ssl-certificate-verification-9-4
Add LDAP SSL certificate verification
See merge request !2115
# Conflicts:
# Gemfile.lock
Diffstat (limited to 'doc/articles/how_to_configure_ldap_gitlab_ce/index.md')
-rw-r--r-- | doc/articles/how_to_configure_ldap_gitlab_ce/index.md | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/articles/how_to_configure_ldap_gitlab_ce/index.md b/doc/articles/how_to_configure_ldap_gitlab_ce/index.md index 6892905dd94..130e8f542b4 100644 --- a/doc/articles/how_to_configure_ldap_gitlab_ce/index.md +++ b/doc/articles/how_to_configure_ldap_gitlab_ce/index.md @@ -120,7 +120,8 @@ gitlab_rails['ldap_servers'] = { 'host' => 'ad.example.org', 'port' => 636, 'uid' => 'sAMAccountName', - 'method' => 'ssl', + 'encryption' => 'simple_tls', + 'verify_certificates' => true, 'bind_dn' => 'CN=GitLabSRV,CN=Users,DC=GitLab,DC=org', 'password' => 'Password1', '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 -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: - Group sync |