X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d168351c5b49bd9689de106601c7267a19b7985b..ee81158deadccd825471200b3c666c219a295ace:/cookbooks/apache/recipes/default.rb?ds=inline diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb index 4fa9b3bc3..2d353950e 100644 --- a/cookbooks/apache/recipes/default.rb +++ b/cookbooks/apache/recipes/default.rb @@ -18,7 +18,26 @@ # 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 do + action [ :install, :enable ] + package "apache2-mpm-#{node[:apache][:mpm]}" + end + else + apache_module mpm do + action [ :disable ] + package "apache2-mpm-#{node[:apache][:mpm]}" + end + end + end +end admins = data_bag_item("apache", "admins") @@ -39,7 +58,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