gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'saner_defaults_for_ldap' into 'master' 

Saner defaults for ldap

Tracking the changes in GitLap repository.

Fixes #416

See merge request !277
This commit is contained in:
Marin Jankovski 2015-01-29 01:02:27 +00:00
parent 9071bedd26 b3f2f1b120
commit 7a65245c59
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/settings/ldap.md
View File

@ -24,9 +24,9 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
label: 'LDAP'
host: '_your_ldap_server'
port: 636
port: 389 # or 636
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'
@ -72,9 +72,9 @@ gitlab_rails['ldap_servers'] = YAML.load <<-EOS # remember to close this block w
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'
active_directory: true
@ -89,9 +89,9 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
secondary: # 'secondary' is the GitLab 'provider ID' of second 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'
active_directory: true

8
files/gitlab-config-template/gitlab.rb.template
View File

@ -51,9 +51,9 @@ external_url 'GENERATED_EXTERNAL_URL'
# 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'
# active_directory: true
@ -68,9 +68,9 @@ external_url 'GENERATED_EXTERNAL_URL'
# secondary: # 'secondary' is the GitLab 'provider ID' of second 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'
# active_directory: true