diff options
| author | Steffen Zieger <me@saz.sh> | 2014-09-05 15:20:08 +0200 |
|---|---|---|
| committer | Steffen Zieger <me@saz.sh> | 2014-09-05 15:20:08 +0200 |
| commit | a403c09e75ed7e50497b6ccf467dc50c63244942 (patch) | |
| tree | bad94ca0efe848d2626abc752c302373d189b7f5 /manifests | |
| parent | b172590ccc27e46df668ecccb5da663d2cbc5508 (diff) | |
fix some lint warnings, fixes #100
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 12 | ||||
| -rw-r--r-- | manifests/modload.pp | 24 | ||||
| -rw-r--r-- | manifests/params.pp | 3 | ||||
| -rw-r--r-- | manifests/snippet.pp | 3 |
4 files changed, 22 insertions, 20 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index aad06d5..5115674 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,6 +1,7 @@ # == Class: rsyslog # -# Meta class to install rsyslog with a basic configuration. You probably want rsyslog::client or rsyslog::server +# Meta class to install rsyslog with a basic configuration. +# You probably want rsyslog::client or rsyslog::server # # === Parameters # @@ -39,13 +40,14 @@ class rsyslog ( $modules = $rsyslog::params::modules, $preserve_fqdn = $rsyslog::params::preserve_fqdn, $max_message_size = $rsyslog::params::max_message_size, - $extra_modules = $rsyslog::params::extra_modules + $extra_modules = $rsyslog::params::extra_modules ) inherits rsyslog::params { class { 'rsyslog::install': } class { 'rsyslog::config': } + if $extra_modules != [] { - class { 'rsyslog::modload': } - } - class { 'rsyslog::service': } + class { 'rsyslog::modload': } + } + class { 'rsyslog::service': } } diff --git a/manifests/modload.pp b/manifests/modload.pp index 8022cf0..7a838af 100644 --- a/manifests/modload.pp +++ b/manifests/modload.pp @@ -2,16 +2,14 @@ # class rsyslog::modload ( - $modload_filename = '10-modload.conf', -) - { - file { "${rsyslog::rsyslog_d}$modload_filename": - ensure => file, - owner => 'root', - group => $rsyslog::run_group, - content => template('rsyslog/modload.erb'), - require => Class['rsyslog::install'], - notify => Class['rsyslog::service'], - } - } - + $modload_filename = '10-modload.conf', +) { + file { "${rsyslog::rsyslog_d}${modload_filename}": + ensure => file, + owner => 'root', + group => $rsyslog::run_group, + content => template('rsyslog/modload.erb'), + require => Class['rsyslog::install'], + notify => Class['rsyslog::service'], + } +} diff --git a/manifests/params.pp b/manifests/params.pp index 0a03d07..9027836 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,6 +1,7 @@ # == Class: rsyslog::params # -# This defines default configuration values for rsyslog. You don't want to use it directly. +# This defines default configuration values for rsyslog. +# You don't want to use it directly. # # === Parameters # diff --git a/manifests/snippet.pp b/manifests/snippet.pp index 9edf179..f638396 100644 --- a/manifests/snippet.pp +++ b/manifests/snippet.pp @@ -1,6 +1,7 @@ # == Define: rsyslog::snippet # -# This class allows for you to create a rsyslog configuration file with whatever content you pass in. +# This class allows for you to create a rsyslog configuration file with +# whatever content you pass in. # # === Parameters # |