diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template index 0b215c92d5173af021c2ff8f41d9d26657ec024a_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU=..7b729750afa48c33a88e014af66ae984944c1bf5_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU= 100644 --- a/files/gitlab-config-template/gitlab.rb.template +++ b/files/gitlab-config-template/gitlab.rb.template @@ -640,6 +640,7 @@ ### Extra customization # gitlab_rails['extra_google_analytics_id'] = '_your_tracking_id' # gitlab_rails['extra_google_tag_manager_id'] = '_your_tracking_id' +# gitlab_rails['extra_one_trust_id'] = '_your_one_trust_id' # gitlab_rails['extra_matomo_url'] = '_your_matomo_url' # gitlab_rails['extra_matomo_site_id'] = '_your_matomo_site_id' # gitlab_rails['extra_matomo_disable_cookies'] = false diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index 0b215c92d5173af021c2ff8f41d9d26657ec024a_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi..7b729750afa48c33a88e014af66ae984944c1bf5_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -394,6 +394,7 @@ default['gitlab']['gitlab-rails']['git_bin_path'] = "#{node['package']['install-dir']}/embedded/bin/git" default['gitlab']['gitlab-rails']['extra_google_analytics_id'] = nil default['gitlab']['gitlab-rails']['extra_google_tag_manager_id'] = nil +default['gitlab']['gitlab-rails']['extra_one_trust_id'] = nil default['gitlab']['gitlab-rails']['extra_matomo_url'] = nil default['gitlab']['gitlab-rails']['extra_matomo_site_id'] = nil default['gitlab']['gitlab-rails']['extra_matomo_disable_cookies'] = nil diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb index 0b215c92d5173af021c2ff8f41d9d26657ec024a_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvZ2l0bGFiLnltbC5lcmI=..7b729750afa48c33a88e014af66ae984944c1bf5_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvZ2l0bGFiLnltbC5lcmI= 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb @@ -998,6 +998,11 @@ google_tag_manager_id: <%= quote(@extra_google_tag_manager_id) %> <% end %> + <% if @extra_one_trust_id %> + ## OneTrust + one_trust_id: <%= quote(@extra_one_trust_id) %> + <% end %> + <% if @extra_matomo_url %> ## matomo analytics. matomo_url: <%= quote(@extra_matomo_url) %> diff --git a/spec/chef/recipes/gitlab-rails/gitlab_yml/extra_spec.rb b/spec/chef/recipes/gitlab-rails/gitlab_yml/extra_spec.rb index 0b215c92d5173af021c2ff8f41d9d26657ec024a_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLXJhaWxzL2dpdGxhYl95bWwvZXh0cmFfc3BlYy5yYg==..7b729750afa48c33a88e014af66ae984944c1bf5_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLXJhaWxzL2dpdGxhYl95bWwvZXh0cmFfc3BlYy5yYg== 100644 --- a/spec/chef/recipes/gitlab-rails/gitlab_yml/extra_spec.rb +++ b/spec/chef/recipes/gitlab-rails/gitlab_yml/extra_spec.rb @@ -46,6 +46,16 @@ end end end + + describe 'one_trust_id setting' do + before do + stub_gitlab_rb(gitlab_rails: { extra_one_trust_id: '0000-0000-test' }) + end + + it 'renders gitlab.yml with the provided value' do + expect(gitlab_yml[:production][:extra][:one_trust_id]).to eq('0000-0000-test') + end + end end end end