X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ee81158deadccd825471200b3c666c219a295ace..51096343cee85550cd197da1f8354f8407506af5:/cookbooks/apache/recipes/default.rb

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 2d353950e..6c2ee7932 100644
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -18,22 +18,21 @@
 #
 
 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|
+  %w(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
-      apache_module mpm do
-        action [ :disable ]
-        package "apache2-mpm-#{node[:apache][:mpm]}"
+      apache_module "mpm_#{mpm}" do
+        action [:disable]
       end
     end
   end
@@ -41,11 +40,19 @@ end
 
 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
@@ -56,9 +63,8 @@ template "/etc/apache2/ports.conf" do
 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
@@ -72,7 +78,7 @@ apache_module "status" do
 end
 
 apache_module "reqtimeout" do
-  action [ :disable ]
+  action [:disable]
 end
 
 munin_plugin "apache_accesses"