From: Tom Hughes <tom@compton.nu>
Date: Tue, 19 Aug 2014 09:02:03 +0000 (+0100)
Subject: Manage httpd.conf correctly for apache 2.4
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/6448ea6fd19e1f884e94a7adc40f971933c6ea3f?hp=b8b28fe06033fec880ba9b179e63387ed5a70fa0

Manage httpd.conf correctly for apache 2.4
---

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index 23206572a..be6457bc7 100644
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -39,11 +39,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,7 +64,6 @@ end
 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