Drop role and cookbook for the old tile CDN

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

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 990e1c33e84d85a997f13239518d740e30021b61..997048308f49b45a2ae5cba47f65144925da005d 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -20,7 +20,7 @@
 include_recipe "apache"
 include_recipe "geoipupdate"
 include_recipe "mysql"
 include_recipe "apache"
 include_recipe "geoipupdate"
 include_recipe "mysql"

-include_recipe "php::apache"
+include_recipe "php::fpm"

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


@@ -32,7 +32,6 @@ package %w[
   php-gd
   php-xml
   php-apcu
   php-gd
   php-xml
   php-apcu

-  unzip

 ]
 
 apache_module "expires"
 ]
 
 apache_module "expires"


@@ -51,10 +50,10 @@ remote_file "#{Chef::Config[:file_cache_path]}/piwik-#{version}.zip" do
   not_if { ::File.exist?("/opt/piwik-#{version}/piwik") }
 end
 
   not_if { ::File.exist?("/opt/piwik-#{version}/piwik") }
 end
 

-execute "unzip-piwik-#{version}" do
-  command "unzip -q #{Chef::Config[:file_cache_path]}/piwik-#{version}.zip"
-  cwd "/opt/piwik-#{version}"
-  user "root"
+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
   group "root"
   not_if { ::File.exist?("/opt/piwik-#{version}/piwik") }
 end


@@ -103,7 +102,7 @@ end
 
 link "/srv/piwik.openstreetmap.org" do
   to "/opt/piwik-#{version}/piwik"
 
 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


@@ -119,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