From 6448ea6fd19e1f884e94a7adc40f971933c6ea3f Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 19 Aug 2014 10:02:03 +0100 Subject: [PATCH] Manage httpd.conf correctly for apache 2.4 --- cookbooks/apache/recipes/default.rb | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) 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 -- 2.43.2