X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog-ng%2Ftemplates%2Fsyslog-ng.conf.erb;h=98c2fb2fe2c8163027254e1a16244733c865ed72;hb=d29233de3db679803f992485b44ba8abaf01502a;hp=bb8770af9c8de112bebdf319e4799e9c18a5ca79;hpb=b1c0b7a1a0e1d42bac09fae9985ede940db771aa;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 bb8770af9..98c2fb2fe 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -1,8 +1,13 @@
 <%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
 @version: 3.0
+<%- elsif has_variable?("syslogversion") and syslogversion.to_s == "3.5" -%>
+@version: 3.5
+@include "scl.conf"
 <%- else -%>
 @version: 3.3
+@include "scl.conf"
 <%- end -%>
+
 ##
 ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
@@ -102,18 +107,14 @@ options {
 source s_local {
         # message generated by Syslog-NG
         internal();
-<%- if kernel == 'Linux' -%>
+<%- 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 -%>
-        # standard Linux log source (this is the default place for the syslog()
-        # function to send logs to)
-        unix-dgram("/var/run/log");
-        # messages from the kernel
-        file("/dev/klog" program_override("kernel: ") follow-freq(1));
+	system();
 <%- end -%>
 };