X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d626103e52cc24d2e5e0f4d67bc46be86e0f6ce9..f2e8efe99b471cd5aef85977e6b22d024151c9a4:/cookbooks/openssh/recipes/default.rb diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb index b69a86a51..49c890b34 100644 --- a/cookbooks/openssh/recipes/default.rb +++ b/cookbooks/openssh/recipes/default.rb @@ -1,9 +1,9 @@ # -# 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. @@ -41,18 +41,18 @@ hosts = search(:node, "networking:interfaces").sort_by { |n| n[:hostname] }.coll end keys = { - "ssh-rsa" => node[:keys][:ssh][:host_rsa_public], # ~FC039 - "ssh-dss" => node[:keys][:ssh][:host_dsa_public] # ~FC039 + "ssh-rsa" => node[:keys][:ssh][:host_rsa_public], + "ssh-dss" => node[:keys][:ssh][:host_dsa_public] } - if node[:keys][:ssh][:host_ecdsa_public] # ~FC039 - ecdsa_type = node[:keys][:ssh][:host_ecdsa_type] # ~FC039 + if node[:keys][:ssh][:host_ecdsa_public] + ecdsa_type = node[:keys][:ssh][:host_ecdsa_type] - keys[ecdsa_type] = node[:keys][:ssh][:host_ecdsa_public] # ~FC039 + keys[ecdsa_type] = node[:keys][:ssh][:host_ecdsa_public] end - if node[:keys][:ssh][:host_ed25519_public] # ~FC039 - keys["ssh-ed25519"] = node[:keys][:ssh][:host_ed25519_public] # ~FC039 + if node[:keys][:ssh][:host_ed25519_public] + keys["ssh-ed25519"] = node[:keys][:ssh][:host_ed25519_public] end Hash[