]> git.openstreetmap.org Git - chef.git/commitdiff
Only force the prefork mpm when mod_php is used
authorTom Hughes <tom@compton.nu>
Sun, 12 Jul 2020 18:21:49 +0000 (18:21 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 12 Jul 2020 18:21:49 +0000 (18:21 +0000)
cookbooks/php/attributes/default.rb
cookbooks/php/recipes/apache.rb

index d1bd6680afd0ce9ab7c848f068e88dbad314cda5..0ca636813b10d67d962662ce0b06f1b688882683 100644 (file)
@@ -3,5 +3,3 @@ default[:php][:version] = if node[:lsb][:release].to_f < 20.04
                           else
                             "7.4"
                           end
-
-override[:apache][:mpm] = "prefork"
index 7add783839f734761327fbff81e4feba11e8cb31..62cf24d669d2021179df602490517a8c737c2c80 100644 (file)
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+node.override[:apache][:mpm] = "prefork"
+
 include_recipe "php"
 include_recipe "apache"