lib/ohai/plugins/ssh_host_key.rb in ohai-13.12.6 vs lib/ohai/plugins/ssh_host_key.rb in ohai-14.0.28
- old
+ new
@@ -36,17 +36,17 @@
end
collect_data do
keys[:ssh] = Mash.new
- sshd_config = if File.exists?("/etc/ssh/sshd_config")
+ sshd_config = if File.exist?("/etc/ssh/sshd_config")
"/etc/ssh/sshd_config"
- elsif File.exists?("/etc/sshd_config")
+ elsif File.exist?("/etc/sshd_config")
# Darwin
"/etc/sshd_config"
else
- Ohai::Log.debug("Plugin SSHHostKey: Failed to find sshd configuration file")
+ logger.trace("Plugin SSHHostKey: Failed to find sshd configuration file")
nil
end
if sshd_config
File.open(sshd_config) do |conf|
@@ -60,24 +60,24 @@
end
end
end
end
- if keys[:ssh][:host_dsa_public].nil? && File.exists?("/etc/ssh/ssh_host_dsa_key.pub")
+ if keys[:ssh][:host_dsa_public].nil? && File.exist?("/etc/ssh/ssh_host_dsa_key.pub")
keys[:ssh][:host_dsa_public] = IO.read("/etc/ssh/ssh_host_dsa_key.pub").split[1]
end
- if keys[:ssh][:host_rsa_public].nil? && File.exists?("/etc/ssh/ssh_host_rsa_key.pub")
+ if keys[:ssh][:host_rsa_public].nil? && File.exist?("/etc/ssh/ssh_host_rsa_key.pub")
keys[:ssh][:host_rsa_public] = IO.read("/etc/ssh/ssh_host_rsa_key.pub").split[1]
end
- if keys[:ssh][:host_ecdsa_public].nil? && File.exists?("/etc/ssh/ssh_host_ecdsa_key.pub")
+ if keys[:ssh][:host_ecdsa_public].nil? && File.exist?("/etc/ssh/ssh_host_ecdsa_key.pub")
content = IO.read("/etc/ssh/ssh_host_ecdsa_key.pub")
keys[:ssh][:host_ecdsa_public] = content.split[1]
keys[:ssh][:host_ecdsa_type] = content.split[0]
end
- if keys[:ssh][:host_ed25519_public].nil? && File.exists?("/etc/ssh/ssh_host_ed25519_key.pub")
+ if keys[:ssh][:host_ed25519_public].nil? && File.exist?("/etc/ssh/ssh_host_ed25519_key.pub")
keys[:ssh][:host_ed25519_public] = IO.read("/etc/ssh/ssh_host_ed25519_key.pub").split[1]
end
end
end