From e0b08c71a7aaa721481a5662dc3c4eef143f32e4 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Mon, 12 Oct 2015 23:52:12 +0200
Subject: make it possible to define the keyserver to fetch from

---
 manifests/plugins/gpg.pp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'manifests/plugins/gpg.pp')

diff --git a/manifests/plugins/gpg.pp b/manifests/plugins/gpg.pp
index 3493ff8..198f5ab 100644
--- a/manifests/plugins/gpg.pp
+++ b/manifests/plugins/gpg.pp
@@ -1,6 +1,8 @@
 # check_gpg from
 # https://github.com/lelutin/nagios-plugins/blob/master/check_gpg
-class nagios::plugins::gpg {
+class nagios::plugins::gpg(
+  $keyserver = 'hkp://keys.mayfirst.org',
+) {
   require ::gpg
   nagios::plugin{'check_gpg':
     source => 'nagios/plugins/check_gpg',
@@ -15,8 +17,8 @@ class nagios::plugins::gpg {
       mode    => '0600',
       require => Nagios::Plugin['check_gpg'];
     '/etc/cron.daily/update_nagios_gpgkeys':
-      content => "!#/bin/bash
-function exec() {
+      content => "#!/bin/bash
+function gpg() {
   cmd=\$1
   outout=\$(su - nagios -s /bin/bash -c 'gpg --homedir ${gpg_home} --logger-fd 1 \${cmd}')
   if [ \$? -gt 0 ]; then
@@ -25,8 +27,8 @@ function exec() {
   fi
 }
 
-gpg('--with-fingerprint --list-keys --with-colons') | grep \"^pub\" -A 1 | tail -n 1 | cut -f10 -d\":\" | sort --random-sort | while read key; do
-  gpg(\"--recv-keys \${key}\")
+su - nagios -s /bin/bash -c 'gpg --homedir ${gpg_home} --with-fingerprint --list-keys --with-colons | grep \"^pub\" -A 1 | tail -n 1 | cut -f10 -d\":\" | sort --random-sort | while read key; do
+  gpg \"--keyserver ${keyserver} --recv-keys \${key}\"
 done
 ",
       owner   => root,
-- 
cgit v1.2.3