Add OOB MAC addresses for tiamat nodes

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

diff --git a/cookbooks/apache/providers/conf.rb b/cookbooks/apache/providers/conf.rb
index d249079d961144cc0e9cc067f4caa1b065afc5a8..16759e86f7624cd74a2b959bfaac883977e02941 100644 (file)
--- a/cookbooks/apache/providers/conf.rb
+++ b/cookbooks/apache/providers/conf.rb
@@ -21,92 +21,59 @@ def whyrun_supported?
   true
 end
 
   true
 end
 

+use_inline_resources
+

 action :create do
 action :create do

-  if node[:lsb][:release].to_f >= 14.04
-    create_conf
-  end
+  create_conf

 end
 
 action :enable do
 end
 
 action :enable do

-  if node[:lsb][:release].to_f >= 14.04
-    enable_conf
-  else
-    create_conf
-  end
+  enable_conf

 end
 
 action :disable do
 end
 
 action :disable do

-  if node[:lsb][:release].to_f >= 14.04
-    disable_conf
-  else
-    delete_conf
-  end
+  disable_conf

 end
 
 action :delete do
 end
 
 action :delete do

-  if node[:lsb][:release].to_f >= 14.04
-    delete_conf
-  end
+  delete_conf

 end
 
 def create_conf
 end
 
 def create_conf

-  t = template available_name do
+  template available_name do

     cookbook new_resource.cookbook
     source new_resource.template
     owner "root"
     group "root"
     cookbook new_resource.cookbook
     source new_resource.template
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables new_resource.variables
     variables new_resource.variables

-    notifies :reload, "service[apache2]" if enabled? or available_name == enabled_name

   end
   end

-
-  new_resource.updated_by_last_action(t.updated_by_last_action?)

 end
 
 def enable_conf
 end
 
 def enable_conf

-  l = link enabled_name do
+  link enabled_name do

     to available_name
     owner "root"
     group "root"
     to available_name
     owner "root"
     group "root"

-    notifies :reload, "service[apache2]"

   end
   end

-
-  new_resource.updated_by_last_action(l.updated_by_last_action?)

 end
 
 def disable_conf
 end
 
 def disable_conf

-  l = link enabled_name do
+  link enabled_name do

     action :delete
     action :delete

-    notifies :reload, "service[apache2]"

   end
   end

-
-  new_resource.updated_by_last_action(l.updated_by_last_action?)

 end
 
 def delete_conf
 end
 
 def delete_conf

-  f = file available_name do
+  file available_name do

     action :delete
   end
     action :delete
   end

-
-  new_resource.updated_by_last_action(f.updated_by_last_action?)

 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
-end
-
-def enabled?
-  ::File.exists?(enabled_name)
+  "/etc/apache2/conf-enabled/#{new_resource.name}.conf"

 end
 end