diff options
| author | Michael Kozono <mkozono@gmail.com> | 2017-06-12 10:17:49 -0700 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2017-07-26 02:43:40 -0700 |
| commit | 951bd2a43161206dbafe2a6099098e5fb48a6005 (patch) | |
| tree | eb6086189787948b23f27214e93d479930fb36dc | |
| parent | 8bc20a8e00111a1453e51d88fcf7520091b47d02 (diff) | |
| download | gitlab-ce-951bd2a43161206dbafe2a6099098e5fb48a6005.tar.gz | |
Update more examples
| -rw-r--r-- | config/gitlab.yml.example | 2 | ||||
| -rw-r--r-- | doc/articles/how_to_configure_ldap_gitlab_ce/index.md | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index f702e812955..106658ad12b 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -709,7 +709,7 @@ test: host: 127.0.0.1 port: 3890 uid: 'uid' - method: 'plain' # "tls" or "ssl" or "plain" + encryption: 'plain' # "start_tls" or "simple_tls" or "plain" base: 'dc=example,dc=com' user_filter: '' group_base: 'ou=groups,dc=example,dc=com' 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 |