From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 1 Apr 2019 16:03:09 +0000 (+0200)
Subject: syslog-ng.conf: drop support for versions older than jessie
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ff741e8f9376aa81ddd533496f530ba087aca18b;p=mirror%2Fdsa-puppet.git

syslog-ng.conf: drop support for versions older than jessie
---

diff --git a/modules/syslog_ng/templates/syslog-ng.conf.erb b/modules/syslog_ng/templates/syslog-ng.conf.erb
index a0016ef16..d42304ebc 100644
--- a/modules/syslog_ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog_ng/templates/syslog-ng.conf.erb
@@ -1,6 +1,4 @@
-<%- if has_variable?("syslogversion") and @syslogversion.to_s == "3.1" -%>
-@version: 3.0
-<%- elsif has_variable?("syslogversion") and @syslogversion.to_s == "3.5" -%>
+<%- if has_variable?("syslogversion") and @syslogversion.to_s == "3.5" -%>
 @version: 3.5
 @include "scl.conf"
 <%- elsif has_variable?("syslogversion") and @syslogversion.to_s == "3.8" -%>
@@ -52,11 +50,7 @@ options {
         #sync(0);
 
         # the number of lines fitting in the output queue
-<%- if has_variable?("syslogversion") and @syslogversion.to_s == "3.1" -%>
-        log_fifo_size(2048);
-<%- else -%>
         log_fifo_size(10000);
-<%- end -%>
 
         # enable or disable directory creation for destination files
         create_dirs(yes);
@@ -110,15 +104,7 @@ 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 has_variable?("haproxy") && @haproxy -%>
 	unix-stream("/var/lib/haproxy/dev/log");
 <%- end -%>