X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog-ng%2Ftemplates%2Fsyslog-ng.conf.erb;h=98c2fb2fe2c8163027254e1a16244733c865ed72;hb=92d0c5bf1a22bfee00eb48d1cc3862fda5343028;hp=f5d5036b29ff5dbfa6f90d4c19a91c32276c36d4;hpb=a887b89923ce1844ab3f85930949bc45e61c445e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/syslog-ng/templates/syslog-ng.conf.erb b/modules/syslog-ng/templates/syslog-ng.conf.erb
index f5d5036b2..98c2fb2fe 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -2,10 +2,11 @@
 @version: 3.0
 <%- elsif has_variable?("syslogversion") and syslogversion.to_s == "3.5" -%>
 @version: 3.5
+@include "scl.conf"
 <%- else -%>
 @version: 3.3
-<%- end -%>
 @include "scl.conf"
+<%- end -%>
 
 ##
 ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
@@ -106,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") -%>