]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Default to 3.3 syslog-ng if version is not otherwise handled
authorPeter Palfrader <peter@palfrader.org>
Fri, 18 Jul 2014 08:30:42 +0000 (10:30 +0200)
committerPeter Palfrader <peter@palfrader.org>
Fri, 18 Jul 2014 08:30:47 +0000 (10:30 +0200)
modules/syslog-ng/templates/syslog-ng.conf.erb

index 546bf1cb5de0a3bcf4daeeb37c0e2461d629f2b7..c2278e3e0eba2bb466f2c6e5e7f81d67bc1166f4 100644 (file)
@@ -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 -%>