From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 27 Nov 2014 16:40:44 +0000 (+0100)
Subject: Old syslog-ng is old, take 2.  Squeeze-syslog-ng lacks the system plugin
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7807d2d8cbc754c94c3066543f24ad747a446b5c;p=dsa-puppet.git

Old syslog-ng is old, take 2.  Squeeze-syslog-ng lacks the system plugin
---

diff --git a/modules/syslog-ng/templates/syslog-ng.conf.erb b/modules/syslog-ng/templates/syslog-ng.conf.erb
index 4353332c..98c2fb2f 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -107,7 +107,15 @@ options {
 source s_local {
         # message generated by Syslog-NG
         internal();
+<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
+        # standard Linux log source (this is the default place for the syslog()
+        # function to send logs to)
+        unix-stream("/dev/log");
+        # messages from the kernel
+        file("/proc/kmsg" program_override("kernel: "));
+<%- else -%>
 	system();
+<%- end -%>
 };
 
 <%- if (hostname == "lotti") || (hostname == "lully") || (hostname == "loghost-grnet-01") -%>