Merge commit 'ng/master'

2 files changed, 13 insertions, 7 deletions

diff --git a/manifests/client.pp b/manifests/client.pp
index f0b05c5..34308b4 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -3,15 +3,16 @@
 class sshd::client {
     case $operatingsystem {
         debian: { include sshd::client::debian }
-        default: { include sshd::client::base }
+        default: { 
+            case $kernel {
+                linux: { include sshd::client::linux }
+                default:  { include sshd::client::base }
+            }
+        }
     }
 }
 
 class sshd::client::base {
-    package {'openssh-clients':
-        ensure => installed,
-    }
-
     # this is needed because the gid might have changed
     file { '/etc/ssh/ssh_known_hosts':
             mode => 0644, owner => root, group => 0;
@@ -21,7 +22,13 @@ class sshd::client::base {
     Sshkey <<||>>
 }
 
-class sshd::client::debian inherits sshd::client::base {
+class sshd::client::linux inherits sshd::client::base {
+    package {'openssh-clients':
+        ensure => installed,
+    }
+}
+
+class sshd::client::debian inherits sshd::client::linux {
     Package['openssh-clients']{
         name => 'openssh-client',
     }
diff --git a/manifests/init.pp b/manifests/init.pp
index 96e6d08..55a2714 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -210,7 +210,6 @@ class sshd::base {
                 type => ssh-rsa,
                 key => $sshrsakey_key,
                 ensure => present,
-                require => Package["openssh-clients"],
             }
         }
     }