Commit 4fdafcaf8a54ec32cc5510cc9e1ebebefb9b731b

Authored by Jacob Vosmaer
2 parents 4f3876a2 969a4a8f

Merge pull request #5842 from vikraman/patch-1

Add comment about tls for ldap method
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
config/gitlab.yml.example
@@ -124,7 +124,7 @@ production: &base @@ -124,7 +124,7 @@ production: &base
124 base: '_the_base_where_you_search_for_users' 124 base: '_the_base_where_you_search_for_users'
125 port: 636 125 port: 636
126 uid: 'sAMAccountName' 126 uid: 'sAMAccountName'
127 - method: 'ssl' # "ssl" or "plain" 127 + method: 'ssl' # "tls" or "ssl" or "plain"
128 bind_dn: '_the_full_dn_of_the_user_you_will_bind_with' 128 bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
129 password: '_the_password_of_the_bind_user' 129 password: '_the_password_of_the_bind_user'
130 # If allow_username_or_email_login is enabled, GitLab will ignore everything 130 # If allow_username_or_email_login is enabled, GitLab will ignore everything