add function to create and delete tablespaces

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

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 23206572a37ecc3089bf7acf0baa4c3314180f82..a24ea18f2f441844444d63794c2cdb921983e45f 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -18,45 +18,37 @@
 #
 
 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|
-    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")
 
-template "/etc/apache2/httpd.conf" do
-  source "httpd.conf.erb"
-  owner "root"
-  group "root"
-  mode 0644
+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"
-  mode 0644
+  mode 0o644
 end
 
 service "apache2" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
-  subscribes :reload, "template[/etc/apache2/httpd.conf]"
 end
 
 apache_module "info" do
@@ -69,8 +61,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"