aboutsummaryrefslogtreecommitdiff
path: root/manifests/client
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-02-19 18:08:02 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-02-19 18:08:02 -0200
commit474b23271d7c4f3b82ca2e7888225e74f87ae7a8 (patch)
treeb2b58dacd66a40f5d27a381439d91006339da5b8 /manifests/client
parentac30247bf9d7ea57c01cc5ad743e2788f6e8ea0d (diff)
parente0d3cdbd36bf1d06984240da216b4492efc4e69d (diff)
downloadpuppet-sshd-474b23271d7c4f3b82ca2e7888225e74f87ae7a8.tar.gz
puppet-sshd-474b23271d7c4f3b82ca2e7888225e74f87ae7a8.tar.bz2
Merge branch 'master' of git://labs.riseup.net/shared-sshd
Conflicts: templates/sshd_config/Debian_squeeze.erb
Diffstat (limited to 'manifests/client')
-rw-r--r--manifests/client/base.pp3
1 files changed, 1 insertions, 2 deletions
diff --git a/manifests/client/base.pp b/manifests/client/base.pp
index 7329f55..1fe2b14 100644
--- a/manifests/client/base.pp
+++ b/manifests/client/base.pp
@@ -1,7 +1,6 @@
class sshd::client::base {
# this is needed because the gid might have changed
- file { '/etc/ssh/ssh_known_hosts':
- owner => root, group => 0, mode => 0644;
+ config_file { '/etc/ssh/ssh_known_hosts':
}
# Now collect all server keys