Download as
Browse Code »

Commit 84d249cd1993eec93ccbda42f3b96b27ba687983

Authored by Jacob Vosmaer
1 parent abad0f11
Exists in master and in 8 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

Avoid empty Piwik or Google Analytics settings

Showing 2 changed files with 5 additions and 0 deletions   Show diff stats
@@ -23,6 +23,7 @@ omnibus-gitlab repository. @@ -23,6 +23,7 @@ omnibus-gitlab repository.
23 - Add a 'gitlab-ctl deploy-page' command 23 - Add a 'gitlab-ctl deploy-page' command
24 - Automatically create /etc/gitlab/gitlab.rb after the package is installed 24 - Automatically create /etc/gitlab/gitlab.rb after the package is installed
25 - Security: Use sockets and peer authentication for Postgres 25 - Security: Use sockets and peer authentication for Postgres
  26 +- Avoid empty Piwik or Google Analytics settings
26 27
27 6.9.4-ee.omnibus.1 28 6.9.4-ee.omnibus.1
28 - Security: Use sockets and peer authentication for Postgres 29 - Security: Use sockets and peer authentication for Postgres
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @84d249c
@@ -244,12 +244,16 @@ production: &base @@ -244,12 +244,16 @@ production: &base
244 # ========================== 244 # ==========================
245 245
246 extra: 246 extra:
  247 + <% if @extra_google_analytics_id %>
247 ## Google analytics. Uncomment if you want it 248 ## Google analytics. Uncomment if you want it
248 google_analytics_id: <%= single_quote(@extra_google_analytics_id) %> 249 google_analytics_id: <%= single_quote(@extra_google_analytics_id) %>
  250 + <% end %>
249 251
  252 + <% if @extra_piwik_url %>
250 ## Piwik analytics. 253 ## Piwik analytics.
251 piwik_url: <%= single_quote(@extra_piwik_url) %> 254 piwik_url: <%= single_quote(@extra_piwik_url) %>
252 piwik_site_id: <%= single_quote(@extra_piwik_site_id) %> 255 piwik_site_id: <%= single_quote(@extra_piwik_site_id) %>
  256 + <% end %>
253 257
254 <% if @extra_sign_in_text %> 258 <% if @extra_sign_in_text %>
255 ## Text under sign-in page (Markdown enabled) 259 ## Text under sign-in page (Markdown enabled)