Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

[chef.git] / cookbooks / piwik / templates / default / config.erb

diff --git a/cookbooks/piwik/templates/default/config.erb b/cookbooks/piwik/templates/default/config.erb
index cea82b6b0a2a3e530085fb47693c3773f44034ec..bb9b6a9d9088662f596e17146007294d339e8db4 100644 (file)
--- a/cookbooks/piwik/templates/default/config.erb
+++ b/cookbooks/piwik/templates/default/config.erb
@@ -9,101 +9,29 @@ tables_prefix = "piwik_"
 charset = "utf8"
 
 [General]
+force_ssl = 1
 force_ssl_login = 1
+login_allowlist_apply_to_reporting_api_requests = "0"
 proxy_client_headers[] = "HTTP_X_FORWARDED_FOR"
 trusted_hosts[] = "piwik.openstreetmap.org"
 salt = "<%= @passwords['salt'] %>"
 
+[Tracker]
+ignore_visits_cookie_name = "piwik_ignore"
+
 [Plugins]
-Plugins[] = "CorePluginsAdmin"
-Plugins[] = "CoreAdminHome"
-Plugins[] = "CoreHome"
-Plugins[] = "Proxy"
-Plugins[] = "API"
-Plugins[] = "Widgetize"
-Plugins[] = "LanguagesManager"
-Plugins[] = "Actions"
-Plugins[] = "Dashboard"
-Plugins[] = "MultiSites"
-Plugins[] = "UserSettings"
-Plugins[] = "Goals"
-Plugins[] = "SEO"
-Plugins[] = "UserCountry"
-Plugins[] = "VisitsSummary"
-Plugins[] = "VisitFrequency"
-Plugins[] = "VisitTime"
-Plugins[] = "VisitorInterest"
-Plugins[] = "ExampleAPI"
-Plugins[] = "ExamplePlugin"
-Plugins[] = "ExampleRssWidget"
-Plugins[] = "Provider"
-Plugins[] = "Feedback"
-Plugins[] = "Login"
-Plugins[] = "UsersManager"
-Plugins[] = "SitesManager"
-Plugins[] = "Installation"
-Plugins[] = "CoreUpdater"
-Plugins[] = "UserCountryMap"
-Plugins[] = "Live"
-Plugins[] = "CustomVariables"
-Plugins[] = "PrivacyManager"
-Plugins[] = "ImageGraph"
-Plugins[] = "DoNotTrack"
-Plugins[] = "DevicesDetection"
-Plugins[] = "Referrers"
-Plugins[] = "CoreConsole"
-Plugins[] = "CoreVisualizations"
-Plugins[] = "Morpheus"
-Plugins[] = "Contents"
+<% @plugins.each do |plugin| -%>
+Plugins[] = "<%= plugin %>"
+<% end -%>
 
 [PluginsInstalled]
-PluginsInstalled[] = "Login"
-PluginsInstalled[] = "CoreAdminHome"
-PluginsInstalled[] = "UsersManager"
-PluginsInstalled[] = "SitesManager"
-PluginsInstalled[] = "Installation"
-PluginsInstalled[] = "CorePluginsAdmin"
-PluginsInstalled[] = "CoreHome"
-PluginsInstalled[] = "Proxy"
-PluginsInstalled[] = "API"
-PluginsInstalled[] = "Widgetize"
-PluginsInstalled[] = "LanguagesManager"
-PluginsInstalled[] = "Actions"
-PluginsInstalled[] = "Dashboard"
-PluginsInstalled[] = "MultiSites"
-PluginsInstalled[] = "UserSettings"
-PluginsInstalled[] = "Goals"
-PluginsInstalled[] = "SEO"
-PluginsInstalled[] = "UserCountry"
-PluginsInstalled[] = "VisitsSummary"
-PluginsInstalled[] = "VisitFrequency"
-PluginsInstalled[] = "VisitTime"
-PluginsInstalled[] = "VisitorInterest"
-PluginsInstalled[] = "ExampleAPI"
-PluginsInstalled[] = "ExamplePlugin"
-PluginsInstalled[] = "ExampleRssWidget"
-PluginsInstalled[] = "ExampleFeedburner"
-PluginsInstalled[] = "Provider"
-PluginsInstalled[] = "Feedback"
-PluginsInstalled[] = "CoreUpdater"
-PluginsInstalled[] = "UserCountryMap"
-PluginsInstalled[] = "Live"
-PluginsInstalled[] = "CustomVariables"
-PluginsInstalled[] = "PrivacyManager"
-PluginsInstalled[] = "GeoIP"
-PluginsInstalled[] = "ImageGraph"
-PluginsInstalled[] = "DoNotTrack"
-PluginsInstalled[] = "DevicesDetection"
-PluginsInstalled[] = "CoreConsole"
-PluginsInstalled[] = "CoreVisualizations"
-PluginsInstalled[] = "Referrers"
-PluginsInstalled[] = "Morpheus"
-PluginsInstalled[] = "Contents"
+<% Dir.new("#{@directory}/plugins").reject { |f| f =~ /\./ }.sort.each do |plugin| -%>
+PluginsInstalled[] = "<%= plugin %>"
+<% end -%>
 
 [Plugins_Tracker]
 Plugins_Tracker[] = "Provider"
 Plugins_Tracker[] = "Goals"
-Plugins_Tracker[] = "DoNotTrack"
 Plugins_Tracker[] = "UserCountry"
 Plugins_Tracker[] = "DevicesDetection"
 Plugins_Tracker[] = "UsersManager"