kris/puppet-fluentd
1
0
Fork 0
mirror of https://github.com/krislamo/puppet-fluentd synced 2024-11-13 21:50:34 +00:00
Code Issues Releases Wiki Activity

Merge pull request #10 from lobeck/master

Browse Source 
update tresuredata GPG key
This commit is contained in:
Christian Becker 2017-01-19 14:47:47 +01:00 committed by GitHub
commit 6a05cae33e
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/repo/apt.pp
View File

@ -7,7 +7,7 @@ class fluentd::repo::apt (
$repos = 'contrib', $repos = 'contrib',
$architecture = $::architecture, $architecture = $::architecture,
$key = { $key = {
'id' => 'C901622B5EC4AF820C38AB861093DB45A12E206F', 'id' => 'BEE682289B2217F45AF4CC3F901F9177AB97ACBE',
'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent' 'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent'
}, },
$include = { $include = {

7
manifests/repo/yum.pp
View File

@ -23,4 +23,11 @@ class fluentd::repo::yum (
path => '/bin:/usr/bin/', path => '/bin:/usr/bin/',
refreshonly => true, refreshonly => true,
} }
exec { 'remove old GPG key':
command => 'rpm -e --allmatches gpg-pubkey-a12e206f-*',
onlyif => 'rpm -qi gpg-pubkey-a12e206f-*',
notify => Exec['add GPG key'],
}
} }

2
spec/classes/fluentd_repo_apt_spec.rb
View File

@ -21,7 +21,7 @@ describe 'fluentd::repo::apt', :type => :class do
'repos' => 'contrib', 'repos' => 'contrib',
'architecture' => 'amd64', 'architecture' => 'amd64',
'key' => { 'key' => {
'id' => 'C901622B5EC4AF820C38AB861093DB45A12E206F', 'id' => 'BEE682289B2217F45AF4CC3F901F9177AB97ACBE',
'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent' 'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent'
}, },
'include' => { 'include' => {