From 5d1bed1e89d3836428f21971ce1b4acbd0cced8a Mon Sep 17 00:00:00 2001
From: Bill MacAllister <whm@stanford.edu>
Date: Mon, 24 Feb 2014 15:59:15 -0800
Subject: [PATCH] base::syslog: Correct template, revert to default to legacy
syslog
This change is to allow the v7 rsyslog template to be corrected
without changing the default rsyslog behavior.
---
files/syslog/etc/rsyslog.d/20-templates.conf | 1 -
manifests/syslog/config/rsyslog.pp | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/files/syslog/etc/rsyslog.d/20-templates.conf b/files/syslog/etc/rsyslog.d/20-templates.conf
index 74633b5..d46207c 100644
--- a/files/syslog/etc/rsyslog.d/20-templates.conf
+++ b/files/syslog/etc/rsyslog.d/20-templates.conf
@@ -4,7 +4,6 @@ template(name="FileFormat" type="list") {
property(name="hostname")
constant(value=" ")
property(name="syslogtag")
- constant(value=" ")
property(name="msg" spifno1stsp="on" )
property(name="msg" droplastlf="on" )
constant(value="\n")
diff --git a/manifests/syslog/config/rsyslog.pp b/manifests/syslog/config/rsyslog.pp
index 0f56500..32fb798 100644
--- a/manifests/syslog/config/rsyslog.pp
+++ b/manifests/syslog/config/rsyslog.pp
@@ -34,7 +34,7 @@ define base::syslog::config::rsyslog(
$mode = '0644',
$syslog_server = 'logsink.stanford.edu',
$replace = true,
- $use_syslog_conf = false,
+ $use_syslog_conf = true,
$use_default = true,
$use_v5 = true,
) {
--
GitLab