From: Tom Hughes <tom@compton.nu>
Date: Mon, 13 Jul 2020 08:36:32 +0000 (+0100)
Subject: Switch piwik to use FPM for PHP
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/96234f772722dacc4ca4d63509ed8b6d8e3fe61a

Switch piwik to use FPM for PHP
---

diff --git a/cookbooks/piwik/attributes/default.rb b/cookbooks/piwik/attributes/default.rb
index 2e1710f02..9be462338 100644
--- a/cookbooks/piwik/attributes/default.rb
+++ b/cookbooks/piwik/attributes/default.rb
@@ -11,5 +11,3 @@ default[:piwik][:plugins] = %w[
   VisitFrequency VisitorInterest VisitsSummary VisitTime WebsiteMeasurable
   Widgetize
 ]
-
-override[:apache][:mpm] = "prefork"
diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 990e1c33e..3b7a40057 100644
--- 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 "php::apache"
+include_recipe "php::apache-fpm"
 
 passwords = data_bag_item("piwik", "passwords")