diff options
author | Micah Anderson <micah@riseup.net> | 2008-12-07 12:17:12 -0500 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2008-12-07 12:17:12 -0500 |
commit | 5161c4332a7f5b79c25c922a4450cec97b2ad276 (patch) | |
tree | 860a71a4f5b21f57171391401e2bcadded2444f9 | |
parent | 78938cde2a23ad8daa0ecb4aff7abe870233048f (diff) | |
parent | 461bc0c2f0c7cb11b08c3fa22175bfea2fd4b8f8 (diff) | |
download | puppet-sshd-5161c4332a7f5b79c25c922a4450cec97b2ad276.tar.gz puppet-sshd-5161c4332a7f5b79c25c922a4450cec97b2ad276.tar.bz2 |
Merge commit 'anarcat/master'
-rw-r--r-- | manifests/init.pp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 0f0cb19..0480fee 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -211,12 +211,17 @@ class sshd::base { notify => Service[sshd], } # Now add the key, if we've got one - case $sshrsakey_key { - '': { info("no sshrsakey on $fqdn") } + case $sshrsakey { + '': { warning("no sshrsakey on $fqdn") } default: { @@sshkey{"$hostname.$domain": type => ssh-rsa, - key => $sshrsakey_key, + key => $sshrsakey, + ensure => present, + } + @@sshkey{"$ipaddress": + type => ssh-rsa, + key => $sshrsakey, ensure => present, } } |