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/params.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/params.pp')
| -rw-r--r-- | manifests/params.pp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/manifests/params.pp b/manifests/params.pp index 904148c..9161f3e 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -47,6 +47,8 @@ class rsyslog::params { $preserve_fqdn = false $service_hasrestart = true $service_hasstatus = true + $extra_modules = [] + } redhat: { if $::operatingsystem == 'Amazon' { @@ -121,6 +123,7 @@ class rsyslog::params { $preserve_fqdn = false $service_hasrestart = true $service_hasstatus = true + $extra_modules = [] } suse: { $rsyslog_package_name = 'rsyslog' @@ -149,6 +152,8 @@ class rsyslog::params { '#$ModLoad immark # provides --MARK-- message capability', ] } + $extra_modules = [] + } freebsd: { $rsyslog_package_name = 'sysutils/rsyslog5' $relp_package_name = 'sysutils/rsyslog5-relp' @@ -181,6 +186,7 @@ class rsyslog::params { $preserve_fqdn = false $service_hasrestart = true $service_hasstatus = true + $extra_modules = [] } default: { @@ -217,6 +223,8 @@ class rsyslog::params { $preserve_fqdn = false $service_hasrestart = true $service_hasstatus = true + $extra_modules = [] + } default: { fail("The ${module_name} module is not supported on ${::osfamily}/${::operatingsystem}.") |