Commit 5914c7e1 authored by Job van der Voort's avatar Job van der Voort

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
parents 8eb365c0 087c4cbc
...@@ -153,9 +153,9 @@ production: &base ...@@ -153,9 +153,9 @@ production: &base
label: 'LDAP' label: 'LDAP'
host: '_your_ldap_server' host: '_your_ldap_server'
port: 636 port: 389
uid: 'sAMAccountName' 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' bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
password: '_the_password_of_the_bind_user' password: '_the_password_of_the_bind_user'
......
...@@ -29,9 +29,9 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server ...@@ -29,9 +29,9 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
label: 'LDAP' label: 'LDAP'
host: '_your_ldap_server' host: '_your_ldap_server'
port: 636 port: 389
uid: 'sAMAccountName' 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' bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
password: '_the_password_of_the_bind_user' password: '_the_password_of_the_bind_user'
...@@ -76,6 +76,9 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server ...@@ -76,6 +76,9 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
EOS 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`: If you are using a GitLab installation from source you can find the LDAP settings in `/home/git/gitlab/config/gitlab.yml`:
``` ```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment