X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/29312d8acdaae23bf07bcb5fc0627ffc2d53e4e6..4c86175022c9036999f9d8341e48cbd884448709:/cookbooks/apache/recipes/default.rb

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index ebf404945..6c2ee7932 100644
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -18,26 +18,41 @@
 #
 
 package "apache2"
-package "apache2-mpm-#{node[:apache][:mpm]}"
+package "libwww-perl"
 
-#In Apache 2.4 mpm have become runtime loadable modules
-#Diable all mpm except the required mpm
-if node[:lsb][:release].to_f >= 14.04
-  mpms = ['event', 'itk', 'prefork', 'worker']
-  mpms.reject{|u| u == node[:apache][:mpm]}.each do |mpm|
-    apache_module mpm do
-      action [ :disable ]
+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
     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
+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
@@ -48,10 +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 :restart, "package[apache2-mpm-#{node[:apache][:mpm]}]"
-  subscribes :reload, "template[/etc/apache2/httpd.conf]"
 end
 
 apache_module "info" do
@@ -65,7 +78,7 @@ apache_module "status" do
 end
 
 apache_module "reqtimeout" do
-  action [ :disable ]
+  action [:disable]
 end
 
 munin_plugin "apache_accesses"