diff options
| author | varac <varacanero@zeromail.org> | 2014-02-17 12:57:05 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-17 12:57:05 +0100 |
| commit | bd7a0f98ce0819fcc06ad8dcf11600a78577750d (patch) | |
| tree | e96f974f962231dc1388260afb3435e5ce99a114 /puppet/modules/site_sshd/manifests | |
| parent | 20de385ac787a8a66259bb6fb93a706cbc24d461 (diff) | |
| parent | d0eea33d88a6ffcbe01544678372d80e8c8de51f (diff) | |
Merge branch '4982_check_mk' into 0.6
Diffstat (limited to 'puppet/modules/site_sshd/manifests')
| -rw-r--r-- | puppet/modules/site_sshd/manifests/authorized_keys.pp | 3 | ||||
| -rw-r--r-- | puppet/modules/site_sshd/manifests/init.pp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/puppet/modules/site_sshd/manifests/authorized_keys.pp b/puppet/modules/site_sshd/manifests/authorized_keys.pp index c18f691c..f36fe20f 100644 --- a/puppet/modules/site_sshd/manifests/authorized_keys.pp +++ b/puppet/modules/site_sshd/manifests/authorized_keys.pp @@ -1,4 +1,7 @@ define site_sshd::authorized_keys ($keys, $ensure = 'present', $home = '') { + # We use a custom define here to deploy the authorized_keys file + # cause puppet doesn't allow purgin before populating this file + # (see https://tickets.puppetlabs.com/browse/PUP-1174) # This line allows default homedir based on $title variable. # If $home is empty, the default is used. $homedir = $home ? {'' => "/home/${title}", default => $home} diff --git a/puppet/modules/site_sshd/manifests/init.pp b/puppet/modules/site_sshd/manifests/init.pp index 2bcde603..d9bc1d51 100644 --- a/puppet/modules/site_sshd/manifests/init.pp +++ b/puppet/modules/site_sshd/manifests/init.pp @@ -1,6 +1,6 @@ class site_sshd { $ssh = hiera_hash('ssh') - $hosts = hiera_hash('hosts') + $hosts = hiera('hosts', '') ## ## SETUP AUTHORIZED KEYS |