From f58a930fffe836a5c948b58380b772911f82d118 Mon Sep 17 00:00:00 2001 From: Seth Cleveland Date: Thu, 17 Nov 2016 15:21:21 -0600 Subject: [PATCH 1/2] Change /bin/gpg to /usr/bin/gpg: this was asserted on CentOS and Fedora --- manifests/redhat.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/redhat.pp b/manifests/redhat.pp index 4d1e9041..80cb9c3f 100644 --- a/manifests/redhat.pp +++ b/manifests/redhat.pp @@ -37,7 +37,7 @@ exec { 'install-gpg-key': command => "/bin/rpm --import ${public_key_local}", - onlyif => "/bin/gpg --quiet --with-fingerprint -n ${public_key_local} | grep \'A4C0 B90D 7443 CF6E 4E8A A341 F106 8E14 E094 22B3\'", + onlyif => "/usr/bin/gpg --quiet --with-fingerprint -n ${public_key_local} | grep \'A4C0 B90D 7443 CF6E 4E8A A341 F106 8E14 E094 22B3\'", unless => '/bin/rpm -q gpg-pubkey-e09422b3', require => Remote_file['DATADOG_RPM_KEY.public'], notify => Exec['cleanup-gpg-key'], From e3d7f391b42c5d949bcd246ae49c945bafcf07de Mon Sep 17 00:00:00 2001 From: Seth Cleveland Date: Thu, 17 Nov 2016 15:38:12 -0600 Subject: [PATCH 2/2] /bin/test -> /usr/bin/test --- manifests/redhat.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/redhat.pp b/manifests/redhat.pp index 80cb9c3f..768b1e9c 100644 --- a/manifests/redhat.pp +++ b/manifests/redhat.pp @@ -45,7 +45,7 @@ exec { 'cleanup-gpg-key': command => "/bin/rm ${public_key_local}", - onlyif => "/bin/test -f ${public_key_local}", + onlyif => "/usr/bin/test -f ${public_key_local}", } yumrepo {'datadog':