From 3707f44c19da275e14e99df0851ced9dce3f69d7 Mon Sep 17 00:00:00 2001
From: Aaron Hicks <hicksa@landcareresearch.co.nz>
Date: Wed, 5 Feb 2014 09:47:49 +1300
Subject: new parameter rsyslog::client parameter, actionfiletemplate, which
 sets the default logging format for remote and local logging.

---
 templates/client.conf.erb | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'templates')

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
-- 
cgit v1.2.3