From a5b8e19a4b7488816d10b15e7c090530ee2b5ca6 Mon Sep 17 00:00:00 2001 From: Maciej Strzelecki Date: Fri, 4 Apr 2014 16:35:50 +0200 Subject: PreserveFQDN as first directive in rsyslog.conf --- templates/client.conf.erb | 5 ----- templates/rsyslog.conf.erb | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/templates/client.conf.erb b/templates/client.conf.erb index 3ed4f32..c10512c 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -33,11 +33,6 @@ $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| -%> diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb index f076fc4..d289f2a 100644 --- a/templates/rsyslog.conf.erb +++ b/templates/rsyslog.conf.erb @@ -14,6 +14,9 @@ # # Set the default permissions for all log files. # +<% if scope.lookupvar('rsyslog::client::preserve_fqdn') -%> +$PreserveFQDN on +<% end -%> $FileOwner <%= scope.lookupvar('rsyslog::log_user') %> $FileGroup <%= scope.lookupvar('rsyslog::log_group') %> $FileCreateMode <%= scope.lookupvar('rsyslog::perm_file') %> -- cgit v1.2.3