diff options
author | Steffen Zieger <me@saz.sh> | 2014-08-15 11:12:59 +0200 |
---|---|---|
committer | Steffen Zieger <me@saz.sh> | 2014-08-15 11:12:59 +0200 |
commit | e2130b3f62240fb42103b9e07fb5acd0736fc44a (patch) | |
tree | d2597b73fd88eac488f4f05d4326547e5b0c43ea /manifests/init.pp | |
parent | 5c4b129eda064d5cfec7edcb320ef769bc302345 (diff) | |
parent | 88a64597732e5e4aac20597bd492b2cfdf412b85 (diff) |
Merge pull request #99 from jae2/jed2
Allow option to avoid loading imfile module twice.
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 0c57a84..aad06d5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -38,9 +38,14 @@ class rsyslog ( $ssl = $rsyslog::params::ssl, $modules = $rsyslog::params::modules, $preserve_fqdn = $rsyslog::params::preserve_fqdn, - $max_message_size = $rsyslog::params::max_message_size + $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': } + } |