From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 27 Nov 2014 16:37:07 +0000 (+0100)
Subject: Old syslog-ng is old, move @include inside check for newer ones
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dfd04d29cd984e30a2ee714e041d0516d0460383;hp=dcf6c0e62c300afd21c6f731af458527528694df;p=dsa-puppet.git

Old syslog-ng is old, move @include inside check for newer ones
---

diff --git a/modules/syslog-ng/templates/syslog-ng.conf.erb b/modules/syslog-ng/templates/syslog-ng.conf.erb
index f5d5036b..4353332c 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -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.