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 /templates | |
| 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 'templates')
| -rw-r--r-- | templates/imfile.erb | 3 | ||||
| -rw-r--r-- | templates/modload.erb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/templates/imfile.erb b/templates/imfile.erb index 8b24edb..4a11c72 100644 --- a/templates/imfile.erb +++ b/templates/imfile.erb @@ -1,4 +1,7 @@ +<% if @extra_modules.empty?() or !@extra_modules.include?('imfile') -%> $ModLoad imfile +<% end -%> + $InputFileName <%= @file_name %> $InputFileTag <%= @file_tag %> diff --git a/templates/modload.erb b/templates/modload.erb new file mode 100644 index 0000000..a14a612 --- /dev/null +++ b/templates/modload.erb @@ -0,0 +1,3 @@ +<% @extra_modules.each do |mod| -%> +$ModLoad <%= mod %> +<% end -%> |