Merge branch 'master' of ssh://git.openstreetmap.org/var/lib/git/public/chef

[chef.git] / cookbooks / wordpress / attributes / default.rb

diff --git a/cookbooks/wordpress/attributes/default.rb b/cookbooks/wordpress/attributes/default.rb
index 09845b949d9e1a0adbbfa126fa9c00ad150b674c..856c9969667d93f2d2d3375c21d1e79366dacef0 100644 (file)
--- a/cookbooks/wordpress/attributes/default.rb
+++ b/cookbooks/wordpress/attributes/default.rb
@@ -2,10 +2,7 @@
 default[:accounts][:users][:wordpress][:status] = :role
 
 # Use prefork as PHP is to dumb for anything else
-default[:apache][:mpm] = "prefork"
-
-# Make sure httpclient and php_serialize are installed
-default[:chef][:gems] |= %w(httpclient php_serialize)
+override[:apache][:mpm] = "prefork"
 
 # Set wordpress defaults
 default[:wordpress][:user] = "wordpress"