diff options
| author | James Edwards <jae2@users.noreply.github.com> | 2014-07-09 12:41:08 +0100 |
|---|---|---|
| committer | James Edwards <j.a.edwards86@googlemail.com> | 2014-08-14 23:50:07 +0100 |
| commit | ef5197d78177ad6c1621e55799a39e99e0751b6a (patch) | |
| tree | f3eb38b24c096cc4d820057d2d0586b2c21c02bb /manifests/init.pp | |
| parent | 5c4b129eda064d5cfec7edcb320ef769bc302345 (diff) | |
Allow option to avoid loading imfile module twice.
This throws a warning with version 8 of rsyslog.
The best way to use imfile is to define the module list in
extra_modules. However, if you still try to create an imfile without
adding that it will still work the old way (adding modload imfile to the
begining of the imfile).
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 0c57a84..e0f1727 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -39,8 +39,13 @@ 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 ) inherits rsyslog::params { class { 'rsyslog::install': } class { 'rsyslog::config': } + if $extra_modules != [] { + class { 'rsyslog::modload': } + } class { 'rsyslog::service': } + } |