Download as
Browse Code »

Commit 9d8f7e5ea39667f403677c5acc7917385d4fe915

Authored by Jacob Vosmaer
1 parent 4b8f7b96
Exists in master and in 4 other branches 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee

Add support for the LDAP admin_group attribute

Showing 3 changed files with 4 additions and 0 deletions   Show diff stats
@@ -9,6 +9,7 @@ omnibus-gitlab repository. @@ -9,6 +9,7 @@ omnibus-gitlab repository.
9 - Built-in UDP log shipping (Enterprise Edition only) 9 - Built-in UDP log shipping (Enterprise Edition only)
10 - Trigger Unicorn/Sidekiq restart during version change 10 - Trigger Unicorn/Sidekiq restart during version change
11 - Recursively set the SELinux type of ~git/.ssh 11 - Recursively set the SELinux type of ~git/.ssh
  12 +- Add support for the LDAP admin_group attribute (GitLab EE)
12 13
13 7.0.0-ee.omnibus.1 14 7.0.0-ee.omnibus.1
14 - Fix MySQL build for Ubuntu 14.04 15 - Fix MySQL build for Ubuntu 14.04
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @9d8f7e5
@@ -90,6 +90,7 @@ default['gitlab']['gitlab-rails']['ldap_password'] = nil @@ -90,6 +90,7 @@ default['gitlab']['gitlab-rails']['ldap_password'] = nil
90 default['gitlab']['gitlab-rails']['ldap_allow_username_or_email_login'] = nil 90 default['gitlab']['gitlab-rails']['ldap_allow_username_or_email_login'] = nil
91 default['gitlab']['gitlab-rails']['ldap_user_filter'] = nil 91 default['gitlab']['gitlab-rails']['ldap_user_filter'] = nil
92 default['gitlab']['gitlab-rails']['ldap_group_base'] = nil 92 default['gitlab']['gitlab-rails']['ldap_group_base'] = nil
  93 +default['gitlab']['gitlab-rails']['ldap_admin_group'] = nil
93 default['gitlab']['gitlab-rails']['omniauth_enabled'] = false 94 default['gitlab']['gitlab-rails']['omniauth_enabled'] = false
94 default['gitlab']['gitlab-rails']['omniauth_allow_single_sign_on'] = nil 95 default['gitlab']['gitlab-rails']['omniauth_allow_single_sign_on'] = nil
95 default['gitlab']['gitlab-rails']['omniauth_block_auto_created_users'] = nil 96 default['gitlab']['gitlab-rails']['omniauth_block_auto_created_users'] = nil
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @9d8f7e5
@@ -161,6 +161,8 @@ production: &base @@ -161,6 +161,8 @@ production: &base
161 # 161 #
162 group_base: <%= single_quote(@ldap_group_base) %> 162 group_base: <%= single_quote(@ldap_group_base) %>
163 163
  164 + admin_group: <%= single_quote(@ldap_admin_group) %>
  165 +
164 166
165 ## OmniAuth settings 167 ## OmniAuth settings
166 omniauth: 168 omniauth: