Use apache 2.4 style access controls

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

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 9fa7fed8536fea6347594570008675ad4e0f6743..be6457bc7a19cd8a90bd07f8a4cd879a0009255b 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -18,12 +18,44 @@
 #
 
 package "apache2"
-package "apache2-mpm-#{node[:apache][:mpm]}"
+
+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
+    end
+  end
+end
 
 admins = data_bag_item("apache", "admins")
 
-template "/etc/apache2/httpd.conf" do
-  source "httpd.conf.erb"
+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
+end
+
+template "/etc/apache2/ports.conf" do
+  source "ports.conf.erb"
   owner "root"
   group "root"
   mode 0644
@@ -32,8 +64,6 @@ end
 service "apache2" do
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
-  subscribes :restart, "package[apache2-mpm-#{node[:apache][:mpm]}]"
-  subscribes :reload, "template[/etc/apache2/httpd.conf]"
 end
 
 apache_module "info" do