From 8a1bce76b990b8457c744803c816b9fccec0b4c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bj=C3=B6rklund?= Date: Thu, 21 Nov 2024 10:53:08 +0100 Subject: [PATCH] GPG fixes --- .../overlay/etc/puppet/modules/soc/manifests/intelmq.pp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp index 20ade97..1bd5501 100644 --- a/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp +++ b/global/overlay/etc/puppet/modules/soc/manifests/intelmq.pp @@ -310,13 +310,8 @@ class soc::intelmq( if lookup('gnupg.privkey', undef, undef, undef) != undef { sunet::snippets::secret_file { "/opt/intelmq/.gnupg/${privkey}.asc": hiera_key => 'gnupg.privkey' - } - file { "/opt/intelmq/.gnupg/${privkey}.asc": - ensure => present, - replace => false, - onwer => 'intelmq', - group => 'intelmq', - mode => '0500', + owner => 'intelmq', + group => 'intelmq', } exec { 'Import private gpg key': command => "sudo -u intelmq /usr/bin/gpg -import /opt/intelmq/.gnupg/${privkey}.asc",