summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/client.conf.erb13
1 files changed, 9 insertions, 4 deletions
diff --git a/templates/client.conf.erb b/templates/client.conf.erb
index 696b9b2..1990112 100644
--- a/templates/client.conf.erb
+++ b/templates/client.conf.erb
@@ -7,7 +7,14 @@ $ActionQueueMaxDiskSpace <%= scope.lookupvar('rsyslog::client::spool_size') -%>
$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
$ActionQueueType LinkedList # run asynchronously
$ActionResumeRetryCount -1 # infinety retries if host is down
-
+<% if scope.lookupvar('rsyslog::client::actionfiletemplate') -%>
+# Using specified format for default logging fromat:
+$ActionFileDefaultTemplate <%= scope.lookupvar('rsyslog::client::actionfiletemplate') %>
+<% else -%>
+#Using default format for default logging fromat:
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+<% end -%>
+<% if scope.lookupvar('rsyslog::client::log_auth_local') or scope.lookupvar('rsyslog::client::log_local') -%>
<% if scope.lookupvar('rsyslog::client::ssl') -%>
# Setup SSL connection.
# CA/Cert
@@ -28,9 +35,7 @@ $ActionSendStreamDriverAuthMode anon
<% end -%>
<% end -%>
-<% if scope.lookupvar('rsyslog::client::log_auth_local') or scope.lookupvar('rsyslog::client::log_local') -%>
-# We log locally, restore to default format
-$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+# Logging locally.
<% if scope.lookupvar('rsyslog::log_style') == 'debian' -%>
# Log auth messages locally