X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/979e98164cc9a6d7216197f01febc918c9a152b9..6769f06b626d566508eaa96a9892d05aeb331f24:/cookbooks/piwik/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 1366d72c9..0bd3ede87 100644
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: piwik
+# Cookbook:: piwik
 # Recipe:: default
 #
-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,
@@ -17,23 +17,26 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
+include_recipe "geoipupdate"
 include_recipe "mysql"
+include_recipe "php::fpm"
 
 passwords = data_bag_item("piwik", "passwords")
 
-package "php5"
-package "php5-cli"
-package "php5-curl"
-package "php5-mysql"
-package "php5-gd"
+package %w[
+  php-cli
+  php-curl
+  php-mbstring
+  php-mysql
+  php-gd
+  php-xml
+  php-apcu
+  unzip
+]
 
-package "php-apc"
-
-package "geoip-database-contrib"
-
-apache_module "php5"
-apache_module "geoip"
+apache_module "expires"
+apache_module "rewrite"
 
 version = node[:piwik][:version]
 
@@ -43,17 +46,25 @@ directory "/opt/piwik-#{version}" do
   mode "0755"
 end
 
-remote_file "/tmp/piwik-#{version}.zip" do
-  source "http://builds.piwik.org/piwik-#{version}.zip"
-  not_if { File.exist?("/opt/piwik-#{version}/piwik") }
+remote_file "#{Chef::Config[:file_cache_path]}/piwik-#{version}.zip" do
+  source "https://builds.matomo.org/piwik-#{version}.zip"
+  not_if { ::File.exist?("/opt/piwik-#{version}/piwik") }
 end
 
 execute "unzip-piwik-#{version}" do
-  command "unzip -q /tmp/piwik-#{version}.zip"
+  command "unzip -q #{Chef::Config[:file_cache_path]}/piwik-#{version}.zip"
+  cwd "/opt/piwik-#{version}"
+  user "root"
+  group "root"
+  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") }
+  not_if { ::File.exist?("/opt/piwik-#{version}/piwik/piwik.js.gz") }
 end
 
 directory "/opt/piwik-#{version}/piwik/config" do
@@ -68,7 +79,7 @@ template "/opt/piwik-#{version}/piwik/config/config.ini.php" do
   group "root"
   mode "0644"
   variables :passwords => passwords,
-            :directory => "/opt/piwik-#{version}/piwik", 
+            :directory => "/opt/piwik-#{version}/piwik",
             :plugins => node[:piwik][:plugins]
 end
 
@@ -78,9 +89,21 @@ directory "/opt/piwik-#{version}/piwik/tmp" do
   mode "0755"
 end
 
+link "/opt/piwik-#{version}/piwik/misc/GeoLite2-ASN.mmdb" do
+  to "/usr/share/GeoIP/GeoLite2-ASN.mmdb"
+end
+
+link "/opt/piwik-#{version}/piwik/misc/GeoLite2-City.mmdb" do
+  to "/usr/share/GeoIP/GeoLite2-City.mmdb"
+end
+
+link "/opt/piwik-#{version}/piwik/misc/GeoLite2-Country.mmdb" do
+  to "/usr/share/GeoIP/GeoLite2-Country.mmdb"
+end
+
 link "/srv/piwik.openstreetmap.org" do
   to "/opt/piwik-#{version}/piwik"
-  notifies :restart, "service[apache2]"
+  notifies :restart, "service[php#{node[:php][:version]}-fpm]"
 end
 
 mysql_user "piwik@localhost" do
@@ -91,13 +114,21 @@ mysql_database "piwik" do
   permissions "piwik@localhost" => :all
 end
 
+ssl_certificate "piwik.openstreetmap.org" do
+  domains ["piwik.openstreetmap.org", "piwik.osm.org"]
+  notifies :reload, "service[apache2]"
+end
+
+php_fpm "piwik.openstreetmap.org" do
+  prometheus_port 9253
+end
+
 apache_site "piwik.openstreetmap.org" do
   template "apache.erb"
 end
 
-template "/etc/cron.d/piwiki" do
-  source "cron.erb"
-  owner "root"
-  group "root"
-  mode "0644"
+cron_d "piwik" do
+  minute "5"
+  user "www-data"
+  command "/usr/bin/php /srv/piwik.openstreetmap.org/console core:archive --quiet --url=https://piwik.openstreetmap.org/"
 end