Improve handling of apache mpm selection

diff --git a/.kitchen.yml b/.kitchen.yml
index 1fcc3f7d68019442c60f6c48a35bfeda6b8ed529..37f670c794b85ea1851beba10db34421b24640f4 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -72,15 +72,9 @@ suites:
   - name: dmca
     run_list:
       - recipe[dmca::default]
-    attributes:
-      apache:
-        mpm: prefork
   - name: donate
     run_list:
       - recipe[donate::default]
-    attributes:
-      apache:
-        mpm: prefork
   - name: exim
     run_list:
       - recipe[exim::default]
@@ -90,9 +84,6 @@ suites:
   - name: forum
     run_list:
       - recipe[forum::default]
-    attributes:
-      apache:
-        mpm: prefork
   - name: geoipupdate
     run_list:
       - recipe[geoipupdate::default]
@@ -151,9 +142,6 @@ suites:
   - name: piwik
     run_list:
       - recipe[piwik::default]
-    attributes:
-      apache:
-        mpm: prefork
   - name: planet
     run_list:
       - recipe[planet::default]

diff --git a/cookbooks/dmca/attributes/default.rb b/cookbooks/dmca/attributes/default.rb
new file mode 100644 (file)
index 0000000..56bdf21
--- /dev/null
+++ b/cookbooks/dmca/attributes/default.rb
@@ -0,0 +1,2 @@
+# Use prefork as PHP is to dumb for anything else
+override[:apache][:mpm] = "prefork"

diff --git a/cookbooks/donate/attributes/default.rb b/cookbooks/donate/attributes/default.rb
index 8ce74ce415edf56683751eed5533b3e288eee55c..b41666c72f84b5c02b9dadc247d936c0a5dbd8e8 100644 (file)
--- a/cookbooks/donate/attributes/default.rb
+++ b/cookbooks/donate/attributes/default.rb
@@ -1 +1,5 @@
+# Enable the "donate" role
 default[:accounts][:users][:donate][:status] = :role
+
+# Use prefork as PHP is to dumb for anything else
+override[:apache][:mpm] = "prefork"

diff --git a/cookbooks/forum/attributes/default.rb b/cookbooks/forum/attributes/default.rb
index 0c376d592f605d030423cae8b613ccdf30feda31..d6beb41d210351e01eeee8a5669d245d5e1cd9d7 100644 (file)
--- a/cookbooks/forum/attributes/default.rb
+++ b/cookbooks/forum/attributes/default.rb
@@ -1 +1,5 @@
+# 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/mediawiki/attributes/default.rb b/cookbooks/mediawiki/attributes/default.rb
index 59838f9206df8dbd529d19798c47816d977ce825..a7eab32916e00ab7c96c7f064edf7615451e376b 100644 (file)
--- a/cookbooks/mediawiki/attributes/default.rb
+++ b/cookbooks/mediawiki/attributes/default.rb
@@ -5,7 +5,7 @@ default[:apt][:sources] = node[:apt][:sources] | ["mediawiki"]
 default[:accounts][:users][:wiki][:status] = :role
 
 # Use prefork as PHP is to dumb for anything else
-default[:apache][:mpm] = "prefork"
+override[:apache][:mpm] = "prefork"
 
 # Set mediawiki defaults
 default[:mediawiki][:user] = "wiki"

diff --git a/cookbooks/piwik/attributes/default.rb b/cookbooks/piwik/attributes/default.rb
index 09bdc32bb6746a0b8184487eb41301f6c7fa088e..80b8dba9185f43a3c6199145148736f950f6fd28 100644 (file)
--- a/cookbooks/piwik/attributes/default.rb
+++ b/cookbooks/piwik/attributes/default.rb
@@ -11,3 +11,5 @@ default[:piwik][:plugins] = %w[
   VisitFrequency VisitorInterest VisitsSummary VisitTime WebsiteMeasurable
   Widgetize
 ]
+
+override[:apache][:mpm] = "prefork"

diff --git a/cookbooks/wordpress/attributes/default.rb b/cookbooks/wordpress/attributes/default.rb
index 9cd3956483de21ddd037becfcfa0594ec25a0014..856c9969667d93f2d2d3375c21d1e79366dacef0 100644 (file)
--- a/cookbooks/wordpress/attributes/default.rb
+++ b/cookbooks/wordpress/attributes/default.rb
@@ -2,7 +2,7 @@
 default[:accounts][:users][:wordpress][:status] = :role
 
 # Use prefork as PHP is to dumb for anything else
-default[:apache][:mpm] = "prefork"
+override[:apache][:mpm] = "prefork"
 
 # Set wordpress defaults
 default[:wordpress][:user] = "wordpress"

diff --git a/roles/forum.rb b/roles/forum.rb
index 8273fc47f20f27c1d4b877fa8ebd3b7f78ccdc0c..3b62fe5aaffcdd1bcc6aeb17734dd72fd2f5a255 100644 (file)
--- a/roles/forum.rb
+++ b/roles/forum.rb
@@ -3,7 +3,6 @@ description "Role applied to all forum servers"
 
 default_attributes(
   :apache => {
-    :mpm => "prefork",
     :timeout => 60,
     :keepalive => false,
     :prefork => {

diff --git a/roles/foundation.rb b/roles/foundation.rb
index 9a2c2e553837c30fda36b4e030a889d73c2051aa..6220831642491e998bfe5d8ea18447e791fc4420 100644 (file)
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -3,7 +3,6 @@ description "Role applied to all OSMF servers"
 
 default_attributes(
   :apache => {
-    :mpm => "prefork",
     :timeout => 60,
     :keepalive => false
   },

diff --git a/roles/piwik.rb b/roles/piwik.rb
index 886784be0a3806f451f1bdcaf82adea1430f23c6..e0bc6b96e93a290872ed45b054ad348e27bb48ea 100644 (file)
--- a/roles/piwik.rb
+++ b/roles/piwik.rb
@@ -3,7 +3,6 @@ description "Role applied to all Piwik servers"
 
 default_attributes(
   :apache => {
-    :mpm => "prefork",
     :prefork => {
       :server_limit => 450,
       :max_request_workers => 450

diff --git a/roles/tile.rb b/roles/tile.rb
index 9061e2bce33067d0745c9a07520dd985d80566e6..f089d08b2574121287bb8327b924e0cbac325d05 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -11,7 +11,7 @@ default_attributes(
     }
   },
   :apache => {
-    :mpm => "event",
+    :mpms => ["event"],
     :timeout => 60,
     :event => {
       :server_limit => 60,

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 845f99fe269b6d13cdf0cfc9567486725ac40557..acd0cef1c56f60c7c10322b7f4961c609cd47047 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -8,14 +8,7 @@ default_attributes(
     }
   },
   :apache => {
-    :mpm => "prefork",
-    :timeout => 30,
-    :event => {
-      :server_limit => 32,
-      :max_request_workers => 800,
-      :threads_per_child => 50,
-      :max_connections_per_child => 10000
-    }
+    :timeout => 30
   },
   :elasticsearch => {
     :version => "5.x",