diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-28 22:52:44 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-28 22:52:44 -0800 |
| commit | 815e9aa283f113051268370908776c5517dab711 (patch) | |
| tree | 9beaa0dfa9aa5dee5e76581cc6d7f4b90b5c6d1a /config | |
| parent | 792ced2f4190226c3335967a8e5a30d3b72bd4ae (diff) | |
| parent | 2149f8b52c8f0d8333707f7c798b0e6a8a892c1c (diff) | |
| download | gitlab-ce-815e9aa283f113051268370908776c5517dab711.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into haynes/gitlab-ce-commit_calendar
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' |