From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 18 Jul 2014 08:30:42 +0000 (+0200)
Subject: Default to 3.3 syslog-ng if version is not otherwise handled
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=be5c9f27eb1a299edd045e63568dc29039242cb7;p=mirror%2Fdsa-puppet.git

Default to 3.3 syslog-ng if version is not otherwise handled
---

diff --git a/modules/syslog-ng/templates/syslog-ng.conf.erb b/modules/syslog-ng/templates/syslog-ng.conf.erb
index 546bf1cb5..c2278e3e0 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -1,7 +1,6 @@
 <%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
 @version: 3.0
-<%- end -%>
-<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.3" -%>
+<%- else -%>
 @version: 3.3
 <%- end -%>
 ##
@@ -47,8 +46,7 @@ options {
         # the number of lines fitting in the output queue
 <%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
         log_fifo_size(2048);
-<%- end -%>
-<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.3" -%>
+<%- else -%>
         log_fifo_size(10000);
 <%- end -%>