From: Stephen Gran <steve@lobefin.net>
Date: Sun, 25 Jul 2010 16:21:49 +0000 (+0100)
Subject: guard against empty syslog version for new installs
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ac161ba368fdaa23616d47e8e7d5a651a5340275;p=mirror%2Fdsa-puppet.git

guard against empty syslog version for new installs

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/templates/syslog-ng.conf.erb b/templates/syslog-ng.conf.erb
index 74dc79f3a..795ca9ec3 100644
--- a/templates/syslog-ng.conf.erb
+++ b/templates/syslog-ng.conf.erb
@@ -1,4 +1,4 @@
-<%- if syslogversion == "3" -%>
+<%- if defined?(syslogversion) && syslogversion == "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 syslogversion == "2" -%>
+<%- if defined?(syslogversion) && syslogversion == "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 syslogversion == "2" -%>
+<%- if defined?(syslogversion) && syslogversion == "2" -%>
         file("/dev/klog" log_prefix("kernel: "));
 <%- else -%>
         file("/dev/klog" program_override("kernel: "));
@@ -404,7 +404,7 @@ log {
 
 
 <%- if hostname != "heininen" -%>
- <%- if syslogversion == "3" -%>
+ <%- if defined?(syslogversion) && syslogversion == "3" -%>
 destination loghost-heininen {
 	tcp("heininen.debian.org" port (5140)
 		tls( key_file("/etc/ssl/debian/keys/thishost.key")