Download as
Browse Code »

Commit 773fb05c0114059beee4a16135ec54dc409343eb

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

Merge branch 'ldap_admin_group' into 'master' 

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