Download as
Browse Code »

Commit 1202a727aeb77667e8561747c72ec5572fe31c18

Authored by Jacob Vosmaer
1 parent f318b722
Exists in master and in 9 other branches 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Expose more fields under 'extra' in gitlab.yml

Showing 3 changed files with 8 additions and 3 deletions   Show diff stats
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 - Send application email via SMTP 4 - Send application email via SMTP
5 - Support changing the name of the "git" user / group (Michael Fenn) 5 - Support changing the name of the "git" user / group (Michael Fenn)
6 - Configure omniauth in gitlab.yml 6 - Configure omniauth in gitlab.yml
  7 +- Expose more fields under 'extra' in gitlab.yml
7 8
8 6.9.0 9 6.9.0
9 - Make SSH port in clone URLs configurable (Julien Pivotto) 10 - Make SSH port in clone URLs configurable (Julien Pivotto)
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @1202a72
@@ -106,6 +106,10 @@ default['gitlab']['gitlab-rails']['gitlab_shell_ssh_port'] = 22 @@ -106,6 +106,10 @@ default['gitlab']['gitlab-rails']['gitlab_shell_ssh_port'] = 22
106 default['gitlab']['gitlab-rails']['git_bin_path'] = "/opt/gitlab/embedded/bin/git" 106 default['gitlab']['gitlab-rails']['git_bin_path'] = "/opt/gitlab/embedded/bin/git"
107 default['gitlab']['gitlab-rails']['git_max_size'] = 5242880 107 default['gitlab']['gitlab-rails']['git_max_size'] = 5242880
108 default['gitlab']['gitlab-rails']['git_timeout'] = 10 108 default['gitlab']['gitlab-rails']['git_timeout'] = 10
  109 +default['gitlab']['gitlab-rails']['extra_google_analytics_id'] = nil
  110 +default['gitlab']['gitlab-rails']['extra_piwik_url'] = nil
  111 +default['gitlab']['gitlab-rails']['extra_piwik_site_id'] = nil
  112 +default['gitlab']['gitlab-rails']['extra_sign_in_text'] = nil
109 113
110 default['gitlab']['gitlab-rails']['aws_enable'] = false 114 default['gitlab']['gitlab-rails']['aws_enable'] = false
111 default['gitlab']['gitlab-rails']['aws_access_key_id'] = nil 115 default['gitlab']['gitlab-rails']['aws_access_key_id'] = nil
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @1202a72
@@ -245,11 +245,11 @@ production: &base @@ -245,11 +245,11 @@ production: &base
245 245
246 extra: 246 extra:
247 ## Google analytics. Uncomment if you want it 247 ## Google analytics. Uncomment if you want it
248 - # google_analytics_id: '_your_tracking_id' 248 + google_analytics_id: <%= single_quote(@extra_google_analytics_id) %>
249 249
250 ## Piwik analytics. 250 ## Piwik analytics.
251 - # piwik_url: '_your_piwik_url'  
252 - # piwik_site_id: '_your_piwik_site_id' 251 + piwik_url: <%= single_quote(@extra_piwik_url) %>
  252 + piwik_site_id: <%= single_quote(@extra_piwik_site_id) %>
253 253
254 <% if @extra_sign_in_text %> 254 <% if @extra_sign_in_text %>
255 ## Text under sign-in page (Markdown enabled) 255 ## Text under sign-in page (Markdown enabled)