projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dcf6c0e
)
Old syslog-ng is old, move @include inside check for newer ones
author
Tollef Fog Heen
<tfheen@err.no>
Thu, 27 Nov 2014 16:37:07 +0000
(17:37 +0100)
committer
Tollef Fog Heen
<tfheen@err.no>
Thu, 27 Nov 2014 16:37:07 +0000
(17:37 +0100)
modules/syslog-ng/templates/syslog-ng.conf.erb
patch
|
blob
|
history
diff --git
a/modules/syslog-ng/templates/syslog-ng.conf.erb
b/modules/syslog-ng/templates/syslog-ng.conf.erb
index
f5d5036
..
4353332
100644
(file)
--- 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.