cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add support for RSA/DSA SSH host key detection in setup module for OS/X

Browse source 
s/<8spaces>/<4spaces>/g
This commit is contained in:
Jan-Piet Mens 2012-09-06 20:21:05 +02:00
parent f41d3b9bd2
commit b36aa61237
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/setup
View file

@ -104,8 +104,14 @@ class Facts(object):
self.facts['distribution'] = name self.facts['distribution'] = name
def get_public_ssh_host_keys(self): def get_public_ssh_host_keys(self):
dsa = get_file_content('/etc/ssh/ssh_host_dsa_key.pub') dsa_filename = '/etc/ssh/ssh_host_dsa_key.pub'
rsa = get_file_content('/etc/ssh/ssh_host_rsa_key.pub') rsa_filename = '/etc/ssh/ssh_host_rsa_key.pub'
if self.facts['system'] == 'Darwin':
dsa_filename = '/etc/ssh_host_dsa_key.pub'
rsa_filename = '/etc/ssh_host_rsa_key.pub'
dsa = get_file_content(dsa_filename)
rsa = get_file_content(rsa_filename)
if dsa is None: if dsa is None:
dsa = 'NA' dsa = 'NA'
else: else: