From 992e6e0f07ea70c2e39df30035f414f33babf6c0 Mon Sep 17 00:00:00 2001
From: Antoine Beaupre <anarcat@koumbit.org>
Date: Sat, 6 Dec 2008 18:39:53 -0500
Subject: use the proper fact to export ssh keys. See
 http://projects.reductivelabs.com/issues/show/1799#note-1

---
 manifests/init.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'manifests/init.pp')

diff --git a/manifests/init.pp b/manifests/init.pp
index 20dd1fb..6eb15b3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -211,12 +211,12 @@ class sshd::base {
       notify => Service[sshd],
   }
   # Now add the key, if we've got one
-  case $sshrsakey_key {
+  case $sshrsakey {
     '': { info("no sshrsakey on $fqdn") }
     default: {
       @@sshkey{"$hostname.$domain":
         type => ssh-rsa,
-        key => $sshrsakey_key,
+        key => $sshrsakey,
         ensure => present,
       }
     }
-- 
cgit v1.2.3


From 461bc0c2f0c7cb11b08c3fa22175bfea2fd4b8f8 Mon Sep 17 00:00:00 2001
From: Antoine Beaupre <anarcat@koumbit.org>
Date: Sat, 6 Dec 2008 19:12:17 -0500
Subject: emit a warning instead of info when the ssh server doesn't have an
 sshrsa key also export the key based on ip address, removing all warnings

---
 manifests/init.pp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'manifests/init.pp')

diff --git a/manifests/init.pp b/manifests/init.pp
index 6eb15b3..9d34f50 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -212,13 +212,18 @@ class sshd::base {
   }
   # Now add the key, if we've got one
   case $sshrsakey {
-    '': { info("no sshrsakey on $fqdn") }
+    '': { warning("no sshrsakey on $fqdn") }
     default: {
       @@sshkey{"$hostname.$domain":
         type => ssh-rsa,
         key => $sshrsakey,
         ensure => present,
       }
+      @@sshkey{"$ipaddress":
+        type => ssh-rsa,
+        key => $sshrsakey,
+        ensure => present,
+      }
     }
   }
   service{'sshd':
-- 
cgit v1.2.3