aboutsummaryrefslogtreecommitdiff
path: root/manifests/client.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-07-09 12:15:10 -0400
committerMicah Anderson <micah@riseup.net>2009-07-09 12:15:10 -0400
commit2c3f632e902d10780dcf9b24914e963ef6520af2 (patch)
tree8f241b3aec57ed40d26964ed2ce57ca0cece4d27 /manifests/client.pp
parentd86ec97ab0d15c00d53a61fbac4edde70724486f (diff)
downloadpuppet-sshd-2c3f632e902d10780dcf9b24914e963ef6520af2.tar.gz
puppet-sshd-2c3f632e902d10780dcf9b24914e963ef6520af2.tar.bz2
fix previous change which took the client/server packages out of the linux class
and instead allow for a version change through an if variable. thanks ng!
Diffstat (limited to 'manifests/client.pp')
-rw-r--r--manifests/client.pp14
1 files changed, 5 insertions, 9 deletions
diff --git a/manifests/client.pp b/manifests/client.pp
index 47340b8..d473e3c 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -14,14 +14,6 @@ class sshd::client {
class sshd::client::base {
- 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;
@@ -32,9 +24,13 @@ class sshd::client::base {
}
class sshd::client::linux inherits sshd::client::base {
+ if $ssh_ensure_version == '' { $ssh_ensure_version = 'installed' }
+ package {'openssh-clients':
+ ensure => $ssh_ensure_version,
+ }
}
-class sshd::client::debian inherits sshd::client::linux {
+class sshd::client::debian inherits sshd::client::linux {
Package['openssh-clients']{
name => 'openssh-client',
}