diff options
| author | Steffen Zieger <me@saz.sh> | 2014-04-19 20:09:53 +0200 |
|---|---|---|
| committer | Steffen Zieger <me@saz.sh> | 2014-04-19 20:09:53 +0200 |
| commit | de4a52cd0d36c7c2988dab56e21f4aa806349377 (patch) | |
| tree | 725efdbe610a7a772cd7006ad8b17e08d8a6165a | |
| parent | ac1d98877c9e658beb7d9b8577672504a0e0203f (diff) | |
| parent | a5b8e19a4b7488816d10b15e7c090530ee2b5ca6 (diff) | |
Merge pull request #67 from mstrzele/master
PreserveFQDN as first directive in rsyslog.conf
| -rw-r--r-- | templates/client.conf.erb | 5 | ||||
| -rw-r--r-- | 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') %> |