X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/81a4cb2bb67d0ee701260ca9f8c9441a686bf308..268080a830edf117cb108d2b52865a19d3757f76:/cookbooks/openssh/recipes/default.rb

diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb
index 79a2dd1fb..0bae591ce 100644
--- a/cookbooks/openssh/recipes/default.rb
+++ b/cookbooks/openssh/recipes/default.rb
@@ -24,6 +24,9 @@ package "openssh-client"
 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
@@ -48,7 +51,9 @@ end.collect do |node|
   }
 
   if node[:keys][:ssh][:host_ecdsa_public]
-    keys[node[:keys][:ssh][:host_ecdsa_type]] = 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[