Use multipackage installs throughout

[chef.git] / cookbooks / apache / recipes / default.rb

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 72af9140b9b64b6c8caa034ece4c0a69c1cbb23c..625c3eb22c110bb6e9afb2a787a3de927e619a2b 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -19,10 +19,12 @@
 
 include_recipe "ssl"
 
-package "apache2"
-package "libwww-perl"
+package %w[
+  apache2
+  libwww-perl
+]
 
-%w(event itk prefork worker).each do |mpm|
+%w[event itk prefork worker].each do |mpm|
   if mpm == node[:apache][:mpm]
     apache_module "mpm_#{mpm}" do
       action [:enable]
@@ -67,8 +69,14 @@ apache_module "deflate" do
   conf "deflate.conf.erb"
 end
 
-apache_module "reqtimeout" do
-  action [:disable]
+if node[:apache][:reqtimeout]
+  apache_module "reqtimeout" do
+    action [:enable]
+  end
+else
+  apache_module "reqtimeout" do
+    action [:disable]
+  end
 end
 
 apache_module "ssl"