Merge pull request #108 from wanless-systems/master

Redhat/CentOS is broken by SELinux
This commit is contained in:
Javier Bértoli 2018-08-30 09:47:23 -03:00 committed by GitHub
commit a7041da355
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 6 deletions

View file

@ -38,7 +38,7 @@
'default_config': '/etc/sysconfig/named',
'named_directory': '/var/named',
'chroot_dir': '',
'log_dir': '/var/log/named',
'log_dir': '/var/named/data',
'log_mode': '640',
'user': 'named',
'group': 'named',

View file

@ -24,12 +24,17 @@ when 'arch','redhat', 'centos', 'fedora'
named_directory = '/var/named'
zones_directory = named_directory
keys_directory = '/etc/named.keys'
log_directory = '/var/log/named'
keys_mode = '0755'
conf_mode = '0640'
config = '/etc/named.conf'
when 'ubuntu'
end
# Override log directory by OS
case os[:name]
when 'arch', 'ubuntu'
log_directory = '/var/log/named'
when 'redhat', 'centos', 'fedora'
log_directory = '/var/named/data'
end
# Check main config dir

View file

@ -24,12 +24,17 @@ when 'arch','redhat', 'centos', 'fedora'
named_directory = '/var/named'
zones_directory = named_directory
keys_directory = '/etc/named.keys'
log_directory = '/var/log/named'
keys_mode = '0755'
conf_mode = '0640'
config = '/etc/named.conf'
when 'ubuntu'
end
# Override log directory by OS
case os[:name]
when 'arch', 'ubuntu'
log_directory = '/var/log/named'
when 'redhat', 'centos', 'fedora'
log_directory = '/var/named/data'
end
# Test example.com zonefile
@ -153,4 +158,3 @@ control 'File ' + zones_directory + '/100.51.198.in-addr.arpa.include' do
its('content') { should match '7.100.51.198.in-addr.arpa. PTR mx1.example.net.' }
end
end