Preload flush.so when running osmosis

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

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 30f77340dd4071aa9838685e9be9765de2f345c7..a24ea18f2f441844444d63794c2cdb921983e45f 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -20,50 +20,34 @@
 package "apache2"
 package "libwww-perl"
 
 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
-  %w(event itk prefork worker).each do |mpm|
-    if mpm == node[:apache][:mpm]
-      apache_module "mpm_#{mpm}" do
-        action [ :enable ]
-      end
-    else
-      apache_module "mpm_#{mpm}" do
-        action [ :disable ]
-      end
+%w(event itk prefork worker).each do |mpm|
+  if mpm == node[:apache][:mpm]
+    apache_module "mpm_#{mpm}" do
+      action [:enable]
+    end
+  else
+    apache_module "mpm_#{mpm}" do
+      action [:disable]

     end
   end
 end
 
 admins = data_bag_item("apache", "admins")
 
     end
   end
 end
 
 admins = data_bag_item("apache", "admins")
 

-if node[:lsb][:release].to_f < 14.04
-  template "/etc/apache2/httpd.conf" do
-    source "httpd.conf.erb"
-    owner "root"
-    group "root"
-    mode 0644
-    notifies :reload, "service[apache2]"
-  end
-else
-  apache_conf "httpd" do
-    template "httpd.conf.erb"
-    notifies :reload, "service[apache2]"
-  end
+apache_conf "httpd" do
+  template "httpd.conf.erb"
+  notifies :reload, "service[apache2]"

 end
 
 template "/etc/apache2/ports.conf" do
   source "ports.conf.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/apache2/ports.conf" do
   source "ports.conf.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 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 +61,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"