X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/81a4cb2bb67d0ee701260ca9f8c9441a686bf308..8f64e2934813c9e8c50188de33adb10f5664780d:/cookbooks/openssh/recipes/default.rb diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb index 79a2dd1fb..a8af1dece 100644 --- a/cookbooks/openssh/recipes/default.rb +++ b/cookbooks/openssh/recipes/default.rb @@ -24,31 +24,34 @@ package "openssh-client" package "openssh-server" service "ssh" do - action [ :enable, :start ] + if node[:lsb][:release].to_f >= 14.04 + provider Chef::Provider::Service::Upstart + end + action [:enable, :start] supports :status => true, :restart => true, :reload => true end -hosts = search(:node, "networking:interfaces").sort_by do |node| - node[:hostname] -end.collect do |node| - names = [ node[:hostname] ] +hosts = search(:node, "networking:interfaces").sort_by { |n| n[:hostname] }.collect do |node| + 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] - keys[node[:keys][:ssh][:host_ecdsa_type]] = node[:keys][:ssh][:host_ecdsa_public] + 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] # ~FC039 end Hash[