diff options
| author | Saz <me@saz.sh> | 2011-12-03 15:54:33 +0100 |
|---|---|---|
| committer | Saz <me@saz.sh> | 2011-12-03 15:54:33 +0100 |
| commit | 53b8b635b4a012844b6f236b13cf79a976a238e3 (patch) | |
| tree | 131191fa9896fd92979141a2ae136b1c8032d0b3 /templates | |
| parent | 9e9d4e12e93eba7c4b4ece18e7679a8a166e12ec (diff) | |
use high-precision timestamps on log server if enabled
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/rsyslog.conf.erb | 8 | ||||
| -rw-r--r-- | templates/server.conf.erb | 8 |
2 files changed, 8 insertions, 8 deletions
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 |