diff options
| -rw-r--r-- | manifests/client.pp | 2 | ||||
| -rw-r--r-- | manifests/params.pp | 16 | ||||
| -rw-r--r-- | manifests/server.pp | 2 | ||||
| -rw-r--r-- | templates/client.conf.erb | 5 | ||||
| -rw-r--r-- | templates/rsyslog.conf.erb | 3 |
5 files changed, 13 insertions, 15 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index 3cccff3..b5fa04b 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -47,7 +47,7 @@ class rsyslog::client ( default => template($custom_config),
}
- rsyslog::snippet {'client':
+ rsyslog::snippet { $rsyslog::client_conf:
ensure => present,
content => $content_real,
}
diff --git a/manifests/params.pp b/manifests/params.pp index e9b123c..5e77108 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -34,8 +34,8 @@ class rsyslog::params { $perm_dir = '0755' $spool_dir = '/var/spool/rsyslog' $service_name = 'rsyslog' - $client_conf = "${rsyslog_d}client.conf" - $server_conf = "${rsyslog_d}server.conf" + $client_conf = 'client' + $server_conf = 'server' $ssl = false $modules = [ '$ModLoad imuxsock # provides support for local system logging', @@ -78,8 +78,8 @@ class rsyslog::params { $perm_dir = '0750' $spool_dir = '/var/lib/rsyslog' $service_name = 'rsyslog' - $client_conf = "${rsyslog_d}client.conf" - $server_conf = "${rsyslog_d}server.conf" + $client_conf = 'client' + $server_conf = 'server' $ssl = false $modules = [ '$ModLoad imuxsock # provides support for local system logging', @@ -107,8 +107,8 @@ class rsyslog::params { $perm_dir = '0755' $spool_dir = '/var/spool/syslog' $service_name = 'syslogd' - $client_conf = "${rsyslog_d}client.conf" - $server_conf = "${rsyslog_d}server.conf" + $client_conf = 'client' + $server_conf = 'server' $ssl = false $modules = [ '$ModLoad imuxsock # provides support for local system logging', @@ -140,8 +140,8 @@ class rsyslog::params { $perm_dir = '0755' $spool_dir = '/var/spool/rsyslog' $service_name = 'rsyslog' - $client_conf = "${rsyslog_d}client.conf" - $server_conf = "${rsyslog_d}server.conf" + $client_conf = 'client' + $server_conf = 'server' $ssl = false $modules = [ '$ModLoad imuxsock # provides support for local system logging', diff --git a/manifests/server.pp b/manifests/server.pp index beecde3..0496002 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -46,7 +46,7 @@ class rsyslog::server ( default => template($custom_config), } - rsyslog::snippet {'server': + rsyslog::snippet { $rsyslog::server_conf: ensure => present, content => $real_content, } 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') %> |