Update piwik cookbook for Ubuntu 16.04

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index a3eb24ad8ebda0d4892d695b99ea0611d21ccd21..444788003a00eaade90e3372b30795edc1539c57 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -22,17 +22,17 @@ include_recipe "mysql"
 
 passwords = data_bag_item("piwik", "passwords")
 
-package "php5"
-package "php5-cli"
-package "php5-curl"
-package "php5-mysql"
-package "php5-gd"
-
-package "php-apc"
+package "php"
+package "php-cli"
+package "php-curl"
+package "php-mbstring"
+package "php-mysql"
+package "php-gd"
+package "php-apcu"
 
 package "geoip-database-contrib"
 
-apache_module "php5"
+apache_module "php7.0"
 apache_module "geoip"
 
 version = node[:piwik][:version]

diff --git a/cookbooks/piwik/templates/default/cron.erb b/cookbooks/piwik/templates/default/cron.erb
index 7bf54843b33a6f982f54f6c519ab08b6baa333f9..a49e338e494f40b0f19a3abfaac517793c93c1ba 100644 (file)
--- a/cookbooks/piwik/templates/default/cron.erb
+++ b/cookbooks/piwik/templates/default/cron.erb
@@ -1 +1 @@
-5 * * * * www-data /usr/bin/php5 /srv/piwik.openstreetmap.org/misc/cron/archive.php --url=http://piwik.openstreetmap.org/ > /dev/null
+5 * * * * www-data /usr/bin/php /srv/piwik.openstreetmap.org/misc/cron/archive.php --url=http://piwik.openstreetmap.org/ > /dev/null