From fd2c08b5dd1290e76cced3da9c1c65dc40aa1adb Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 28 Jul 2010 13:12:52 +0200 Subject: [PATCH] Try something for syslog fu, III --- templates/syslog-ng.conf.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/syslog-ng.conf.erb b/templates/syslog-ng.conf.erb index e1abb1567..35038e8d6 100644 --- a/templates/syslog-ng.conf.erb +++ b/templates/syslog-ng.conf.erb @@ -1,4 +1,4 @@ -<%- if syslogversion and syslogversion.to_s == "3" -%> +<%- if has_variable?(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 syslogversion and syslogversion.to_s == "2" -%> +<%- if has_variable?(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 syslogversion and syslogversion.to_s == "2" -%> +<%- if has_variable?(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 syslogversion and syslogversion.to_s == "3" -%> + <%- if has_variable?(syslogversion) and syslogversion.to_s == "3" -%> destination loghost-heininen { tcp("heininen.debian.org" port (5140) tls( key_file("/etc/ssl/debian/keys/thishost.key") -- 2.20.1