make it possible to override what version of openssh-server and client are installed...

diff --git a/manifests/client.pp b/manifests/client.pp
index 34308b467c604406074653108511c28faa962d85..7dfe913f46731de6731ea9b5851e9380f920d7e0 100644 (file)
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -13,13 +13,22 @@ class sshd::client {
 }
 
 class sshd::client::base {
-    # this is needed because the gid might have changed
-    file { '/etc/ssh/ssh_known_hosts':
-            mode => 0644, owner => root, group => 0;
-    }
-    
-    # Now collect all server keys
-    Sshkey <<||>>
+
+  case $sshd_ensure_version {
+    '': { $sshd_ensure_version = "present" }
+  }
+  
+  package{openssh-clients:
+    ensure => $sshd_ensure_version,
+  }
+
+  # this is needed because the gid might have changed
+  file { '/etc/ssh/ssh_known_hosts':
+    mode => 0644, owner => root, group => 0;
+  }
+  
+  # Now collect all server keys
+  Sshkey <<||>>
 }
 
 class sshd::client::linux inherits sshd::client::base {

diff --git a/manifests/init.pp b/manifests/init.pp
index b7ae2000992809b06efba60acd49b4b93235bf60..5179e082073bd80717ce600593844d5171aa8bfd 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -208,6 +208,12 @@ class sshd::base {
   case $sshd_tail_additional_options {
     '': { $sshd_tail_additional_options = '' }
   }
+  case $sshd_ensure_version {
+    '': { $sshd_ensure_version = "present" }
+  }
+
+  package{openssh:
+    ensure => $sshd_ensure_version,
   }
   
   file { 'sshd_config':