]> git.openstreetmap.org Git - chef.git/commitdiff
Fix apache conf files name for apache 2.4
authorTom Hughes <tom@compton.nu>
Tue, 3 Jun 2014 08:00:00 +0000 (09:00 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 3 Jun 2014 08:00:00 +0000 (09:00 +0100)
cookbooks/apache/providers/conf.rb

index beef75ea55952b42c9e2cfdbcf86469e69177254..d249079d961144cc0e9cc067f4caa1b065afc5a8 100644 (file)
@@ -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