From dfd04d29cd984e30a2ee714e041d0516d0460383 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Thu, 27 Nov 2014 17:37:07 +0100 Subject: [PATCH 1/1] Old syslog-ng is old, move @include inside check for newer ones --- modules/syslog-ng/templates/syslog-ng.conf.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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. -- 2.39.2