Disable chef exception handler

[chef.git] / cookbooks / openssh / recipes / default.rb

diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb
index a8af1dece79ad0fc3be8232f7a4aefbf24d277d6..9eca4a5ba0633f1d85bca960266c38f5c86e306a 100644 (file)
--- a/cookbooks/openssh/recipes/default.rb
+++ b/cookbooks/openssh/recipes/default.rb
@@ -24,9 +24,6 @@ package "openssh-client"
 package "openssh-server"
 
 service "ssh" do
 package "openssh-server"
 
 service "ssh" do

-  if node[:lsb][:release].to_f >= 14.04
-    provider Chef::Provider::Service::Upstart
-  end

   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end


@@ -63,14 +60,14 @@ end
 
 template "/etc/ssh/ssh_config" do
   source "ssh_config.erb"
 
 template "/etc/ssh/ssh_config" do
   source "ssh_config.erb"

-  mode 0644
+  mode 0o644

   owner "root"
   group "root"
 end
 
 template "/etc/ssh/ssh_known_hosts" do
   source "ssh_known_hosts.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/ssh/ssh_known_hosts" do
   source "ssh_known_hosts.erb"

-  mode 0444
+  mode 0o444

   owner "root"
   group "root"
   backup false
   owner "root"
   group "root"
   backup false