Skip to content

Commit 1da26c7

Browse files
Move Redhat family logging location to satisfy selinux requirements
1 parent 3a1e990 commit 1da26c7

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

bind/map.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
'default_config': '/etc/sysconfig/named',
3939
'named_directory': '/var/named',
4040
'chroot_dir': '',
41-
'log_dir': '/var/log/named',
41+
'log_dir': '/var/named/data',
4242
'log_mode': '640',
4343
'user': 'named',
4444
'group': 'named',

test/integration/default/config_spec.rb

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,17 @@
2424
named_directory = '/var/named'
2525
zones_directory = named_directory
2626
keys_directory = '/etc/named.keys'
27-
log_directory = '/var/log/named'
2827
keys_mode = '0755'
2928
conf_mode = '0640'
3029
config = '/etc/named.conf'
31-
when 'ubuntu'
30+
end
31+
32+
# Override log directory by OS
33+
case os[:name]
34+
when 'arch', 'ubuntu'
3235
log_directory = '/var/log/named'
36+
when 'redhat', 'centos', 'fedora'
37+
log_directory = '/var/named/data'
3338
end
3439

3540
# Check main config dir

test/integration/default/zones_spec.rb

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,17 @@
2424
named_directory = '/var/named'
2525
zones_directory = named_directory
2626
keys_directory = '/etc/named.keys'
27-
log_directory = '/var/log/named'
2827
keys_mode = '0755'
2928
conf_mode = '0640'
3029
config = '/etc/named.conf'
31-
when 'ubuntu'
30+
end
31+
32+
# Override log directory by OS
33+
case os[:name]
34+
when 'arch', 'ubuntu'
3235
log_directory = '/var/log/named'
36+
when 'redhat', 'centos', 'fedora'
37+
log_directory = '/var/named/data'
3338
end
3439

3540
# Test example.com zonefile
@@ -153,4 +158,3 @@
153158
its('content') { should match '7.100.51.198.in-addr.arpa. PTR mx1.example.net.' }
154159
end
155160
end
156-

0 commit comments

Comments
 (0)