X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6448ea6fd19e1f884e94a7adc40f971933c6ea3f..53342bfb30cc6b2d012375b79c8bfcd8571f80c1:/cookbooks/apache/recipes/default.rb diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb index be6457bc7..2b412eefc 100644 --- a/cookbooks/apache/recipes/default.rb +++ b/cookbooks/apache/recipes/default.rb @@ -18,20 +18,21 @@ # 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 - ["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 ] + action [:enable] end else apache_module "mpm_#{mpm}" do - action [ :disable ] + action [:disable] end end end @@ -62,7 +63,7 @@ template "/etc/apache2/ports.conf" do end service "apache2" do - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end @@ -76,8 +77,12 @@ apache_module "status" do variables :hosts => admins["hosts"] end +apache_module "deflate" do + conf "deflate.conf.erb" +end + apache_module "reqtimeout" do - action [ :disable ] + action [:disable] end munin_plugin "apache_accesses"