Link to latest PBF as well.

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

diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb
index 59c8fe7d897ecef612f0ea30340961e8276e9129..0bae591ceb4d2ea4c973b202fda626fb517074ad 100644 (file)
--- a/cookbooks/openssh/recipes/default.rb
+++ b/cookbooks/openssh/recipes/default.rb
@@ -24,12 +24,11 @@ package "openssh-client"
 package "openssh-server"
 
 service "ssh" do
 package "openssh-server"
 
 service "ssh" do

-  action [ :enable, :start ]
-  if node[:lsb][:release].to_f >= 10.04
-    supports :status => true, :restart => true, :reload => true
-  else 
-    supports :restart => true, :reload => true
+  if node[:lsb][:release].to_f >= 14.04
+    provider Chef::Provider::Service::Upstart

   end
   end

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

 end
 
 hosts = search(:node, "networking:interfaces").sort_by do |node|
 end
 
 hosts = search(:node, "networking:interfaces").sort_by do |node|


@@ -46,11 +45,21 @@ end.collect do |node|
     names |= [ "#{node[:hostname]}.#{node[:networking][:roles][:external][:zone]}.openstreetmap.org" ]
   end
 
     names |= [ "#{node[:hostname]}.#{node[:networking][:roles][:external][:zone]}.openstreetmap.org" ]
   end
 

+  keys = {
+    "rsa" => node[:keys][:ssh][:host_rsa_public],
+    "dsa" => node[:keys][:ssh][:host_dsa_public]
+  }
+
+  if node[:keys][:ssh][:host_ecdsa_public]
+    ecdsa_type = node[:keys][:ssh][:host_ecdsa_type]
+
+    keys[ecdsa_type] = node[:keys][:ssh][:host_ecdsa_public]
+  end
+

   Hash[
     :names => names.sort,
     :addresses => node.ipaddresses.sort,
   Hash[
     :names => names.sort,
     :addresses => node.ipaddresses.sort,

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

   ]
 end
 
   ]
 end