Handle log file in chroot

This commit is contained in:
Vladimir Nadvornik 2018-06-04 16:42:25 +02:00
parent 401188e2cf
commit 2b99362435
2 changed files with 12 additions and 7 deletions

View file

@ -3,7 +3,7 @@
include:
- bind
{{ map.log_dir }}:
{{ map.chroot_dir }}{{ map.log_dir }}:
file.directory:
- user: root
- group: {{ salt['pillar.get']('bind:config:group', map.group) }}
@ -16,16 +16,16 @@ bind_restart:
- name: {{ map.service }}
- reload: False
- watch:
- file: {{ map.log_dir }}/query.log
- file: {{ map.chroot_dir }}{{ map.log_dir }}/query.log
{{ map.log_dir }}/query.log:
{{ map.chroot_dir }}{{ map.log_dir }}/query.log:
file.managed:
- replace: False
- user: {{ salt['pillar.get']('bind:config:user', map.user) }}
- group: {{ salt['pillar.get']('bind:config:group', map.group) }}
- mode: {{ salt['pillar.get']('bind:config:log_mode', map.log_mode) }}
- require:
- file: {{ map.log_dir }}
- file: {{ map.chroot_dir }}{{ map.log_dir }}
named_directory:
file.directory:
@ -68,7 +68,7 @@ bind_local_config:
map: {{ map }}
- require:
- pkg: bind
- file: {{ map.log_dir }}/query.log
- file: {{ map.chroot_dir }}{{ map.log_dir }}/query.log
- watch_in:
- service: bind

View file

@ -13,6 +13,7 @@
'logging_config': '/etc/bind/named.conf.logging',
'rndc_client_config': '/etc/bind/rndc.conf',
'named_directory': '/var/cache/bind/zones',
'chroot_dir': '',
'log_dir': '/var/log/bind9',
'log_mode': '644',
'user': 'bind',
@ -31,6 +32,7 @@
'local_config': '/etc/named.conf.local',
'default_config': '/etc/sysconfig/named',
'named_directory': '/var/named',
'chroot_dir': '',
'log_dir': '/var/log/named',
'log_mode': '640',
'user': 'named',
@ -53,6 +55,7 @@
'config': '/etc/named.conf',
'local_config': '/etc/named.conf.local',
'named_directory': '/var/named',
'chroot_dir': '',
'log_dir': '/var/log/named',
'log_mode': '640',
'user': 'root',
@ -67,6 +70,7 @@
'config': '/usr/local/etc/namedb/named.conf',
'local_config': '/usr/local/etc/namedb/named.conf.local',
'named_directory': '/usr/local/etc/namedb/working',
'chroot_dir': '',
'log_dir': '/var/log/named',
'log_mode': '660',
'user': 'root',
@ -82,8 +86,9 @@
'local_config': '/etc/named.d/named.conf.local',
'default_config': '/etc/sysconfig/named',
'named_directory': '/var/lib/named',
'log_dir': '/var/log/named',
'log_mode': '640',
'chroot_dir': '/var/lib/named',
'log_dir': '/var/log',
'log_mode': '660',
'user': 'root',
'group': 'named',
'mode': '640',