X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6728ed67e4d7dfb29fe546edc21d629fc4ac348c..aec1cf26497af11e487a6a62ac924f514bc4ecf3:/cookbooks/openssh/recipes/default.rb?ds=inline diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb index 432da265f..a8af1dece 100644 --- a/cookbooks/openssh/recipes/default.rb +++ b/cookbooks/openssh/recipes/default.rb @@ -24,33 +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] - 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[