From: Tom Hughes <tom@compton.nu>
Date: Thu, 21 Jun 2018 20:17:43 +0000 (+0100)
Subject: Switch piwik to use GeoIP2
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/94db71c4cc23c8d77a0a3e8bbf13e5250485738b?hp=c5e1ad039edad19ba04a77fcbda44bf2905262d7

Switch piwik to use GeoIP2
---

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index f377fe060..9064522bf 100644
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -31,10 +31,9 @@ package "php-gd"
 package "php-xml"
 package "php-apcu"
 
-package "geoip-database-contrib"
+package "geoipupdate"
 
 apache_module "php7.2"
-apache_module "geoip"
 
 version = node[:piwik][:version]
 
@@ -79,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]"