X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=templates%2Fsyslog-ng.conf.erb;h=f60820d03758666d7e30540b1a8365a592e3eba3;hb=9f03464fb4e359654ad10961d1d26da53efef600;hp=795ca9ec368c01394fb3b75dc1e6fe6819e79ef7;hpb=ac161ba368fdaa23616d47e8e7d5a651a5340275;p=mirror%2Fdsa-puppet.git

diff --git a/templates/syslog-ng.conf.erb b/templates/syslog-ng.conf.erb
index 795ca9ec3..f60820d03 100644
--- a/templates/syslog-ng.conf.erb
+++ b/templates/syslog-ng.conf.erb
@@ -1,4 +1,4 @@
-<%- if defined?(syslogversion) && syslogversion == "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 defined?(syslogversion) && syslogversion == "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 defined?(syslogversion) && syslogversion == "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 defined?(syslogversion) && syslogversion == "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")