diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-19 10:17:30 -0300 | 
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-19 10:17:30 -0300 | 
| commit | ff79bc6295e9f089285ccc26c04cc72893a8384f (patch) | |
| tree | 1a84dad2d03bc3814305eeaedb4cfd8d8dc09f36 /manifests/client | |
| parent | 9b1d0f06fee4b0c457d0154c4153415758c10425 (diff) | |
| parent | 672b0985d1c2acfde58fecc4c635517522c86268 (diff) | |
| download | puppet-sshd-ff79bc6295e9f089285ccc26c04cc72893a8384f.tar.gz puppet-sshd-ff79bc6295e9f089285ccc26c04cc72893a8384f.tar.bz2  | |
Merge branch 'master' of https://gitlab.com/shared-puppet-modules-group/sshd
Conflicts:
	README
	templates/sshd_config/CentOS.erb
	templates/sshd_config/CentOS_Final.erb
	templates/sshd_config/Debian_etch.erb
	templates/sshd_config/Debian_jessie.erb
	templates/sshd_config/Debian_sid.erb
	templates/sshd_config/Debian_squeeze.erb
	templates/sshd_config/Debian_wheezy.erb
	templates/sshd_config/Ubuntu_trusty.erb
Diffstat (limited to 'manifests/client')
| -rw-r--r-- | manifests/client/base.pp | 7 | 
1 files changed, 5 insertions, 2 deletions
diff --git a/manifests/client/base.pp b/manifests/client/base.pp index c2580c1..4925c2d 100644 --- a/manifests/client/base.pp +++ b/manifests/client/base.pp @@ -1,12 +1,15 @@  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; +    ensure => present, +    mode   => '0644', +    owner  => root, +    group  => 0;    }    # Now collect all server keys    case $sshd::client::shared_ip {      no:  { Sshkey <<||>> } -    yes: { Sshkey <<| tag == "fqdn" |>> } +    yes: { Sshkey <<| tag == fqdn |>> }    }  }  | 
