Make 'plain', port 389 the default for LDAP

087c4cbc · Jacob Vosmaer · 43da3f09 · 087c4cbc · 087c4cbc
Commit 087c4cbc authored Jan 28, 2015 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

config/gitlab.yml.example config/gitlab.yml.example +2 -2

doc/integration/ldap.md doc/integration/ldap.md +2 -2

No files found.
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -153,9 +153,9 @@ production: &base
        label: 'LDAP'
        host: '_your_ldap_server'
-        port: 636
+        port: 389
        uid: 'sAMAccountName'
-        method: 'ssl' # "tls" or "ssl" or "plain"
+        method: 'plain' # "tls" or "ssl" or "plain"
        bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
        password: '_the_password_of_the_bind_user'

--- a/doc/integration/ldap.md
+++ b/doc/integration/ldap.md
@@ -29,9 +29,9 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
  label: 'LDAP'
  host: '_your_ldap_server'
-  port: 636
+  port: 389
  uid: 'sAMAccountName'
-  method: 'ssl' # "tls" or "ssl" or "plain"
+  method: 'plain' # "tls" or "ssl" or "plain"
  bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
  password: '_the_password_of_the_bind_user'