From cdf0b448aa4cdac8eb04f05bdeb1d4bf7630938e Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sun, 26 Apr 2015 22:03:31 +0200
Subject: Use rsyslog traditional timestamp format in custom logfiles #6886

Change-Id: I9e033f63e3b387e95f5bf1c3820e456f740d8180
---
 puppet/modules/leap/manifests/logfile.pp  | 3 +--
 puppet/modules/leap/templates/rsyslog.erb | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 puppet/modules/leap/templates/rsyslog.erb

(limited to 'puppet')

diff --git a/puppet/modules/leap/manifests/logfile.pp b/puppet/modules/leap/manifests/logfile.pp
index c5c185f6..63dbd16b 100644
--- a/puppet/modules/leap/manifests/logfile.pp
+++ b/puppet/modules/leap/manifests/logfile.pp
@@ -6,8 +6,7 @@ define leap::logfile($process=$name) {
   $logfile = "/var/log/leap/${name}.log"
 
   rsyslog::snippet { "50-${name}":
-    content => "if \$programname startswith '${process}' then ${logfile}
-&~"
+    content => template('leap/rsyslog.erb')
   }
 
   augeas {
diff --git a/puppet/modules/leap/templates/rsyslog.erb b/puppet/modules/leap/templates/rsyslog.erb
new file mode 100644
index 00000000..7bb5316f
--- /dev/null
+++ b/puppet/modules/leap/templates/rsyslog.erb
@@ -0,0 +1,5 @@
+if $programname startswith '<%= @process %>' then {
+  action(type="omfile" file="<%= @logfile %>" template="RSYSLOG_TraditionalFileFormat")
+  stop
+}
+
-- 
cgit v1.2.3