kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'ldap_defaults' into 'master'

Browse source 
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
This commit is contained in:
Job van der Voort 2015-01-28 18:24:30 +00:00
commit 5914c7e1b7
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/gitlab.yml.example
View file

@ -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'

7
doc/integration/ldap.md
View file

@ -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'
@ -76,6 +76,9 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
EOS
```
If you are getting 'Connection Refused' errors when trying to connect to the LDAP server please double-check the LDAP `port` and `method` settings used by GitLab.
Common combinations are `method: 'plain'` and `port: 389`, OR `method: 'ssl'` and `port: 636`.
If you are using a GitLab installation from source you can find the LDAP settings in `/home/git/gitlab/config/gitlab.yml`:
```