Skip to content
Snippets Groups Projects
Commit d0b639af authored by Katrin Leinweber's avatar Katrin Leinweber
Browse files
parent f778df3a
No related branches found
No related tags found
No related merge requests found
---
title: Rename Piwik config items after rebranding to Matomo
merge_request: 4667
author: Katrin Leinweber @katrinleinweber
type: changed
Loading
Loading
@@ -244,6 +244,7 @@ Makefile
Makefiles
Markdown
markdownlint
Matomo
matcher
matchers
Mattermost
Loading
Loading
Loading
Loading
@@ -595,8 +595,8 @@ external_url 'GENERATED_EXTERNAL_URL'
 
### Extra customization
# gitlab_rails['extra_google_analytics_id'] = '_your_tracking_id'
# gitlab_rails['extra_piwik_url'] = '_your_piwik_url'
# gitlab_rails['extra_piwik_site_id'] = '_your_piwik_site_id'
# gitlab_rails['extra_matomo_url'] = '_your_matomo_url'
# gitlab_rails['extra_matomo_site_id'] = '_your_matomo_site_id'
 
##! Docs: https://docs.gitlab.com/omnibus/settings/environment-variables.html
# gitlab_rails['env'] = {
Loading
Loading
Loading
Loading
@@ -374,8 +374,8 @@ default['gitlab']['gitlab-rails']['gitlab_shell_git_timeout'] = 10800
# defaults to /opt/gitlab/embedded/bin/git. The install-dir path is set at build time
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_piwik_url'] = nil
default['gitlab']['gitlab-rails']['extra_piwik_site_id'] = nil
default['gitlab']['gitlab-rails']['extra_matomo_url'] = nil
default['gitlab']['gitlab-rails']['extra_matomo_site_id'] = nil
default['gitlab']['gitlab-rails']['rack_attack_git_basic_auth'] = nil
 
default['gitlab']['gitlab-rails']['db_adapter'] = "postgresql"
Loading
Loading
Loading
Loading
@@ -859,10 +859,10 @@ production: &base
google_analytics_id: <%= quote(@extra_google_analytics_id) %>
<% end %>
 
<% if @extra_piwik_url %>
## Piwik analytics.
piwik_url: <%= quote(@extra_piwik_url) %>
piwik_site_id: <%= quote(@extra_piwik_site_id) %>
<% if @extra_matomo_url %>
## matomo analytics.
matomo_url: <%= quote(@extra_matomo_url) %>
matomo_site_id: <%= quote(@extra_matomo_site_id) %>
<% end %>
 
rack_attack:
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment