From 87b8bf92a49168bbfc9beb7e7a6df2e6222df710 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 12 Jul 2020 18:22:15 +0000 Subject: [PATCH] Switch the forum to use php-fpm --- cookbooks/forum/attributes/default.rb | 3 --- cookbooks/forum/recipes/default.rb | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cookbooks/forum/attributes/default.rb b/cookbooks/forum/attributes/default.rb index d6beb41d2..9f4114f80 100644 --- a/cookbooks/forum/attributes/default.rb +++ b/cookbooks/forum/attributes/default.rb @@ -1,5 +1,2 @@ # Enable the "forum" role default[:accounts][:users][:forum][:status] = :role - -# Use prefork as PHP is to dumb for anything else -override[:apache][:mpm] = "prefork" diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb index 907d10760..7c7c5b57b 100644 --- a/cookbooks/forum/recipes/default.rb +++ b/cookbooks/forum/recipes/default.rb @@ -21,7 +21,7 @@ include_recipe "accounts" include_recipe "apache" include_recipe "git" include_recipe "mysql" -include_recipe "php::apache" +include_recipe "php::fpm" cache_dir = Chef::Config[:file_cache_path] @@ -37,6 +37,10 @@ package %w[ apache_module "rewrite" +apache_conf "php#{node[:php][:version]}-fpm" do + action :enable +end + ssl_certificate "forum.openstreetmap.org" do domains ["forum.openstreetmap.org", "forum.osm.org"] notifies :reload, "service[apache2]" -- 2.39.5