Browse Source

Merge pull request #3 from genuss/improvements

Add some improvements
master
puneet kandhari 9 years ago
parent
commit
c02f63f4db
2 changed files with 15 additions and 2 deletions
  1. +5
    -0
      pillar.example
  2. +10
    -2
      syslog_ng/files/syslog-ng.conf

+ 5
- 0
pillar.example View File

@@ -1,4 +1,9 @@
syslog_ng:
module:
- tfson
include:
- /etc/syslog-ng/conf.d/
version: 3.5
options:
- threaded: yes
- use_dns: no

+ 10
- 2
syslog_ng/files/syslog-ng.conf View File

@@ -16,9 +16,17 @@ def rule_builder(rule):
return rule[1:]
return '"%s"' % rule
%>\
@version: 3.3

@module tfjson
@version: ${ syslog_config.get('version', '3.3') }

% for module in syslog_config.get('module', []):
@module ${ rule_builder(module) }
% endfor

% for inc in syslog_config.get('include', []):
@include ${ rule_builder(inc) }
% endfor


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

Loading…
Cancel
Save