X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/75c5da85dcd5a6b5b66040dfd838c2bbf30ba4d5..4869af95cca2e03c7d84de5daae9e70cba72be46:/cookbooks/openssh/recipes/default.rb

diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb
index 9eca4a5ba..b69a86a51 100644
--- a/cookbooks/openssh/recipes/default.rb
+++ b/cookbooks/openssh/recipes/default.rb
@@ -9,7 +9,7 @@
 # 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,
@@ -41,8 +41,8 @@ hosts = search(:node, "networking:interfaces").sort_by { |n| n[:hostname] }.coll
   end
 
   keys = {
-    "rsa" => node[:keys][:ssh][:host_rsa_public],            # ~FC039
-    "dsa" => node[:keys][:ssh][:host_dsa_public]             # ~FC039
+    "ssh-rsa" => node[:keys][:ssh][:host_rsa_public],        # ~FC039
+    "ssh-dss" => node[:keys][:ssh][:host_dsa_public]         # ~FC039
   }
 
   if node[:keys][:ssh][:host_ecdsa_public]                   # ~FC039
@@ -51,6 +51,10 @@ hosts = search(:node, "networking:interfaces").sort_by { |n| n[:hostname] }.coll
     keys[ecdsa_type] = node[:keys][:ssh][:host_ecdsa_public] # ~FC039
   end
 
+  if node[:keys][:ssh][:host_ed25519_public]                      # ~FC039
+    keys["ssh-ed25519"] = node[:keys][:ssh][:host_ed25519_public] # ~FC039
+  end
+
   Hash[
     :names => names.sort,
     :addresses => node.ipaddresses.sort,
@@ -81,5 +85,5 @@ firewall_rule "accept-ssh" do
   source "net"
   dest "fw"
   proto "tcp:syn"
-  dest_ports "ssh"
+  dest_ports node[:openssh][:port]
 end