From 7a61281c4e2e10214483776f42daddb04993f3aa Mon Sep 17 00:00:00 2001
From: Aaron Hicks <hicksa@landcareresearch.co.nz>
Date: Tue, 11 Mar 2014 10:45:19 +1300
Subject: Remove some generic logging configuration from inside the local
 logging block to expose them when setting up remote logging.

---
 templates/client.conf.erb | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'templates')

diff --git a/templates/client.conf.erb b/templates/client.conf.erb
index 8b86ce1..3ed4f32 100644
--- a/templates/client.conf.erb
+++ b/templates/client.conf.erb
@@ -7,19 +7,39 @@ $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::log_templates') and ! scope.lookupvar('rsyslog::client::log_templates').empty?-%>
+
 # Define custom logging templates
 <% scope.lookupvar('rsyslog::client::log_templates').flatten.compact.each do |log_template| -%>
 $template <%= log_template['name'] %>,"<%= log_template['template'] %>"
 <% end -%>
 <% end -%>
 <% if scope.lookupvar('rsyslog::client::actionfiletemplate') -%>
+
 # Using specified format for default logging format:
 $ActionFileDefaultTemplate <%= scope.lookupvar('rsyslog::client::actionfiletemplate') %>
 <% else -%>
+
 #Using default format for default logging format:
 $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 <% end -%>
+<% if scope.lookupvar('rsyslog::client::ssl') -%>
+
+# Setup SSL connection.
+# CA/Cert
+$DefaultNetStreamDriverCAFile <%= scope.lookupvar('rsyslog::client::ssl_ca') %>
+
+# Connection settings.
+$DefaultNetstreamDriver gtls
+$ActionSendStreamDriverMode 1
+$ActionSendStreamDriverAuthMode anon
+<% end -%>
+<% if scope.lookupvar('rsyslog::client::preserve_fqdn') -%>
+
+# Tell rsyslog to use FQDN and not short server names
+$PreserveFQDN on 
+<% end -%>
 <% if scope.lookupvar('rsyslog::client::remote_servers')  -%>
+
 <% scope.lookupvar('rsyslog::client::remote_servers').flatten.compact.each do |server| -%>
 <% if server['pattern'] and server['pattern'] != ''-%>
 <% pattern = server['pattern'] -%>
@@ -54,6 +74,7 @@ $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 <%= pattern %> <%= protocol %><%= host %>:<%= port %><%= format %>
 <% end -%>
 <% elsif 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') -%>:<%= scope.lookupvar('rsyslog::client::port') -%>;RSYSLOG_ForwardFormat
@@ -62,16 +83,6 @@ $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 <% end -%>
 <% 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
-$DefaultNetStreamDriverCAFile <%= scope.lookupvar('rsyslog::client::ssl_ca') %>
-
-# Connection settings.
-$DefaultNetstreamDriver gtls
-$ActionSendStreamDriverMode 1
-$ActionSendStreamDriverAuthMode anon
-<% end -%>
 
 # Logging locally.
 
@@ -83,12 +94,6 @@ auth,authpriv.*                 /var/log/auth.log
 auth,authpriv.*                 /var/log/secure
 <% end -%>
 <% end -%>
-
-<% if scope.lookupvar('rsyslog::client::preserve_fqdn') -%>
-# Tell rsyslog to use FQDN and not short server names
-$PreserveFQDN on 
-<% end -%>
-
 <% if scope.lookupvar('rsyslog::client::log_local') -%>
 <% if scope.lookupvar('rsyslog::log_style') == 'debian' -%>
 # First some standard log files.  Log by facility.
-- 
cgit v1.2.3