diff options
| author | varac <varacanero@zeromail.org> | 2015-04-26 22:03:31 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-04-26 22:42:12 +0200 |
| commit | cdf0b448aa4cdac8eb04f05bdeb1d4bf7630938e (patch) | |
| tree | 38400da8a827a1b91dea3e1a3e35f13fbfcdf50e /puppet | |
| parent | eaddcfca6761bac329a57a65453958b6741f2420 (diff) | |
Use rsyslog traditional timestamp format in custom logfiles #6886
Change-Id: I9e033f63e3b387e95f5bf1c3820e456f740d8180
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/modules/leap/manifests/logfile.pp | 3 | ||||
| -rw-r--r-- | puppet/modules/leap/templates/rsyslog.erb | 5 |
2 files changed, 6 insertions, 2 deletions
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 +} + |