kris/puppet-fluentd
1
0
Fork 0
mirror of https://github.com/krislamo/puppet-fluentd synced 2025-09-11 16:19:29 +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
parent 4c3f1f9a18 490868d6b1
commit 08a27245f7
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/config/file.pp
View File

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