cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename piwik to matomo and merge configuration into settings

Browse source
This commit is contained in:
Tom Hughes 2022-08-01 20:40:25 +01:00
parent 4f74a67f6c
commit e9f62a8c30
13 changed files with 49 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config/initializers/piwik.rb
View file

@ -1,5 +0,0 @@
require "yaml"
if File.exist?(piwik_file = File.expand_path("../piwik.yml", __dir__))
PIWIK = YAML.load_file(piwik_file)
end

6
config/initializers/secure_headers.rb
View file

@ -18,9 +18,9 @@ csp_policy = {
:report_uri => []
}
csp_policy[:connect_src] << PIWIK["location"] if defined?(PIWIK)
csp_policy[:img_src] << PIWIK["location"] if defined?(PIWIK)
csp_policy[:script_src] << PIWIK["location"] if defined?(PIWIK)
csp_policy[:connect_src] << Settings.matomo["location"] if defined?(Settings.matomo)
csp_policy[:img_src] << Settings.matomo["location"] if defined?(Settings.matomo)
csp_policy[:script_src] << Settings.matomo["location"] if defined?(Settings.matomo)
csp_policy[:img_src] << Settings.avatar_storage_url if Settings.key?(:avatar_storage_url)
csp_policy[:img_src] << Settings.trace_image_storage_url if Settings.key?(:trace_image_storage_url)