Skip to content

Commit c02f63f

Browse files
committed
Merge pull request #3 from genuss/improvements
Add some improvements
2 parents ed93bb0 + a73a32f commit c02f63f

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

pillar.example

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
syslog_ng:
2+
module:
3+
- tfson
4+
include:
5+
- /etc/syslog-ng/conf.d/
6+
version: 3.5
27
options:
38
- threaded: yes
49
- use_dns: no

syslog_ng/files/syslog-ng.conf

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,17 @@ def rule_builder(rule):
1616
return rule[1:]
1717
return '"%s"' % rule
1818
%>\
19-
@version: 3.3
2019

21-
@module tfjson
20+
@version: ${ syslog_config.get('version', '3.3') }
21+
22+
% for module in syslog_config.get('module', []):
23+
@module ${ rule_builder(module) }
24+
% endfor
25+
26+
% for inc in syslog_config.get('include', []):
27+
@include ${ rule_builder(inc) }
28+
% endfor
29+
2230

2331
options {
2432
% for rule in syslog_config.get('options', []):

0 commit comments

Comments
 (0)