Commit fcd848c0 authored by Christopher Chow's avatar Christopher Chow
Browse files

Move additional directives before includes

This allows for settings to cascade down into included configs and also
allows settings to be overwritten.
parent 260f0c86
......@@ -97,10 +97,15 @@ $SystemLogRateLimitInterval <%= node['rsyslog']['rate_limit_interval'] %>
#
$SystemLogRateLimitBurst <%= node['rsyslog']['rate_limit_burst'] %>
<% end %>
#
# Include all config files in <%= node['rsyslog']['config_prefix'] %>/rsyslog.d/
# Set other directives
#
$IncludeConfig <%= node['rsyslog']['config_prefix'] %>/rsyslog.d/*.conf
<% node['rsyslog']['additional_directives'].each_pair do |k,v| %>
$<%= k %> <%= v %>
<% end %>
#
# Include all config files in <%= node['rsyslog']['config_prefix'] %>/rsyslog.d/
#
$IncludeConfig <%= node['rsyslog']['config_prefix'] %>/rsyslog.d/*.conf
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment