diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-01-28 11:08:44 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-01-28 11:34:33 +0100 |
| commit | 087c4cbc3cba2cce1c25773af304833d217976fc (patch) | |
| tree | 98300d68eefd0458f0b6eace582884ea56328190 | |
| parent | 43da3f0929521615fe77d1dcb85318a8128bb7e8 (diff) | |
| download | gitlab-ce-087c4cbc3cba2cce1c25773af304833d217976fc.tar.gz | |
Make 'plain', port 389 the default for LDAP
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | doc/integration/ldap.md | 4 |
2 files changed, 4 insertions, 4 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' diff --git a/doc/integration/ldap.md b/doc/integration/ldap.md index 6172a61d005..125ce31b521 100644 --- 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' |