diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-01-29 22:24:59 +0400 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-01-29 22:24:59 +0400 |
| commit | 4fdafcaf8a54ec32cc5510cc9e1ebebefb9b731b (patch) | |
| tree | e5bcf009a460967e094bb2f1f468e643ebb7f1c1 /config | |
| parent | 4f3876a2b6f3e0c14807058ba73336c1ebcb7613 (diff) | |
| parent | 969a4a8f7173eaa79f593b4a7d92df263f43d9c0 (diff) | |
Merge pull request #5842 from vikraman/patch-1
Add comment about tls for ldap method
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index da87deddec8..ce57465d687 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -124,7 +124,7 @@ production: &base base: '_the_base_where_you_search_for_users' port: 636 uid: 'sAMAccountName' - method: 'ssl' # "ssl" or "plain" + method: 'ssl' # "tls" or "ssl" or "plain" bind_dn: '_the_full_dn_of_the_user_you_will_bind_with' password: '_the_password_of_the_bind_user' # If allow_username_or_email_login is enabled, GitLab will ignore everything |