diff options
| author | Aaron Hicks <hicksa@landcareresearch.co.nz> | 2014-03-11 10:41:26 +1300 |
|---|---|---|
| committer | Aaron Hicks <hicksa@landcareresearch.co.nz> | 2014-03-11 10:41:26 +1300 |
| commit | 66a9354a3de1e1cf224ee098ed8a7b59f79079ae (patch) | |
| tree | 39a9cdfdde5cd0acb13a455e44827f705770ef42 /templates | |
| parent | 4d51a536a444ae629743a2c25673b0db1d1d1ef9 (diff) | |
Define log templates with $template
Remove and update 'file managed by puppet' comment
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 42dbccc..8b86ce1 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -1,4 +1,3 @@ -# file is managed by puppet # An "In-Memory Queue" is created for remote logging. $WorkDirectory <%= scope.lookupvar('rsyslog::spool_dir') -%> # where to place spool files @@ -7,14 +6,20 @@ $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::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 fromat: +# Using specified format for default logging format: $ActionFileDefaultTemplate <%= scope.lookupvar('rsyslog::client::actionfiletemplate') %> <% else -%> -#Using default format for default logging fromat: +#Using default format for default logging format: $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat <% end -%> -<% if scope.lookupvar('rsyslog::client::remote_servers') and ! scope.lookupvar('rsyslog::client::remote_servers').empty? -%> +<% 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'] -%> |