mirror of
https://github.com/krislamo/puppet-fluentd
synced 2024-11-14 14:00:36 +00:00
fixed lint warnings
This commit is contained in:
parent
9d2175411b
commit
922914c32b
@ -2,19 +2,19 @@
|
|||||||
#
|
#
|
||||||
class fluentd::config inherits fluentd {
|
class fluentd::config inherits fluentd {
|
||||||
|
|
||||||
file { $config_file:
|
file { $::fluentd::config_file:
|
||||||
ensure => file,
|
ensure => file,
|
||||||
owner => 'root',
|
owner => 'root',
|
||||||
group => 'root',
|
group => 'root',
|
||||||
source => "puppet:///modules/fluentd/td-agent.conf",
|
source => 'puppet:///modules/fluentd/td-agent.conf',
|
||||||
notify => Class['Fluentd::Service'],
|
notify => Class['Fluentd::Service'],
|
||||||
}
|
}
|
||||||
|
|
||||||
file { $conf_dir:
|
file { $::fluentd::conf_dir:
|
||||||
ensure => 'directory',
|
ensure => 'directory',
|
||||||
owner => $user_name,
|
owner => $::fluentd::user_name,
|
||||||
group => $user_group,
|
group => $::fluentd::user_group,
|
||||||
mode => '0750',
|
mode => '0750',
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ 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}",
|
command => "rm ${::fluentd::conf_dir}/*-${base_name}",
|
||||||
onlyif => "ls ${::fluentd::conf_dir}/*-${base_name} | grep -v ${config_name}",
|
onlyif => "ls ${::fluentd::conf_dir}/*-${base_name} | grep -v ${config_name}",
|
||||||
before => File[$config_path],
|
before => File[$config_path],
|
||||||
notify => Class['Fluentd::Service'],
|
notify => Class['Fluentd::Service'],
|
||||||
}
|
}
|
||||||
|
@ -3,9 +3,9 @@
|
|||||||
class fluentd::install inherits fluentd {
|
class fluentd::install inherits fluentd {
|
||||||
|
|
||||||
package { 'fluentd':
|
package { 'fluentd':
|
||||||
ensure => $package_ensure,
|
ensure => $::fluentd::package_ensure,
|
||||||
name => $package_name,
|
name => $::fluentd::package_name,
|
||||||
install_options => $package_install_options,
|
install_options => $::fluentd::package_install_options,
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,7 @@ define fluentd::plugin (
|
|||||||
case $type {
|
case $type {
|
||||||
'gem': {
|
'gem': {
|
||||||
fluentd::plugin::gem { $name:
|
fluentd::plugin::gem { $name:
|
||||||
ensure => $ensure,
|
ensure => $ensure,
|
||||||
require => Class['Fluentd::Install']
|
require => Class['Fluentd::Install']
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -47,8 +47,8 @@ define fluentd::plugin (
|
|||||||
validate_string($source)
|
validate_string($source)
|
||||||
|
|
||||||
fluentd::plugin::file { $name:
|
fluentd::plugin::file { $name:
|
||||||
ensure => $ensure,
|
ensure => $ensure,
|
||||||
source => $source,
|
source => $source,
|
||||||
require => Class['Fluentd::Install']
|
require => Class['Fluentd::Install']
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Configure package repository
|
# Configure package repository
|
||||||
#
|
#
|
||||||
class fluentd::repo inherits fluentd {
|
class fluentd::repo inherits fluentd {
|
||||||
if $manage_repo {
|
if $::fluentd::manage_repo {
|
||||||
case $::osfamily {
|
case $::osfamily {
|
||||||
'Debian': {
|
'Debian': {
|
||||||
include ::fluentd::repo::apt
|
include ::fluentd::repo::apt
|
||||||
|
@ -14,10 +14,10 @@ class fluentd::repo::apt (
|
|||||||
include '::apt'
|
include '::apt'
|
||||||
|
|
||||||
apt::source { 'treasure-data':
|
apt::source { 'treasure-data':
|
||||||
ensure => $ensure,
|
ensure => $ensure,
|
||||||
location => $location,
|
location => $location,
|
||||||
release => $release,
|
release => $release,
|
||||||
repos => $repos,
|
repos => $repos,
|
||||||
key => $key,
|
key => $key,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
#
|
#
|
||||||
class fluentd::service inherits fluentd {
|
class fluentd::service inherits fluentd {
|
||||||
|
|
||||||
if $service_manage {
|
if $::fluentd::service_manage {
|
||||||
service { 'fluentd':
|
service { 'fluentd':
|
||||||
name => $service_name,
|
ensure => $::fluentd::service_ensure,
|
||||||
ensure => $service_ensure,
|
name => $::fluentd::service_name,
|
||||||
enable => $service_enable,
|
enable => $::fluentd::service_enable,
|
||||||
hasstatus => true,
|
hasstatus => true,
|
||||||
hasrestart => true,
|
hasrestart => true,
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user