Preload flush.so when running osmosis

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

diff --git a/cookbooks/apache/providers/conf.rb b/cookbooks/apache/providers/conf.rb
index d7eddc6368a03abf20d11ba5f3fbdfbd6ba504e1..16759e86f7624cd74a2b959bfaac883977e02941 100644 (file)
--- a/cookbooks/apache/providers/conf.rb
+++ b/cookbooks/apache/providers/conf.rb
@@ -23,32 +23,20 @@ end
 
 use_inline_resources
 
 
 use_inline_resources
 

-action :create do # ~FC017
-  if node[:lsb][:release].to_f >= 14.04
-    create_conf
-  end
+action :create do
+  create_conf

 end
 
 end
 

-action :enable do # ~FC017
-  if node[:lsb][:release].to_f >= 14.04
-    enable_conf
-  else
-    create_conf
-  end
+action :enable do
+  enable_conf

 end
 
 end
 

-action :disable do # ~FC017
-  if node[:lsb][:release].to_f >= 14.04
-    disable_conf
-  else
-    delete_conf
-  end
+action :disable do
+  disable_conf

 end
 
 end
 

-action :delete do # ~FC017
-  if node[:lsb][:release].to_f >= 14.04
-    delete_conf
-  end
+action :delete do
+  delete_conf

 end
 
 def create_conf
 end
 
 def create_conf


@@ -57,7 +45,7 @@ def create_conf
     source new_resource.template
     owner "root"
     group "root"
     source new_resource.template
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables new_resource.variables
   end
 end
     variables new_resource.variables
   end
 end


@@ -83,17 +71,9 @@ def delete_conf
 end
 
 def available_name
 end
 
 def available_name

-  if node[:lsb][:release].to_f >= 14.04
-    "/etc/apache2/conf-available/#{new_resource.name}.conf"
-  else
-    "/etc/apache2/conf.d/#{new_resource.name}"
-  end
+  "/etc/apache2/conf-available/#{new_resource.name}.conf"

 end
 
 def enabled_name
 end
 
 def enabled_name

-  if node[:lsb][:release].to_f >= 14.04
-    "/etc/apache2/conf-enabled/#{new_resource.name}.conf"
-  else
-    "/etc/apache2/conf.d/#{new_resource.name}"
-  end
+  "/etc/apache2/conf-enabled/#{new_resource.name}.conf"

 end
 end