Remove civicrm-staging and role

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

diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb
index 3349dc85d8bd7bc184a3398d2c37f289c1b6747e..8b57aaaef75ef5e799b1ab08be8e6440cc811817 100644 (file)
--- a/cookbooks/openssh/recipes/default.rb
+++ b/cookbooks/openssh/recipes/default.rb
@@ -23,6 +23,15 @@ include_recipe "networking"
 package "openssh-client"
 package "openssh-server"
 
 package "openssh-client"
 package "openssh-server"
 

+template "/etc/ssh/sshd_config.d/chef.conf" do
+  source "sshd_config.conf.erb"
+  owner "root"
+  group "root"
+  mode "644"
+  notifies :restart, "service[ssh]"
+  only_if { Dir.exist?("/etc/ssh/sshd_config.d") }
+end
+

 service "ssh" do
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 service "ssh" do
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true


@@ -42,8 +51,7 @@ hosts = search(:node, "networking:interfaces").sort_by { |n| n[:hostname] }.coll
   end
 
   keys = {
   end
 
   keys = {

-    "ssh-rsa" => node[:keys][:ssh][:host_rsa_public],
-    "ssh-dss" => node[:keys][:ssh][:host_dsa_public]
+    "ssh-rsa" => node[:keys][:ssh][:host_rsa_public]

   }
 
   if node[:keys][:ssh][:host_ecdsa_public]
   }
 
   if node[:keys][:ssh][:host_ecdsa_public]


@@ -63,16 +71,9 @@ hosts = search(:node, "networking:interfaces").sort_by { |n| n[:hostname] }.coll
   ]
 end
 
   ]
 end
 

-template "/etc/ssh/ssh_config" do
-  source "ssh_config.erb"
-  mode 0o644
-  owner "root"
-  group "root"
-end
-

 template "/etc/ssh/ssh_known_hosts" do
   source "ssh_known_hosts.erb"
 template "/etc/ssh/ssh_known_hosts" do
   source "ssh_known_hosts.erb"

-  mode 0o444
+  mode "444"

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


@@ -83,8 +84,7 @@ end
 
 firewall_rule "accept-ssh" do
   action :accept
 
 firewall_rule "accept-ssh" do
   action :accept

-  source "net"
-  dest "fw"
-  proto "tcp:syn"
+  context :incoming
+  protocol :tcp

   dest_ports node[:openssh][:port]
 end
   dest_ports node[:openssh][:port]
 end