X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4d52bd4c0f8e6ae7679145846b7bc7845d8ace..e38e912b2f2c25d0f76deb462695aaf58f8f397d:/cookbooks/openssh/recipes/default.rb?ds=inline diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb index 90ac311b6..a8af1dece 100644 --- a/cookbooks/openssh/recipes/default.rb +++ b/cookbooks/openssh/recipes/default.rb @@ -27,31 +27,31 @@ service "ssh" do if node[:lsb][:release].to_f >= 14.04 provider Chef::Provider::Service::Upstart end - action [ :enable, :start ] + action [:enable, :start] supports :status => true, :restart => true, :reload => true end hosts = search(:node, "networking:interfaces").sort_by { |n| n[:hostname] }.collect do |node| - names = [ node[:hostname] ] + names = [node[:hostname]] node.interfaces(:role => :external).each do |interface| - names |= [ "#{node[:hostname]}.openstreetmap.org" ] - names |= [ "#{node[:hostname]}.#{interface[:zone]}.openstreetmap.org" ] + names |= ["#{node[:hostname]}.openstreetmap.org"] + names |= ["#{node[:hostname]}.#{interface[:zone]}.openstreetmap.org"] end unless node.interfaces(:role => :internal).empty? - names |= [ "#{node[:hostname]}.#{node[:networking][:roles][:external][:zone]}.openstreetmap.org" ] + 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] + "rsa" => node[:keys][:ssh][:host_rsa_public], # ~FC039 + "dsa" => node[:keys][:ssh][:host_dsa_public] # ~FC039 } - if node[:keys][:ssh][:host_ecdsa_public] - ecdsa_type = node[:keys][:ssh][:host_ecdsa_type] + if node[:keys][:ssh][:host_ecdsa_public] # ~FC039 + ecdsa_type = node[:keys][:ssh][:host_ecdsa_type] # ~FC039 - keys[ecdsa_type] = node[:keys][:ssh][:host_ecdsa_public] + keys[ecdsa_type] = node[:keys][:ssh][:host_ecdsa_public] # ~FC039 end Hash[