diff options
| -rw-r--r-- | manifests/params.pp | 5 | ||||
| -rw-r--r-- | manifests/server.pp | 2 | ||||
| -rw-r--r-- | templates/rsyslog.conf.erb | 8 | ||||
| -rw-r--r-- | templates/server.conf.erb | 8 |
4 files changed, 9 insertions, 14 deletions
diff --git a/manifests/params.pp b/manifests/params.pp index 85fe689..11a5e56 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,9 +1,4 @@ class rsyslog::params { - $high_precision_timestamps = $rsyslog_high_precision_timestamps ? { - '' => false, - default => $rsyslog_high_precision_timestamps, - } - case $::operatingsystem { /(Ubuntu|Debian)/: { $rsyslog_package_name = 'rsyslog' diff --git a/manifests/server.pp b/manifests/server.pp index cf7075c..adc868e 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -1,4 +1,4 @@ -class rsyslog::server ($enable_tcp = true, $enable_udp = true, $server_dir = '/srv/log/', $custom_config = undef) inherits rsyslog { +class rsyslog::server ($enable_tcp = true, $enable_udp = true, $server_dir = '/srv/log/', $custom_config = undef, $high_precision_timestamps = false) inherits rsyslog { file { $rsyslog::params::server_conf: ensure => present, owner => root, diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb index d522ae0..12f85c3 100644 --- a/templates/rsyslog.conf.erb +++ b/templates/rsyslog.conf.erb @@ -8,14 +8,6 @@ $ModLoad imuxsock # provides support for local system logging $ModLoad imklog # provides kernel logging support (previously done by rklogd) #$ModLoad immark # provides --MARK-- message capability -<% if scope.lookupvar('rsyslog::params::high_precision_timestamps') == false -%> -# -# Use traditional timestamp format. -# To enable high precision timestamps, comment out the following line. -# -$ActionFileDefaultTemplate RSYSLOG_ForwardFormat -<% end -%> - ########################### #### GLOBAL DIRECTIVES #### ########################### diff --git a/templates/server.conf.erb b/templates/server.conf.erb index 402c0e6..41fdcef 100644 --- a/templates/server.conf.erb +++ b/templates/server.conf.erb @@ -1,5 +1,13 @@ # File is managed by puppet +<% if scope.lookupvar('rsyslog::server::high_precision_timestamps') == false -%> +# +# Use traditional timestamp format. +# To enable high precision timestamps, comment out the following line. +# +$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +<% end -%> + <% if scope.lookupvar('rsyslog::server::enable_udp') -%> $ModLoad imudp $UDPServerRun 514 |