Fix c&p error

[chef.git] / cookbooks / piwik / recipes / default.rb

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index a8a1e124a21e4ad662d82aa91eba154d2372f58a..9064522bffaafb86b9ac779b344f31b9f4a4e472 100644 (file)
--- 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
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -28,12 +28,12 @@ package "php-curl"
 package "php-mbstring"
 package "php-mysql"
 package "php-gd"
 package "php-mbstring"
 package "php-mysql"
 package "php-gd"

+package "php-xml"

 package "php-apcu"
 
 package "php-apcu"
 

-package "geoip-database-contrib"
+package "geoipupdate"

 
 

-apache_module "php7.0"
-apache_module "geoip"
+apache_module "php7.2"

 
 version = node[:piwik][:version]
 
 
 version = node[:piwik][:version]
 


@@ -78,6 +78,18 @@ directory "/opt/piwik-#{version}/piwik/tmp" do
   mode "0755"
 end
 
   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]"
 link "/srv/piwik.openstreetmap.org" do
   to "/opt/piwik-#{version}/piwik"
   notifies :restart, "service[apache2]"