X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d228f465b5bf9f5dffedcebad5c7fadcbba21cc3..7fdccdf940e933f4d918cd827ff8f26bfe75fe11:/cookbooks/apache/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 9fa7fed85..23206572a 100644
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -18,7 +18,24 @@
 #
 
 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")
 
@@ -29,10 +46,16 @@ template "/etc/apache2/httpd.conf" do
   mode 0644
 end
 
+template "/etc/apache2/ports.conf" do
+  source "ports.conf.erb"
+  owner "root"
+  group "root"
+  mode 0644
+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