diff options
| author | Job van der Voort <job@gitlab.com> | 2015-01-28 18:24:30 +0000 |
|---|---|---|
| committer | Job van der Voort <job@gitlab.com> | 2015-01-28 18:24:30 +0000 |
| commit | 5914c7e1b7aed690430a4340b3ed47d5dbe88425 (patch) | |
| tree | a231d8be835a43a930fde6fb7cd8a089a8488202 /config | |
| parent | 8eb365c0a04b912d2e10eb16adeeb4216563be2c (diff) | |
| parent | 087c4cbc3cba2cce1c25773af304833d217976fc (diff) | |
| download | gitlab-ce-5914c7e1b7aed690430a4340b3ed47d5dbe88425.tar.gz | |
Merge branch 'ldap_defaults' into 'master'
Saner LDAP defaults
I have the impression that most people use LDAP servers listening
on port 389, without encryption. If we make that the default we
give people a smoother ride setting up GitLab.
See merge request !1446
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index e5780cabb63..59af49c0180 100644 --- 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' |