summaryrefslogtreecommitdiff
path: root/manifests/imfile.pp
diff options
context:
space:
mode:
authorJames Edwards <jae2@users.noreply.github.com>2014-07-09 12:41:08 +0100
committerJames Edwards <j.a.edwards86@googlemail.com>2014-08-14 23:50:07 +0100
commitef5197d78177ad6c1621e55799a39e99e0751b6a (patch)
treef3eb38b24c096cc4d820057d2d0586b2c21c02bb /manifests/imfile.pp
parent5c4b129eda064d5cfec7edcb320ef769bc302345 (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/imfile.pp')
-rw-r--r--manifests/imfile.pp4
1 files changed, 3 insertions, 1 deletions
diff --git a/manifests/imfile.pp b/manifests/imfile.pp
index 28665f8..bd0afa3 100644
--- a/manifests/imfile.pp
+++ b/manifests/imfile.pp
@@ -29,10 +29,12 @@ define rsyslog::imfile(
$polling_interval = 10,
$file_severity = 'notice',
$run_file_monitor = true,
- $persist_state_interval = 0
+ $persist_state_interval = 0,
) {
+
include rsyslog
+ $extra_modules = $rsyslog::extra_modules
file { "${rsyslog::rsyslog_d}${name}.conf":
ensure => file,