#
-# 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,
package "openssh-server"
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 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]
+ "ssh-rsa" => node[:keys][:ssh][:host_rsa_public],
+ "ssh-dss" => node[:keys][:ssh][:host_dsa_public]
}
if node[:keys][:ssh][:host_ecdsa_public]
keys[ecdsa_type] = node[:keys][:ssh][:host_ecdsa_public]
end
+ if node[:keys][:ssh][:host_ed25519_public]
+ keys["ssh-ed25519"] = node[:keys][:ssh][:host_ed25519_public]
+ end
+
Hash[
:names => names.sort,
:addresses => node.ipaddresses.sort,
template "/etc/ssh/ssh_config" do
source "ssh_config.erb"
- mode 0644
+ mode 0o644
owner "root"
group "root"
end
template "/etc/ssh/ssh_known_hosts" do
source "ssh_known_hosts.erb"
- mode 0444
+ mode 0o444
owner "root"
group "root"
backup false
source "net"
dest "fw"
proto "tcp:syn"
- dest_ports "ssh"
+ dest_ports node[:openssh][:port]
end