diff options
| author | mh <mh@immerda.ch> | 2014-06-10 18:29:47 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-06-10 18:29:47 +0200 |
| commit | 0f9315b4f348c0f6ff69feeca3606a00b1089375 (patch) | |
| tree | ab3430ed813bd7aed101671bd16be384933f0c12 | |
| parent | cd783ad5ebdc3dce0992ec03b15c0e9fb7293fb0 (diff) | |
| download | puppet-sshd-0f9315b4f348c0f6ff69feeca3606a00b1089375.tar.gz puppet-sshd-0f9315b4f348c0f6ff69feeca3606a00b1089375.tar.bz2 | |
not all versions support the new default
| -rw-r--r-- | manifests/init.pp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index d005d60..6b9c66a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -26,7 +26,17 @@ class sshd( $rhosts_rsa_authentication = 'no', $hostbased_authentication = 'no', $permit_empty_passwords = 'no', - $authorized_keys_file = '%h/.ssh/authorized_keys %h/.ssh/authorized_keys2', + $authorized_keys_file = $::osfamily ? { + Debian => $::operatingsystemmajrelease ? { + 6 => '%h/.ssh/authorized_keys', + default => '%h/.ssh/authorized_keys %h/.ssh/authorized_keys2', + }, + RedHat => $::operatingsystemmajrelease ? { + 5 => '%h/.ssh/authorized_keys', + default => '%h/.ssh/authorized_keys %h/.ssh/authorized_keys2', + }, + default => '%h/.ssh/authorized_keys %h/.ssh/authorized_keys2', + }, $hardened_ssl = 'no', $sftp_subsystem = '', $head_additional_options = '', |