From: Tom Hughes <tom@compton.nu>
Date: Tue, 3 Jun 2014 08:00:00 +0000 (+0100)
Subject: Fix apache conf files name for apache 2.4
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/0d37c0624281a42d84f8b22429b588d01112833a

Fix apache conf files name for apache 2.4
---

diff --git a/cookbooks/apache/providers/conf.rb b/cookbooks/apache/providers/conf.rb
index beef75ea5..d249079d9 100644
--- a/cookbooks/apache/providers/conf.rb
+++ b/cookbooks/apache/providers/conf.rb
@@ -93,7 +93,7 @@ end
 
 def available_name
   if node[:lsb][:release].to_f >= 14.04
-    "/etc/apache2/conf-available/#{new_resource.name}"
+    "/etc/apache2/conf-available/#{new_resource.name}.conf"
   else
     "/etc/apache2/conf.d/#{new_resource.name}"
   end
@@ -101,7 +101,7 @@ end
 
 def enabled_name
   if node[:lsb][:release].to_f >= 14.04
-    "/etc/apache2/conf-enabled/#{new_resource.name}"
+    "/etc/apache2/conf-enabled/#{new_resource.name}.conf"
   else
     "/etc/apache2/conf.d/#{new_resource.name}"
   end