FreeBSD: support extensive logging

This commit is contained in:
Alexander Weidinger 2018-11-30 01:58:30 +01:00
parent df046903ce
commit 56dc5da024
2 changed files with 18 additions and 16 deletions

View file

@ -115,6 +115,23 @@ bind_default_config:
- service: bind_restart - service: bind_restart
{% endif %} {% endif %}
{%- if salt['pillar.get']('bind:config:use_extensive_logging', False) %}
bind_logging_config:
file.managed:
- name: {{ map.logging_config }}
- source: salt://bind/files/named.conf.logging.jinja
- template: jinja
- user: {{ salt['pillar.get']('bind:config:user', map.user) }}
- group: {{ salt['pillar.get']('bind:config:group', map.group) }}
- mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
- context:
map: {{ map }}
- require:
- pkg: bind
- watch_in:
- service: bind
{%- endif %}
{% if grains['os_family'] == 'Debian' %} {% if grains['os_family'] == 'Debian' %}
bind_key_config: bind_key_config:
file.managed: file.managed:
@ -168,22 +185,6 @@ bind_default_zones:
- context: - context:
map: {{ map }} map: {{ map }}
{%- if salt['pillar.get']('bind:config:use_extensive_logging', False) %}
bind_logging_config:
file.managed:
- name: {{ map.logging_config }}
- source: salt://bind/files/named.conf.logging.jinja
- template: jinja
- user: {{ salt['pillar.get']('bind:config:user', map.user) }}
- group: {{ salt['pillar.get']('bind:config:group', map.group) }}
- mode: {{ salt['pillar.get']('bind:config:mode', '644') }}
- context:
map: {{ map }}
- require:
- pkg: bind
- watch_in:
- service: bind
{%- endif %}
{%- if salt['pillar.get']('bind:rndc_client', False) %} {%- if salt['pillar.get']('bind:rndc_client', False) %}
bind_rndc_client_config: bind_rndc_client_config:
file.managed: file.managed:

View file

@ -82,6 +82,7 @@
'zones_source_dir': 'zones', 'zones_source_dir': 'zones',
'config': '/usr/local/etc/namedb/named.conf', 'config': '/usr/local/etc/namedb/named.conf',
'local_config': '/usr/local/etc/namedb/named.conf.local', 'local_config': '/usr/local/etc/namedb/named.conf.local',
'logging_config': '/usr/local/etc/namedb/named.conf.logging',
'named_directory': '/usr/local/etc/namedb/working', 'named_directory': '/usr/local/etc/namedb/working',
'chroot_dir': '', 'chroot_dir': '',
'log_dir': '/var/log/named', 'log_dir': '/var/log/named',