summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-04-27 09:24:09 +0200
committervarac <varacanero@zeromail.org>2015-04-27 09:24:09 +0200
commit87a2005d7a2ab9cccce67eea7f25de2a2e3d789a (patch)
tree9e660ec5dec0433ab59c3ea5e8fc6e25b2d5649f /puppet/modules
parentb7b9e33247d334d3753519b22fa1acbac7024ddc (diff)
parentcdf0b448aa4cdac8eb04f05bdeb1d4bf7630938e (diff)
Merge branch 'rsyslog_traditional_timestamps' into develop
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/leap/manifests/logfile.pp3
-rw-r--r--puppet/modules/leap/templates/rsyslog.erb5
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
+}
+