Merge pull request #108 from wanless-systems/master

Redhat/CentOS is broken by SELinux

Author: javierbertoli

bind/map.jinja

@@ -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',

test/integration/default/config_spec.rb

@@ -24,12 +24,17 @@
   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

test/integration/default/zones_spec.rb

@@ -24,12 +24,17 @@
   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 @@
     its('content') { should match '7.100.51.198.in-addr.arpa. PTR mx1.example.net.' }
   end
 end
-