summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorSteffen Zieger <me@saz.sh>2012-05-11 14:13:31 +0200
committerSteffen Zieger <me@saz.sh>2012-05-11 14:13:31 +0200
commitd59582291a31f7c8289c3c5b7d5279caa68899e9 (patch)
treeb90fc101add2c624d1a21c91d3aca362f9a15cc6 /templates
parent3ebd73b9fdcdd0e6131376f0319a139e2fa8957c (diff)
set log template for remote logging explicitly
Diffstat (limited to 'templates')
-rw-r--r--templates/client.conf.erb7
1 files changed, 2 insertions, 5 deletions
diff --git a/templates/client.conf.erb b/templates/client.conf.erb
index 5fa1a2d..1effeaa 100644
--- a/templates/client.conf.erb
+++ b/templates/client.conf.erb
@@ -8,15 +8,12 @@ $ActionQueueSaveOnShutdown on # save messages to disk on shutdown
$ActionQueueType LinkedList # run asynchronously
$ActionResumeRetryCount -1 # infinety retries if host is down
-# Use ForwardFormat for remote logging
-$ActionFileDefaultTemplate RSYSLOG_ForwardFormat
-
<% if scope.lookupvar('rsyslog::client::log_remote') -%>
# 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') -%>:514
+*.* @@<%= scope.lookupvar('rsyslog::client::server') -%>:514;RSYSLOG_ForwardFormat
<% else -%>
-*.* @<%= scope.lookupvar('rsyslog::client::server') -%>:514
+*.* @<%= scope.lookupvar('rsyslog::client::server') -%>:514;RSYSLOG_ForwardFormat
<% end -%>
<% end -%>