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 pull request #15 from lzecca78/master

Browse Source 
added boolean param for enabling fluentd::conf_dir
This commit is contained in:
Max Wilhelm 2017-07-25 15:13:28 +02:00 committed by GitHub
commit d27479eb17
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/config.pp
View File

@ -11,9 +11,11 @@ class fluentd::config inherits fluentd {
} }
file { $::fluentd::conf_dir: file { $::fluentd::conf_dir:
ensure => 'directory', ensure => 'directory',
owner => $::fluentd::user_name, recurse => $::fluentd::params::conf_dir_manage,
group => $::fluentd::user_group, purge => $::fluentd::params::conf_dir_manage,
mode => '0750', owner => $::fluentd::user_name,
group => $::fluentd::user_group,
mode => '0750',
} }
} }

4
manifests/init.pp
View File

@ -8,6 +8,9 @@
# [*repo_manage*] # [*repo_manage*]
# Include repository to install recent fluentd (td-agent) from # Include repository to install recent fluentd (td-agent) from
# Default: 'true' # Default: 'true'
# [*conf_dir_manage*]
# Exclusively handle config files into fluentd::conf_dir. Other files not created by puppet, will be deleted
# Default: 'false'
# [*package_ensure*] # [*package_ensure*]
# Package ensure # Package ensure
# Default: 'installed' # Default: 'installed'
@ -63,6 +66,7 @@ class fluentd (
$service_enable = $::fluentd::params::service_enable, $service_enable = $::fluentd::params::service_enable,
$config_path = $::fluentd::params::config_path, $config_path = $::fluentd::params::config_path,
$conf_dir = $::fluentd::params::conf_dir, $conf_dir = $::fluentd::params::conf_dir,
$conf_dir_manage = $::fluentd::params::conf_dir_manage,
$config_file = $::fluentd::params::config_file, $config_file = $::fluentd::params::config_file,
$user_manage = $::fluentd::params::user_manage, $user_manage = $::fluentd::params::user_manage,
$user_name = $::fluentd::params::user_name, $user_name = $::fluentd::params::user_name,

1
manifests/params.pp
View File

@ -11,6 +11,7 @@ class fluentd::params {
# config params # config params
$config_path = '/etc/td-agent' $config_path = '/etc/td-agent'
$conf_dir = "${config_path}/conf.d" $conf_dir = "${config_path}/conf.d"
$conf_dir_manage = false
$config_file = "${config_path}/td-agent.conf" $config_file = "${config_path}/td-agent.conf"
# user params # user params
$user_manage = true $user_manage = true