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 2d353950ee71d011fda03c4137fe3e571fc3d5e8..be6457bc7a19cd8a90bd07f8a4cd879a0009255b 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -26,14 +26,12 @@ if node[:lsb][:release].to_f < 14.04
 else
   ["event", "itk", "prefork", "worker"].each do |mpm|
     if mpm == node[:apache][:mpm]
 else
   ["event", "itk", "prefork", "worker"].each do |mpm|
     if mpm == node[:apache][:mpm]

-      apache_module mpm do
-        action [ :install, :enable ]
-        package "apache2-mpm-#{node[:apache][:mpm]}"
+      apache_module "mpm_#{mpm}" do
+        action [ :enable ]

       end
     else
       end
     else

-      apache_module mpm do
+      apache_module "mpm_#{mpm}" do

         action [ :disable ]
         action [ :disable ]

-        package "apache2-mpm-#{node[:apache][:mpm]}"

       end
     end
   end
       end
     end
   end


@@ -41,11 +39,19 @@ end
 
 admins = data_bag_item("apache", "admins")
 
 
 admins = data_bag_item("apache", "admins")
 

-template "/etc/apache2/httpd.conf" do
-  source "httpd.conf.erb"
-  owner "root"
-  group "root"
-  mode 0644
+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
 end
 
 template "/etc/apache2/ports.conf" do


@@ -58,7 +64,6 @@ end
 service "apache2" do
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
 service "apache2" do
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true

-  subscribes :reload, "template[/etc/apache2/httpd.conf]"

 end
 
 apache_module "info" do
 end
 
 apache_module "info" do