1
0
mirror of https://github.com/krislamo/puppet-fluentd synced 2024-12-16 13:20:35 +00:00

fixed lint warnings

This commit is contained in:
Max Wilhelm 2015-12-07 11:09:31 +01:00
parent 9d2175411b
commit 922914c32b
7 changed files with 28 additions and 28 deletions

View File

@ -2,19 +2,19 @@
#
class fluentd::config inherits fluentd {
file { $config_file:
ensure => file,
owner => 'root',
group => 'root',
source => "puppet:///modules/fluentd/td-agent.conf",
notify => Class['Fluentd::Service'],
file { $::fluentd::config_file:
ensure => file,
owner => 'root',
group => 'root',
source => 'puppet:///modules/fluentd/td-agent.conf',
notify => Class['Fluentd::Service'],
}
file { $conf_dir:
ensure => 'directory',
owner => $user_name,
group => $user_group,
mode => '0750',
file { $::fluentd::conf_dir:
ensure => 'directory',
owner => $::fluentd::user_name,
group => $::fluentd::user_group,
mode => '0750',
}
}

View File

@ -18,7 +18,7 @@ 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}",
onlyif => "ls ${::fluentd::conf_dir}/*-${base_name} | grep -v ${config_name}",
before => File[$config_path],
notify => Class['Fluentd::Service'],
}

View File

@ -3,9 +3,9 @@
class fluentd::install inherits fluentd {
package { 'fluentd':
ensure => $package_ensure,
name => $package_name,
install_options => $package_install_options,
ensure => $::fluentd::package_ensure,
name => $::fluentd::package_name,
install_options => $::fluentd::package_install_options,
}
}

View File

@ -39,7 +39,7 @@ define fluentd::plugin (
case $type {
'gem': {
fluentd::plugin::gem { $name:
ensure => $ensure,
ensure => $ensure,
require => Class['Fluentd::Install']
}
}
@ -47,8 +47,8 @@ define fluentd::plugin (
validate_string($source)
fluentd::plugin::file { $name:
ensure => $ensure,
source => $source,
ensure => $ensure,
source => $source,
require => Class['Fluentd::Install']
}
}

View File

@ -1,7 +1,7 @@
# Configure package repository
#
class fluentd::repo inherits fluentd {
if $manage_repo {
if $::fluentd::manage_repo {
case $::osfamily {
'Debian': {
include ::fluentd::repo::apt

View File

@ -14,10 +14,10 @@ class fluentd::repo::apt (
include '::apt'
apt::source { 'treasure-data':
ensure => $ensure,
location => $location,
release => $release,
repos => $repos,
key => $key,
ensure => $ensure,
location => $location,
release => $release,
repos => $repos,
key => $key,
}
}

View File

@ -2,11 +2,11 @@
#
class fluentd::service inherits fluentd {
if $service_manage {
if $::fluentd::service_manage {
service { 'fluentd':
name => $service_name,
ensure => $service_ensure,
enable => $service_enable,
ensure => $::fluentd::service_ensure,
name => $::fluentd::service_name,
enable => $::fluentd::service_enable,
hasstatus => true,
hasrestart => true,
}