From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 28 Jul 2010 09:31:21 +0000 (+0200)
Subject: Try something for syslog fu, II
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=bcfc5bf4b77cc637ffd582e2bc2cb3170090d7d9;p=mirror%2Fdsa-puppet.git

Try something for syslog fu, II
---

diff --git a/templates/syslog-ng.conf.erb b/templates/syslog-ng.conf.erb
index 468fcbb09..e1abb1567 100644
--- a/templates/syslog-ng.conf.erb
+++ b/templates/syslog-ng.conf.erb
@@ -1,4 +1,4 @@
-<%- if defined? syslogversion and syslogversion.to_s == "3" -%>
+<%- if syslogversion and syslogversion.to_s == "3" -%>
 @version: 3.0
 <%- end -%>
 ##
@@ -102,7 +102,7 @@ source s_local {
         # function to send logs to)
         unix-stream("/dev/log");
         # messages from the kernel
-<%- if defined? syslogversion and syslogversion.to_s == "2" -%>
+<%- if syslogversion and syslogversion.to_s == "2" -%>
         file("/proc/kmsg" log_prefix("kernel: "));
 <%- else -%>
         file("/proc/kmsg" program_override("kernel: "));
@@ -112,7 +112,7 @@ source s_local {
         # function to send logs to)
         unix-dgram("/var/run/log");
         # messages from the kernel
-<%- if defined? syslogversion and syslogversion.to_s == "2" -%>
+<%- if syslogversion and syslogversion.to_s == "2" -%>
         file("/dev/klog" log_prefix("kernel: "));
 <%- else -%>
         file("/dev/klog" program_override("kernel: "));
@@ -404,7 +404,7 @@ log {
 
 
 <%- if hostname != "heininen" -%>
- <%- if defined? syslogversion and syslogversion.to_s == "3" -%>
+ <%- if syslogversion and syslogversion.to_s == "3" -%>
 destination loghost-heininen {
 	tcp("heininen.debian.org" port (5140)
 		tls( key_file("/etc/ssl/debian/keys/thishost.key")