Update promscale to 0.6.2

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

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 9064522bffaafb86b9ac779b344f31b9f4a4e472..997048308f49b45a2ae5cba47f65144925da005d 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: piwik
+# Cookbook:: piwik

 # Recipe:: default
 #
 # 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -18,22 +18,24 @@
 #
 
 include_recipe "apache"
 #
 
 include_recipe "apache"

+include_recipe "geoipupdate"

 include_recipe "mysql"
 include_recipe "mysql"

+include_recipe "php::fpm"

 
 passwords = data_bag_item("piwik", "passwords")
 
 
 passwords = data_bag_item("piwik", "passwords")
 

-package "php"
-package "php-cli"
-package "php-curl"
-package "php-mbstring"
-package "php-mysql"
-package "php-gd"
-package "php-xml"
-package "php-apcu"
+package %w[
+  php-cli
+  php-curl
+  php-mbstring
+  php-mysql
+  php-gd
+  php-xml
+  php-apcu
+]

 
 

-package "geoipupdate"
-
-apache_module "php7.2"
+apache_module "expires"
+apache_module "rewrite"

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


@@ -45,15 +47,23 @@ end
 
 remote_file "#{Chef::Config[:file_cache_path]}/piwik-#{version}.zip" do
   source "https://builds.matomo.org/piwik-#{version}.zip"
 
 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") }
+  not_if { ::File.exist?("/opt/piwik-#{version}/piwik") }
+end
+
+archive_file "#{Chef::Config[:file_cache_path]}/piwik-#{version}.zip" do
+  destination "/opt/piwik-#{version}"
+  overwrite true
+  owner "root"
+  group "root"
+  not_if { ::File.exist?("/opt/piwik-#{version}/piwik") }

 end
 
 end
 

-execute "unzip-piwik-#{version}" do
-  command "unzip -q #{Chef::Config[:file_cache_path]}/piwik-#{version}.zip"
+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"
   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
 end
 
 directory "/opt/piwik-#{version}/piwik/config" do


@@ -79,20 +89,20 @@ directory "/opt/piwik-#{version}/piwik/tmp" do
 end
 
 link "/opt/piwik-#{version}/piwik/misc/GeoLite2-ASN.mmdb" 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
 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
 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
   to "/opt/piwik-#{version}/piwik"
 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
 end
 
 mysql_user "piwik@localhost" do


@@ -108,13 +118,16 @@ ssl_certificate "piwik.openstreetmap.org" do
   notifies :reload, "service[apache2]"
 end
 
   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
 
 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
 end