X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d1c87f545d0be04110c9993ea828bbd53e2914cb..b8a8aabcb8c98a61b0c712268eb0fc1ef1d56af7:/cookbooks/piwik/recipes/default.rb diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb index 2bd0b97a5..459712a0e 100644 --- a/cookbooks/piwik/recipes/default.rb +++ b/cookbooks/piwik/recipes/default.rb @@ -18,6 +18,7 @@ # include_recipe "apache" +include_recipe "geoipupdate" include_recipe "mysql" passwords = data_bag_item("piwik", "passwords") @@ -31,8 +32,6 @@ package "php-gd" package "php-xml" package "php-apcu" -package "geoipupdate" - apache_module "expires" apache_module "php7.2" apache_module "rewrite" @@ -89,15 +88,15 @@ directory "/opt/piwik-#{version}/piwik/tmp" do end link "/opt/piwik-#{version}/piwik/misc/GeoLite2-ASN.mmdb" do - to "/var/lib/GeoIP/GeoLite2-ASN.mmdb" + to "/usr/share/GeoIP/GeoLite2-ASN.mmdb" end link "/opt/piwik-#{version}/piwik/misc/GeoLite2-City.mmdb" do - to "/var/lib/GeoIP/GeoLite2-City.mmdb" + to "/usr/share/GeoIP/GeoLite2-City.mmdb" end link "/opt/piwik-#{version}/piwik/misc/GeoLite2-Country.mmdb" do - to "/var/lib/GeoIP/GeoLite2-Country.mmdb" + to "/usr/share/GeoIP/GeoLite2-Country.mmdb" end link "/srv/piwik.openstreetmap.org" do