]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Old syslog-ng is old, move @include inside check for newer ones
authorTollef Fog Heen <tfheen@err.no>
Thu, 27 Nov 2014 16:37:07 +0000 (17:37 +0100)
committerTollef Fog Heen <tfheen@err.no>
Thu, 27 Nov 2014 16:37:07 +0000 (17:37 +0100)
modules/syslog-ng/templates/syslog-ng.conf.erb

index f5d5036b29ff5dbfa6f90d4c19a91c32276c36d4..4353332cc52369f65ac11894c59a1c1f94c59ee4 100644 (file)
@@ -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.