summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorVikraman Choudhury <vikraman.choudhury@gmail.com>2013-12-13 22:16:58 +0530
committerVikraman Choudhury <vikraman.choudhury@gmail.com>2013-12-13 22:16:58 +0530
commit969a4a8f7173eaa79f593b4a7d92df263f43d9c0 (patch)
treefd57475385811616bd44985dbb83f7cd3f413e6d /config
parentee53b73986ba4c9dd2f0c726a44718acb8febaf8 (diff)
downloadgitlab-ce-969a4a8f7173eaa79f593b4a7d92df263f43d9c0.tar.gz
Add comment about tls for ldap method
`omniauth-ldap` also supports tls for ldap method
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 2bc984c9294..f6d1a3c9e80 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'
allow_username_or_email_login: true