X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/643f28e4f32f013c16d04378d7d1f3dd7d8edc17..94db71c4cc23c8d77a0a3e8bbf13e5250485738b:/cookbooks/piwik/recipes/default.rb

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 36bb05d2b..9064522bf 100644
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "mysql"
 
 passwords = data_bag_item("piwik", "passwords")
@@ -28,12 +28,12 @@ package "php-curl"
 package "php-mbstring"
 package "php-mysql"
 package "php-gd"
+package "php-xml"
 package "php-apcu"
 
-package "geoip-database-contrib"
+package "geoipupdate"
 
-apache_module "php7.0"
-apache_module "geoip"
+apache_module "php7.2"
 
 version = node[:piwik][:version]
 
@@ -44,7 +44,7 @@ directory "/opt/piwik-#{version}" do
 end
 
 remote_file "#{Chef::Config[:file_cache_path]}/piwik-#{version}.zip" do
-  source "http://builds.piwik.org/piwik-#{version}.zip"
+  source "https://builds.matomo.org/piwik-#{version}.zip"
   not_if { File.exist?("/opt/piwik-#{version}/piwik") }
 end
 
@@ -78,6 +78,18 @@ directory "/opt/piwik-#{version}/piwik/tmp" do
   mode "0755"
 end
 
+link "/opt/piwik-#{version}/piwik/misc/GeoLite2-ASN.mmdb" do
+  to "/var/lib/GeoIP/GeoLite2-ASN.mmdb"
+end
+
+link "/opt/piwik-#{version}/piwik/misc/GeoLite2-City.mmdb" do
+  to "/var/lib/GeoIP/GeoLite2-City.mmdb"
+end
+
+link "/opt/piwik-#{version}/piwik/misc/GeoLite2-Country.mmdb" do
+  to "/var/lib/GeoIP/GeoLite2-Country.mmdb"
+end
+
 link "/srv/piwik.openstreetmap.org" do
   to "/opt/piwik-#{version}/piwik"
   notifies :restart, "service[apache2]"