diff options
| author | Aaron Hicks <hicksa@landcareresearch.co.nz> | 2014-02-05 09:47:49 +1300 |
|---|---|---|
| committer | Aaron Hicks <hicksa@landcareresearch.co.nz> | 2014-02-07 10:40:21 +1300 |
| commit | 3707f44c19da275e14e99df0851ced9dce3f69d7 (patch) | |
| tree | 33d5dd39898a47567b1ac26a9c9da2a2f0a8438b /templates | |
| parent | aa064248b9646aa3e694478314105c44c7c40b76 (diff) | |
new parameter rsyslog::client parameter, actionfiletemplate, which sets the default logging format for remote and local logging.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/client.conf.erb | 13 |
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 |