X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5c5ffa21ddcce610d5bbf7b3885b08497e85dac4..e5cfdc9914e4d57a2e7cb5cfb370eeb97683f745:/cookbooks/openssh/recipes/default.rb diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb index ceb9a6792..432da265f 100644 --- a/cookbooks/openssh/recipes/default.rb +++ b/cookbooks/openssh/recipes/default.rb @@ -42,11 +42,21 @@ end.collect do |node| names |= [ "#{node[:hostname]}.#{node[:networking][:roles][:external][:zone]}.openstreetmap.org" ] end + keys = { + "rsa" => node[:keys][:ssh][:host_rsa_public], + "dsa" => node[:keys][:ssh][:host_dsa_public] + } + + if 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[ :names => names.sort, :addresses => node.ipaddresses.sort, - :rsa => node[:keys][:ssh][:host_rsa_public], - :dsa => node[:keys][:ssh][:host_dsa_public] + :keys => keys ] end