瀏覽代碼

Add last_include pillar key

tags/v0.2.0
Nicolas Rodriguez 7 年之前
父節點
當前提交
fb4f2adfb5
共有 3 個文件被更改,包括 11 次插入2 次删除
  1. +4
    -2
      pillar.example
  2. +4
    -0
      syslog_ng/files/syslog-ng.conf
  3. +3
    -0
      syslog_ng/os_family_map.yml

+ 4
- 2
pillar.example 查看文件

@@ -2,7 +2,9 @@ syslog_ng:
module:
- tfson
include:
- /etc/syslog-ng/conf.d/
- scl.conf
last_include:
- /etc/syslog-ng/conf.d/*.conf
version: 3.5
options:
- threaded: yes
@@ -12,7 +14,7 @@ syslog_ng:
- chain_hostnames: no
- check_hostname: no
source:
- s_internal:
- s_internal:
- internal: null
- s_local:
- unix-stream: /dev/log

+ 4
- 0
syslog_ng/files/syslog-ng.conf 查看文件

@@ -37,3 +37,7 @@ log {
};

{% endfor %}

{%- for inc in syslog_ng.get('last_include', []) %}
@include {{ rule_builder(inc) }}
{%- endfor %}

+ 3
- 0
syslog_ng/os_family_map.yml 查看文件

@@ -21,6 +21,9 @@ Debian:
include:
- scl.conf

last_include:
- /etc/syslog-ng/conf.d/*.conf

source:
- s_src:
- system: null

Loading…
取消
儲存