kris/puppet-fluentd
1
0
Fork 0
mirror of https://github.com/krislamo/puppet-fluentd synced 2024-12-16 13:20:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/cotocisternas/puppet-fluentd

Browse Source 
Conflicts:
	manifests/init.pp
	manifests/params.pp
	manifests/repo/apt.pp
This commit is contained in:
Max Wilhelm 2016-01-26 22:13:30 +01:00
commit 08a27245f7
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/puppet/provider/package/fluentd-gem.rb
View File

@ -8,6 +8,7 @@ Puppet::Type.type(:package).provide :fluentd_gem, :parent => :gem do
not a valid URL, it will be interpreted as the path to a local gem file. If not a valid URL, it will be interpreted as the path to a local gem file. If
source is not present at all, the gem will be installed from the default gem source is not present at all, the gem will be installed from the default gem
repositories." repositories."
confine :exists => "/opt/td-agent/embedded/bin/gem"
has_feature :versionable, :install_options has_feature :versionable, :install_options

6
manifests/config/file.pp
View File

@ -17,8 +17,10 @@ define fluentd::config::file (
# clean up to ensure priority changes take effect # clean up to ensure priority changes take effect
exec { "apply priority change for ${base_name}": exec { "apply priority change for ${base_name}":
command => "rm ${::fluentd::conf_dir}/*-${base_name}", path => '/bin:/usr/bin:/usr/local/bin',
onlyif => "ls ${::fluentd::conf_dir}/*-${base_name} | grep -v ${config_name}", cwd => "${::fluentd::conf_dir}",
command => "rm *-${base_name}",
onlyif => "ls *-${base_name} | grep -v ${config_name}",
before => File[$config_path], before => File[$config_path],
notify => Class['Fluentd::Service'], notify => Class['Fluentd::Service'],
} }

5
manifests/repo/apt.pp
View File

@ -10,6 +10,10 @@ class fluentd::repo::apt (
'id' => 'C901622B5EC4AF820C38AB861093DB45A12E206F', 'id' => 'C901622B5EC4AF820C38AB861093DB45A12E206F',
'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent' 'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent'
}, },
$include = {
'src' => false,
'deb' => true,
},
) { ) {
include '::apt' include '::apt'
@ -21,5 +25,6 @@ class fluentd::repo::apt (
architecture => $architecture, architecture => $architecture,
repos => $repos, repos => $repos,
key => $key, key => $key,
include => $include,
} }
} }