X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/73934fbd8f6ca2a17b3a6d37f2196ede5e0d9853..81a4cb2bb67d0ee701260ca9f8c9441a686bf308:/cookbooks/openssh/recipes/default.rb diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb index ceb9a6792..79a2dd1fb 100644 --- a/cookbooks/openssh/recipes/default.rb +++ b/cookbooks/openssh/recipes/default.rb @@ -42,11 +42,19 @@ 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] + keys[node[:keys][:ssh][:host_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