From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 7 Sep 2019 21:22:37 +0000 (+0200)
Subject: ssh::authorized_key_add: warn if the key does not exist
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=cf44469b925d34c6ebbc3297860209586915b057;p=mirror%2Fdsa-puppet.git

ssh::authorized_key_add: warn if the key does not exist
---

diff --git a/modules/ssh/manifests/authorized_key_add.pp b/modules/ssh/manifests/authorized_key_add.pp
index 44cdc8025..451a952d9 100644
--- a/modules/ssh/manifests/authorized_key_add.pp
+++ b/modules/ssh/manifests/authorized_key_add.pp
@@ -22,13 +22,17 @@ define ssh::authorized_key_add(
 
   $from_space = $from_hosts.join(' ')
 
-  @@concat::fragment { "ssh::authorized_key::${name} ${target_user} ${from}":
-    tag     => "ssh::authorized_key::fragment::${collect_tag}::${target_user}",
-    target  => "/etc/ssh/userkeys/${target_user}",
-    order   => '200',
-    content => @("EOF"),
-               command="${command}",from="${from}",restrict ${key}
-               | EOF
+  if $key {
+    @@concat::fragment { "ssh::authorized_key::${name} ${target_user} ${from}":
+      tag     => "ssh::authorized_key::fragment::${collect_tag}::${target_user}",
+      target  => "/etc/ssh/userkeys/${target_user}",
+      order   => '200',
+      content => @("EOF"),
+                 command="${command}",from="${from}",restrict ${key}
+                 | EOF
+    }
+  } else {
+    notify{ "Warning, ssh key for ${name}, ${target_user} not defined (yet?).": }
   }
 
   @@ferm::rule { "ssh-${target_user}-${name}":