X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=templates%2Fsyslog-ng.conf.erb;h=f60820d03758666d7e30540b1a8365a592e3eba3;hb=8f35e8b2137bccacf5b33a7f829b42bccd50be0f;hp=35038e8d68732fca74016ea4b3beac82f64aacd3;hpb=fd2c08b5dd1290e76cced3da9c1c65dc40aa1adb;p=mirror%2Fdsa-puppet.git diff --git a/templates/syslog-ng.conf.erb b/templates/syslog-ng.conf.erb index 35038e8d6..f60820d03 100644 --- a/templates/syslog-ng.conf.erb +++ b/templates/syslog-ng.conf.erb @@ -1,4 +1,4 @@ -<%- if has_variable?(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 has_variable?(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 has_variable?(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 has_variable?(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")