X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..bff262debe7a3c7fb831433066c17028bb5d9e06:/cookbooks/openssh/recipes/default.rb diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb index 3d5f4a460..08d1aded8 100644 --- a/cookbooks/openssh/recipes/default.rb +++ b/cookbooks/openssh/recipes/default.rb @@ -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,