Switch the forum to use php-fpm

diff --git a/cookbooks/forum/attributes/default.rb b/cookbooks/forum/attributes/default.rb
index d6beb41d210351e01eeee8a5669d245d5e1cd9d7..9f4114f8099ff0627294de623cbb41dfd54ff8ab 100644 (file)
--- 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 907d10760bab2e302edebaef0b93b8cf3d8bdf0f..7c7c5b57b1e792cd15c4b3f0e2d2dfa27a3a6b45 100644 (file)
--- 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]"