Fix apache conf

[jeremymv2]

apache_conf.conf_dir was resolving incorrectly when OS was NOT Ubuntu || Debian.

It would end up resulting in find_file() exit 1 errors like below:

[vagrant@default-centos-67 ~]$ /opt/chef/embedded/bin/inspec shell
Welcome to the interactive InSpec Shell
To find out how to use it, type: help

inspec> apache_conf
find_files(): exit 1 from `find /etc/httpd/conf/conf.d/*.conf -maxdepth 1 -type f`
=> Apache Config /etc/httpd/conf/httpd.conf
inspec>

It should be using a conf_dir of /etc/httpd so that find_files will search /etc/httpd/conf.d/*.conf instead of /etc/httpd/conf/conf.d/*.conf.

This PR corrects the problem and resolves #1013

[jeremymv2]

@davidcpell this should fix your issue

[chris-rock]

@jeremymv2 I am thinking about moving that logic to inspec.apache. So we would use File.dirname(@conf_path) only if conf_path is defined. Otherwise we always read the conf_dir from the apache resource. What do you think?

[chris-rock]

This is a great improvement of our test coverage @jeremymv2

[chris-rock]

Thanks a lot @jeremymv2 💯