X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..027e6c6a30ad50302390f6ea56d3bbf7a49f4fdf:/cookbooks/openssh/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb
index fce68dbdd..49c890b34 100644
--- a/cookbooks/openssh/recipes/default.rb
+++ b/cookbooks/openssh/recipes/default.rb
@@ -1,15 +1,15 @@
 #
-# Cookbook Name:: openssh
+# Cookbook:: openssh
 # Recipe:: default
 #
-# Copyright 2010, OpenStreetMap Foundation.
-# Copyright 2008-2009, Opscode, Inc.
+# Copyright:: 2010, OpenStreetMap Foundation.
+# Copyright:: 2008-2009, Opscode, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,9 +24,6 @@ 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
@@ -44,8 +41,8 @@ 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]
+    "ssh-rsa" => node[:keys][:ssh][:host_rsa_public],
+    "ssh-dss" => node[:keys][:ssh][:host_dsa_public]
   }
 
   if node[:keys][:ssh][:host_ecdsa_public]
@@ -54,6 +51,10 @@ hosts = search(:node, "networking:interfaces").sort_by { |n| n[:hostname] }.coll
     keys[ecdsa_type] = node[:keys][:ssh][:host_ecdsa_public]
   end
 
+  if node[:keys][:ssh][:host_ed25519_public]
+    keys["ssh-ed25519"] = node[:keys][:ssh][:host_ed25519_public]
+  end
+
   Hash[
     :names => names.sort,
     :addresses => node.ipaddresses.sort,
@@ -63,14 +64,14 @@ end
 
 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"
-  mode 0444
+  mode 0o444
   owner "root"
   group "root"
   backup false
@@ -84,5 +85,5 @@ firewall_rule "accept-ssh" do
   source "net"
   dest "fw"
   proto "tcp:syn"
-  dest_ports "ssh"
+  dest_ports node[:openssh][:port]
 end