utils.makedirs (ssh_dir)
# original code used to specify -b 1024 for the rsa1 key
+ # fedora23 seems to come with a release of openssh that lacks suppport
+ # for ssh1, and thus rsa1 keys; so we consider that failing to produce
+ # the rsa1 key is not a showstopper
key_specs = [
- ("/etc/ssh/ssh_host_key", 'rsa1', "SSH1 RSA"),
- ("/etc/ssh/ssh_host_rsa_key", 'rsa', "SSH2 RSA"),
- ("/etc/ssh/ssh_host_dsa_key", 'dsa', "SSH2 DSA"),
+ ("/etc/ssh/ssh_host_key", 'rsa1', "SSH1 RSA", False),
+ ("/etc/ssh/ssh_host_rsa_key", 'rsa', "SSH2 RSA", True),
+ ("/etc/ssh/ssh_host_dsa_key", 'dsa', "SSH2 DSA", True),
]
- for key_file, key_type, label in key_specs:
+ for key_file, key_type, label, mandatory in key_specs:
if not os.path.exists(key_file):
log.write("Creating {} host key {}\n".format(label, key_file))
- utils.sysexec("{} -q -t {} -f {} -C '' -N ''"\
- .format(key_gen_prog, key_type, key_file), log)
- utils.sysexec("chmod 600 {}".format(key_file), log)
- utils.sysexec("chmod 644 {}.pub".format(key_file), log)
+ if mandatory:
+ run = utils.sysexec
+ else:
+ run = utils.sysexec_noerr
+ run("{} -q -t {} -f {} -C '' -N ''"\
+ .format(key_gen_prog, key_type, key_file), log)
+ run("chmod 600 {}".format(key_file), log)
+ run("chmod 644 {}.pub".format(key_file), log)
# (over)write sshd config
utils.sysexec("cp -f {}/sshd_config {}/sshd_config".format(ssh_source_files, ssh_dir), log)