diff options
| author | mh <mh@immerda.ch> | 2012-06-05 18:23:03 -0300 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-06-05 18:23:03 -0300 |
| commit | 2204eb01f6cf10992ccdd7e092d1fc522e5ec3e1 (patch) | |
| tree | 3f778bf16c6da3585e087454527a45afd3ea3871 /manifests/client | |
| parent | d5404bbdbaeaea4178eb854f5890be471000785f (diff) | |
| download | puppet-sshd-2204eb01f6cf10992ccdd7e092d1fc522e5ec3e1.tar.gz puppet-sshd-2204eb01f6cf10992ccdd7e092d1fc522e5ec3e1.tar.bz2 | |
new style for 2.7
Diffstat (limited to 'manifests/client')
| -rw-r--r-- | manifests/client/base.pp | 5 | ||||
| -rw-r--r-- | manifests/client/linux.pp | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/manifests/client/base.pp b/manifests/client/base.pp index 1fe2b14..c2580c1 100644 --- a/manifests/client/base.pp +++ b/manifests/client/base.pp @@ -1,10 +1,11 @@ class sshd::client::base { # this is needed because the gid might have changed - config_file { '/etc/ssh/ssh_known_hosts': + file { '/etc/ssh/ssh_known_hosts': + mode => 0644, owner => root, group => 0; } # Now collect all server keys - case $sshd_shared_ip { + case $sshd::client::shared_ip { no: { Sshkey <<||>> } yes: { Sshkey <<| tag == "fqdn" |>> } } diff --git a/manifests/client/linux.pp b/manifests/client/linux.pp index 8c58ca8..0c420be 100644 --- a/manifests/client/linux.pp +++ b/manifests/client/linux.pp @@ -1,6 +1,5 @@ class sshd::client::linux inherits sshd::client::base { - if $ssh_ensure_version == '' { $ssh_ensure_version = 'installed' } package {'openssh-clients': - ensure => $ssh_ensure_version, + ensure => $sshd::client::ensure_version, } } |