From 3da624da4e02c0f0443584a2f39f0e030d57b9ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Bj=C3=B6rklund?= <bjorklund@sunet.se>
Date: Thu, 21 Nov 2024 11:24:18 +0100
Subject: [PATCH] GPG fixes

---
 global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
index 5eaf302..b5ce89f 100644
--- a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
+++ b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp
@@ -315,7 +315,7 @@ class soc::intelmq(
     }
     exec { 'Import private gpg key':
       command => "sudo -u intelmq /usr/bin/gpg -import /opt/intelmq/.gnupg/${privkey}.asc",
-      unless  => "gpg -K ${privkey} 2>&1 > /dev/null",
+      unless  => "sudo -u intelmq /usr/bin/gpg -K 2>/dev/null | grep ${privkey}",
     }
   }