diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-07-26 15:47:50 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-07-26 15:47:50 +0300 |
| commit | d29598e69190d6bc3a7d3cea44892d2db69d20e0 (patch) | |
| tree | 7b130b29dd5c4042846b51791ce1e09d7ea48326 /doc/articles | |
| parent | 5f35901a01ff822ba1e637251d9726a41e73ed17 (diff) | |
| parent | 2f825cad72cfc6fd25df3a57c5f3c138bb47f89d (diff) | |
Merge remote-tracking branch 'dev/master'
# Conflicts:
# Gemfile
# Gemfile.lock
Diffstat (limited to 'doc/articles')
| -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 |