nominatim: disable redirect to poldi

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

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index be906716286830d34294cb3bb4db015f825651ee..2b412eefca9fe0d270b6883425e2eec6bdb132ef 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -25,14 +25,14 @@ if node[:lsb][:release].to_f < 14.04
     notifies :restart, "service[apache2]"
   end
 else
     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


@@ -63,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,8 +77,12 @@ apache_module "status" do
   variables :hosts => admins["hosts"]
 end
 
   variables :hosts => admins["hosts"]
 end
 

+apache_module "deflate" do
+  conf "deflate.conf.erb"
+end
+

 apache_module "reqtimeout" do
 apache_module "reqtimeout" do

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

 end
 
 munin_plugin "apache_accesses"
 end
 
 munin_plugin "apache_accesses"