Remove bit of config which might have been causing everything to be blocked.

[chef.git] / cookbooks / apache / providers / site.rb

diff --git a/cookbooks/apache/providers/site.rb b/cookbooks/apache/providers/site.rb
index a8c90344927f818a25146df51470580db980c20b..4deae2782d90a97490fcc6ac4dce7d9e806e6532 100644 (file)
--- a/cookbooks/apache/providers/site.rb
+++ b/cookbooks/apache/providers/site.rb
@@ -29,7 +29,7 @@ action :create do
     source new_resource.template
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables new_resource.variables.merge(:name => new_resource.name, :directory => site_directory)
   end
 end
@@ -59,27 +59,14 @@ def site_directory
 end
 
 def available_name
-  if node[:lsb][:release].to_f >= 14.04
-    "/etc/apache2/sites-available/#{new_resource.name}.conf"
-  else
-    "/etc/apache2/sites-available/#{new_resource.name}"
-  end
+  "/etc/apache2/sites-available/#{new_resource.name}.conf"
 end
 
 def enabled_name
-  if node[:lsb][:release].to_f >= 14.04
-    case new_resource.name
-    when "default"
-      "/etc/apache2/sites-enabled/000-default.conf"
-    else
-      "/etc/apache2/sites-enabled/#{new_resource.name}.conf"
-    end
+  case new_resource.name
+  when "default"
+    "/etc/apache2/sites-enabled/000-default.conf"
   else
-    case new_resource.name
-    when "default"
-      "/etc/apache2/sites-enabled/000-default"
-    else
-      "/etc/apache2/sites-enabled/#{new_resource.name}"
-    end
+    "/etc/apache2/sites-enabled/#{new_resource.name}.conf"
   end
 end