diff options
| author | varac <varacanero@zeromail.org> | 2015-05-04 14:03:50 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-05-04 14:03:50 +0200 |
| commit | 943dd94dfab1de9316a5ed4c0751b36a6c75447a (patch) | |
| tree | ea8e120b7d7ef84ba71391f39870092e43391627 /manifests/init.pp | |
| parent | 750a497758d94c2f5a6cad23cecc3dbde2d2f92f (diff) | |
| parent | e9596d0f6d243ae00bb5b360a5c37bed577c5438 (diff) | |
Merge remote-tracking branch 'shared/master' into leap_master
Conflicts:
templates/sshd_config/Debian_wheezy.erb
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 5a38293..0f8c472 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -28,7 +28,7 @@ class sshd( $hostbased_authentication = 'no', $permit_empty_passwords = 'no', $authorized_keys_file = $::osfamily ? { - Debian => $::operatingsystemmajrelease ? { + Debian => $::lsbmajdistrelease ? { 6 => '%h/.ssh/authorized_keys', default => '%h/.ssh/authorized_keys %h/.ssh/authorized_keys2', }, @@ -49,6 +49,10 @@ class sshd( $shorewall_source = 'net', $sshkey_ipaddress = $::ipaddress, $manage_client = true, + $hostkey_type = versioncmp($::ssh_version, '6.5') ? { + /(^1|0)/ => [ 'rsa', 'ed25519' ], + /-1/ => [ 'rsa', 'dsa' ] + } ) { validate_bool($manage_shorewall) |