Add role for balerion

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

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index b21ede6f285af02b99453a826c14d49120da44c1..c8b9b101bf1891f2c8e56c724d717d433b34dd5e 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -28,12 +28,14 @@ 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 "expires"
 apache_module "php7.2"
-apache_module "geoip"
+apache_module "rewrite"
 
 version = node[:piwik][:version]
 
@@ -56,6 +58,14 @@ execute "unzip-piwik-#{version}" do
   not_if { File.exist?("/opt/piwik-#{version}/piwik") }
 end
 
+execute "/opt/piwik-#{version}/piwik/piwik.js" do
+  command "gzip -k -9 /opt/piwik-#{version}/piwik/piwik.js"
+  cwd "/opt/piwik-#{version}"
+  user "root"
+  group "root"
+  not_if { File.exist?("/opt/piwik-#{version}/piwik/piwik.js.gz") }
+end
+
 directory "/opt/piwik-#{version}/piwik/config" do
   owner "www-data"
   group "www-data"
@@ -78,6 +88,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]"