From dc5070173ed99b84d8120641a75a07d8a9109c15 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 6 Dec 2020 10:55:41 +0000 Subject: [PATCH] Use a custom FPM pool for piwik.openstreetmap.org --- cookbooks/piwik/recipes/default.rb | 8 ++++++-- cookbooks/piwik/templates/default/apache.erb | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb index 948c03af4..0bd3ede87 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::fpm" passwords = data_bag_item("piwik", "passwords") @@ -103,7 +103,7 @@ 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 @@ -119,6 +119,10 @@ ssl_certificate "piwik.openstreetmap.org" do 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 diff --git a/cookbooks/piwik/templates/default/apache.erb b/cookbooks/piwik/templates/default/apache.erb index 58703f41b..f513ce9c2 100644 --- a/cookbooks/piwik/templates/default/apache.erb +++ b/cookbooks/piwik/templates/default/apache.erb @@ -50,4 +50,8 @@ ExpiresDefault "access plus 1 week" Header set Cache-Control "max-age=604800" + + + SetHandler "proxy:unix:/run/php/piwik.openstreetmap.org.sock|fcgi://127.0.0.1" + -- 2.45.1