Use systemd to manage sshd on Ubuntu 15.10
[chef.git] / cookbooks / openssh / recipes / default.rb
index fce68dbdd62836f6270fa46cbc55f4a54fb26fd2..33b703421f3186529f0431d84de1f38368b93d7d 100644 (file)
@@ -24,7 +24,9 @@ package "openssh-client"
 package "openssh-server"
 
 service "ssh" do
-  if node[:lsb][:release].to_f >= 14.04
+  if node[:lsb][:release].to_f >= 15.10
+    provider Chef::Provider::Service::Systemd
+  elsif node[:lsb][:release].to_f >= 14.04
     provider Chef::Provider::Service::Upstart
   end
   action [:enable, :start]
@@ -44,14 +46,14 @@ hosts = search(:node, "networking:interfaces").sort_by { |n| n[:hostname] }.coll
   end
 
   keys = {
-    "rsa" => node[:keys][:ssh][:host_rsa_public],
-    "dsa" => node[:keys][:ssh][:host_dsa_public]
+    "rsa" => node[:keys][:ssh][:host_rsa_public],            # ~FC039
+    "dsa" => node[:keys][:ssh][:host_dsa_public]             # ~FC039
   }
 
-  if node[:keys][:ssh][:host_ecdsa_public]
-    ecdsa_type = node[:keys][:ssh][:host_ecdsa_type]
+  if node[:keys][:ssh][:host_ecdsa_public]                   # ~FC039
+    ecdsa_type = node[:keys][:ssh][:host_ecdsa_type]         # ~FC039
 
-    keys[ecdsa_type] = node[:keys][:ssh][:host_ecdsa_public]
+    keys[ecdsa_type] = node[:keys][:ssh][:host_ecdsa_public] # ~FC039
   end
 
   Hash[