diff options
| author | Adam Stephens <adam.c.stephens@noaa.gov> | 2014-02-05 15:24:43 -0500 |
|---|---|---|
| committer | Adam Stephens <adam.c.stephens@noaa.gov> | 2014-02-05 15:24:43 -0500 |
| commit | 97891aa2a071006c396da1f707db8f2cb033125c (patch) | |
| tree | c9256f20270808068c8c07d7afd019a5aa999358 /templates | |
| parent | b75cd78311482b842c5bd3f19e57fdbd3bad25d4 (diff) | |
| parent | 974461946abf2ff705d1644d900268618eecdbb0 (diff) | |
Merge branch 'master' of https://github.com/saz/puppet-rsyslog into el5
Conflicts:
templates/rsyslog.conf.erb
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/client.conf.erb | 5 | ||||
| -rw-r--r-- | templates/imfile.erb | 2 | ||||
| -rw-r--r-- | templates/rsyslog.conf.erb | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/templates/client.conf.erb b/templates/client.conf.erb index d86a271..696b9b2 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -41,6 +41,11 @@ auth,authpriv.* /var/log/secure <% end -%> <% 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::log_local') -%> <% if scope.lookupvar('rsyslog::log_style') == 'debian' -%> # First some standard log files. Log by facility. diff --git a/templates/imfile.erb b/templates/imfile.erb index 0540158..4e5b71f 100644 --- a/templates/imfile.erb +++ b/templates/imfile.erb @@ -6,6 +6,6 @@ $InputFileStateFile state-<%= @name %> $InputFileSeverity <%= @file_severity %> $InputFileFacility <%= @file_facility %> $InputFilePollInterval <%= @polling_interval %> -<% if run_file_monitor == true -%> +<% if @run_file_monitor == true -%> $InputRunFileMonitor <% end -%> diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb index da7920f..f076fc4 100644 --- a/templates/rsyslog.conf.erb +++ b/templates/rsyslog.conf.erb @@ -20,10 +20,8 @@ $FileCreateMode <%= scope.lookupvar('rsyslog::perm_file') %> $DirOwner <%= scope.lookupvar('rsyslog::log_user') %> $DirGroup <%= scope.lookupvar('rsyslog::log_group') %> $DirCreateMode <%= scope.lookupvar('rsyslog::perm_dir') %> -<% if scope.lookupvar('osfamily') == 'redhat' and scope.lookupvar('operatingsystemrelease') >= 6.0 -%> -$PrivDropToUserID <%= scope.lookupvar('rsyslog::run_user') %> -$PrivDropToGroupID <%= scope.lookupvar('rsyslog::run_group') %> -<% end -%> +$PrivDropToUser <%= scope.lookupvar('rsyslog::run_user') %> +$PrivDropToGroup <%= scope.lookupvar('rsyslog::run_group') %> # # Include all config files in <%= scope.lookupvar('rsyslog::rsyslog_d') %> |