From: Tom Hughes <tom@compton.nu>
Date: Sun, 12 Jul 2020 18:21:49 +0000 (+0000)
Subject: Only force the prefork mpm when mod_php is used
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/075747b74dc46148774f470bb00afa2e853c9508?ds=inline

Only force the prefork mpm when mod_php is used
---

diff --git a/cookbooks/php/attributes/default.rb b/cookbooks/php/attributes/default.rb
index d1bd6680a..0ca636813 100644
--- a/cookbooks/php/attributes/default.rb
+++ b/cookbooks/php/attributes/default.rb
@@ -3,5 +3,3 @@ default[:php][:version] = if node[:lsb][:release].to_f < 20.04
                           else
                             "7.4"
                           end
-
-override[:apache][:mpm] = "prefork"
diff --git a/cookbooks/php/recipes/apache.rb b/cookbooks/php/recipes/apache.rb
index 7add78383..62cf24d66 100644
--- a/cookbooks/php/recipes/apache.rb
+++ b/cookbooks/php/recipes/apache.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+node.override[:apache][:mpm] = "prefork"
+
 include_recipe "php"
 include_recipe "apache"