Remove arcfour (RC4) cipher no longer available in newer OpenSSH

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

diff --git a/cookbooks/apache/providers/site.rb b/cookbooks/apache/providers/site.rb
index 86fecbfcf73376718984ac6c34a7d4395fe3c749..a8c90344927f818a25146df51470580db980c20b 100644 (file)
--- a/cookbooks/apache/providers/site.rb
+++ b/cookbooks/apache/providers/site.rb
@@ -21,46 +21,37 @@ def whyrun_supported?
   true
 end
 
   true
 end
 

+use_inline_resources
+

 action :create do
 action :create do

-  t = template available_name do
+  template available_name do

     cookbook new_resource.cookbook
     source new_resource.template
     owner "root"
     group "root"
     mode 0644
     variables new_resource.variables.merge(:name => new_resource.name, :directory => site_directory)
     cookbook new_resource.cookbook
     source new_resource.template
     owner "root"
     group "root"
     mode 0644
     variables new_resource.variables.merge(:name => new_resource.name, :directory => site_directory)

-    notifies :reload, "service[apache2]" if enabled?

   end
   end

-
-  new_resource.updated_by_last_action(t.updated_by_last_action?)

 end
 
 action :enable do
 end
 
 action :enable do

-  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
 
 action :disable do
 end
 
 action :disable do

-  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
 
 action :delete do
 end
 
 action :delete do

-  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 site_directory
 end
 
 def site_directory


@@ -92,7 +83,3 @@ def enabled_name
     end
   end
 end
     end
   end
 end

-
-def enabled?
-  ::File.exists?(enabled_name)
-end