Commit d737bc95 authored by Marin Jankovski's avatar Marin Jankovski

Add LDAP configuration options.

parent edcb69c6
......@@ -97,6 +97,12 @@ default['gitlab']['ldap']['allow_username_or_email_login'] = true
# LDAP Filter Example: Recursive query of group membership
# default['gitlab']['ldap']['user_filter'] = '(&(objectcategory=person)(objectclass=user)(memberOf:1.2.840.113556.1.4.1941:=CN=Gitlab Users,OU=USA,DC=int,DC=contoso,DC=com))'
default['gitlab']['ldap']['user_filter'] = ''
# Group base example: default['gitlab']['ldap']['group_base'] = 'ou=Groups,dc=gitlab,dc=example'
default['gitlab']['ldap']['group_base'] = ''
# Admin group example: default['gitlab']['ldap']['admin_group'] = 'GLAdmins'
default['gitlab']['ldap']['admin_group'] = ''
# Synch ssh key example: default['gitlab']['ldap']['sync_ssh_keys'] = 'sshpublickey'
default['gitlab']['ldap']['sync_ssh_keys'] = false
default['gitlab']['gravatar'] = true
default['gitlab']['gravatar_plain_url'] = "http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon"
......
......@@ -60,7 +60,10 @@ describe "gitlab::install" do
"bind_dn"=>"_the_full_dn_of_the_user_you_will_bind_with",
"password"=>"_the_password_of_the_bind_user",
"allow_username_or_email_login"=>true,
"user_filter"=>""
"user_filter"=>"",
"group_base"=>"",
"admin_group"=>"",
"sync_ssh_keys"=>false
},
backup: {
"cron"=>{
......@@ -491,7 +494,10 @@ describe "gitlab::install" do
"bind_dn"=>"_the_full_dn_of_the_user_you_will_bind_with",
"password"=>"_the_password_of_the_bind_user",
"allow_username_or_email_login"=>true,
"user_filter"=>""
"user_filter"=>"",
"group_base"=>"",
"admin_group"=>"",
"sync_ssh_keys"=>false
},
backup: {
"cron"=>{
......
......@@ -158,6 +158,26 @@ production: &base
#
user_filter: '<%= @ldap_config["user_filter"] %>'
# Base where we can search for groups
#
# Ex. ou=Groups,dc=gitlab,dc=example
#
group_base: <%= @ldap_config['group_base'] %>
# LDAP group of users who should be admins in GitLab
#
# Ex. GLAdmins
#
admin_group: <%= @ldap_config['admin_group'] %>
# Name of attribute which holds a ssh public key of the user object.
# If false or nil, SSH key syncronisation will be disabled.
#
# Ex. sshpublickey
#
sync_ssh_keys: <%= @ldap_config['sync_ssh_keys'] %>
## OmniAuth settings
omniauth:
......
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