summaryrefslogtreecommitdiff
path: root/templates/client.conf.erb
diff options
context:
space:
mode:
Diffstat (limited to 'templates/client.conf.erb')
-rw-r--r--templates/client.conf.erb6
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/client.conf.erb b/templates/client.conf.erb
index 5733972..d72e080 100644
--- a/templates/client.conf.erb
+++ b/templates/client.conf.erb
@@ -72,9 +72,9 @@ $ActionSendStreamDriverAuthMode anon
# Log to remote syslog server using <%= scope.lookupvar('rsyslog::client::remote_type') %>
<% if scope.lookupvar('rsyslog::client::remote_type') == 'tcp' -%>
-*.* @@<%= scope.lookupvar('rsyslog::client::server') -%>:<%= scope.lookupvar('rsyslog::client::port') -%>;RSYSLOG_ForwardFormat
+*.* @@<%= scope.lookupvar('rsyslog::client::server') -%>:<%= scope.lookupvar('rsyslog::client::port') -%>;<%= scope.lookupvar('remote_forward_format') -%>
<% else -%>
-*.* @<%= scope.lookupvar('rsyslog::client::server') -%>:<%= scope.lookupvar('rsyslog::client::port') -%>;RSYSLOG_ForwardFormat
+*.* @<%= scope.lookupvar('rsyslog::client::server') -%>:<%= scope.lookupvar('rsyslog::client::port') -%>;<%= scope.lookupvar('remote_forward_format') -%>
<% end -%>
<% end -%>
<% if scope.lookupvar('rsyslog::client::log_auth_local') or scope.lookupvar('rsyslog::client::log_local') -%>
@@ -165,7 +165,7 @@ mail.* -/var/log/maillog
cron.* /var/log/cron
# Everybody gets emergency messages
-<% if scope.lookupvar('rsyslog::v8plus') == true -%>
+<% if @rsyslog_version.split('.')[0].to_i >= 8 -%>
*.emerg :omusrmsg:*
<% else -%>
*.emerg *