diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2017-06-05 19:07:25 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2017-06-05 19:07:25 -0300 |
| commit | d28abdcacbe5fe09db4dec3d2de391d39ae9d414 (patch) | |
| tree | 468ff2baa43d347a1ae664996ee9a9e70e672f6f | |
| parent | abb2ccd34cac4f543ca2400630358a596922ab3c (diff) | |
| download | puppet-sshd-d28abdcacbe5fe09db4dec3d2de391d39ae9d414.tar.gz puppet-sshd-d28abdcacbe5fe09db4dec3d2de391d39ae9d414.tar.bz2 | |
Changes for puppet 4 compatibility
| -rw-r--r-- | manifests/init.pp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index b415741..e3f8756 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -28,16 +28,16 @@ class sshd( $hostbased_authentication = 'no', $permit_empty_passwords = 'no', $authorized_keys_file = $::osfamily ? { - Debian => $::lsbmajdistrelease ? { + 'Debian' => $::lsbmajdistrelease ? { 6 => '%h/.ssh/authorized_keys', default => '%h/.ssh/authorized_keys %h/.ssh/authorized_keys2', }, - RedHat => $::operatingsystemmajrelease ? { + 'RedHat' => $::operatingsystemmajrelease ? { 5 => '%h/.ssh/authorized_keys', 6 => '%h/.ssh/authorized_keys', default => '%h/.ssh/authorized_keys %h/.ssh/authorized_keys2', }, - OpenBSD => '%h/.ssh/authorized_keys', + 'OpenBSD' => '%h/.ssh/authorized_keys', default => '%h/.ssh/authorized_keys %h/.ssh/authorized_keys2', }, $hardened = 'no', @@ -50,8 +50,9 @@ class sshd( $sshkey_ipaddress = $::ipaddress, $manage_client = true, $hostkey_type = versioncmp($::ssh_version, '6.5') ? { - /(^1|0)/ => [ 'rsa', 'ed25519' ], - /-1/ => [ 'rsa', 'dsa' ] + 0 => [ 'rsa', 'ed25519' ], + 1 => [ 'rsa', 'ed25519' ], + -1 => [ 'rsa', 'dsa' ] }, $use_storedconfigs = true ) { |