Remove arcfour (RC4) cipher no longer available in newer OpenSSH

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

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index be6457bc7a19cd8a90bd07f8a4cd879a0009255b..6c2ee7932deb4d544437d722e499a91757cc7245 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -18,20 +18,21 @@
 #
 
 package "apache2"
 #
 
 package "apache2"

+package "libwww-perl"

 
 if node[:lsb][:release].to_f < 14.04
   package "apache2-mpm-#{node[:apache][:mpm]}" do
     notifies :restart, "service[apache2]"
   end
 else
 
 if node[:lsb][:release].to_f < 14.04
   package "apache2-mpm-#{node[:apache][:mpm]}" do
     notifies :restart, "service[apache2]"
   end
 else

-  ["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
     if mpm == node[:apache][:mpm]
       apache_module "mpm_#{mpm}" do

-        action [ :enable ]
+        action [:enable]

       end
     else
       apache_module "mpm_#{mpm}" do
       end
     else
       apache_module "mpm_#{mpm}" do

-        action [ :disable ]
+        action [:disable]

       end
     end
   end
       end
     end
   end


@@ -62,7 +63,7 @@ template "/etc/apache2/ports.conf" do
 end
 
 service "apache2" do
 end
 
 service "apache2" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 


@@ -77,7 +78,7 @@ apache_module "status" do
 end
 
 apache_module "reqtimeout" do
 end
 
 apache_module "reqtimeout" do

-  action [ :disable ]
+  action [:disable]

 end
 
 munin_plugin "apache_accesses"
 end
 
 munin_plugin "apache_accesses"