Skip to content

Commit fb4f2ad

Browse files
committed
Add last_include pillar key
1 parent 13ce8d0 commit fb4f2ad

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

pillar.example

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ syslog_ng:
22
module:
33
- tfson
44
include:
5-
- /etc/syslog-ng/conf.d/
5+
- scl.conf
6+
last_include:
7+
- /etc/syslog-ng/conf.d/*.conf
68
version: 3.5
79
options:
810
- threaded: yes
@@ -12,7 +14,7 @@ syslog_ng:
1214
- chain_hostnames: no
1315
- check_hostname: no
1416
source:
15-
- s_internal:
17+
- s_internal:
1618
- internal: null
1719
- s_local:
1820
- unix-stream: /dev/log

syslog_ng/files/syslog-ng.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,7 @@ log {
3737
};
3838

3939
{% endfor %}
40+
41+
{%- for inc in syslog_ng.get('last_include', []) %}
42+
@include {{ rule_builder(inc) }}
43+
{%- endfor %}

syslog_ng/os_family_map.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ Debian:
2121
include:
2222
- scl.conf
2323

24+
last_include:
25+
- /etc/syslog-ng/conf.d/*.conf
26+
2427
source:
2528
- s_src:
2629
- system: null

0 commit comments

Comments
 (0)