Skip to content

Commit ba0a5fe

Browse files
authored
Merge pull request DataDog#259 from sethcleveland/fix_redhat_gpg_path
Change /bin/gpg to /usr/bin/gpg: this was asserted on CentOS and Fedora
2 parents 2ad3da4 + fe9aa8a commit ba0a5fe

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

manifests/redhat.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@
3737

3838
exec { 'install-gpg-key':
3939
command => "/bin/rpm --import ${public_key_local}",
40-
onlyif => "/bin/gpg --quiet --with-fingerprint -n ${public_key_local} | grep \'A4C0 B90D 7443 CF6E 4E8A A341 F106 8E14 E094 22B3\'",
40+
onlyif => "/usr/bin/gpg --quiet --with-fingerprint -n ${public_key_local} | grep \'A4C0 B90D 7443 CF6E 4E8A A341 F106 8E14 E094 22B3\'",
4141
unless => '/bin/rpm -q gpg-pubkey-e09422b3',
4242
require => Remote_file['DATADOG_RPM_KEY.public'],
4343
notify => Exec['cleanup-gpg-key'],
4444
}
4545

4646
exec { 'cleanup-gpg-key':
4747
command => "/bin/rm ${public_key_local}",
48-
onlyif => "/bin/test -f ${public_key_local}",
48+
onlyif => "/usr/bin/test -f ${public_key_local}",
4949
}
5050

5151
yumrepo {'datadog':

0 commit comments

Comments
 (0)