X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a68415b8f2bf106b6ea5948b0605c897b516ef4f..4ad7e0b2d223531a863c7a6d24d78b37cae6aa73:/cookbooks/openssh/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb
index 2ab68392d..3349dc85d 100644
--- a/cookbooks/openssh/recipes/default.rb
+++ b/cookbooks/openssh/recipes/default.rb
@@ -1,15 +1,15 @@
 #
-# 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.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,40 +24,40 @@ package "openssh-client"
 package "openssh-server"
 
 service "ssh" do
-  if node[:lsb][:release].to_f >= 15.10
-    provider Chef::Provider::Service::Systemd
-  elsif 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 { |n| n[:hostname] }.collect do |node|
-  names = [node[:hostname]]
+  name = node.name.split(".").first
 
-  node.interfaces(:role => :external).each do |interface|
-    names |= ["#{node[:hostname]}.openstreetmap.org"]
-    names |= ["#{node[:hostname]}.#{interface[:zone]}.openstreetmap.org"]
-  end
+  names = [name]
 
   unless node.interfaces(:role => :internal).empty?
-    names |= ["#{node[:hostname]}.#{node[:networking][:roles][:external][:zone]}.openstreetmap.org"]
+    names.unshift("#{name}.#{node[:networking][:roles][:external][:zone]}.openstreetmap.org")
+  end
+
+  unless node.interfaces(:role => :external).empty?
+    names.unshift("#{name}.openstreetmap.org")
   end
 
   keys = {
-    "rsa" => node[:keys][:ssh][:host_rsa_public],            # ~FC039
-    "dsa" => 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]
+  end
 
-    keys[ecdsa_type] = node[:keys][:ssh][:host_ecdsa_public] # ~FC039
+  if node[:keys][:ssh][:host_ed25519_public]
+    keys["ssh-ed25519"] = node[:keys][:ssh][:host_ed25519_public]
   end
 
   Hash[
-    :names => names.sort,
+    :names => names,
     :addresses => node.ipaddresses.sort,
     :keys => keys
   ]
@@ -86,5 +86,5 @@ firewall_rule "accept-ssh" do
   source "net"
   dest "fw"
   proto "tcp:syn"
-  dest_ports "ssh"
+  dest_ports node[:openssh][:port]
 end