Cookstyle cleanups

Signed-off-by: Tim Smith <tsmith@chef.io>
This commit is contained in:
Tim Smith 2016-09-08 10:13:47 -07:00
parent 2a76f18fba
commit 861b7a2a5d

View File

@ -3,22 +3,15 @@ require 'serverspec'
set :backend, :exec
set :path, '/sbin:/usr/local/sbin:$PATH'
def get_family
def family
fam = 'solaris2'
return fam unless File.exist? '/etc/release'
File.open('/etc/release') do |file|
while line = file.gets
case line
when /^\s*(OmniOS)/
fam = 'omnios'
end
end
end
fam = 'omnios' if File.open('/etc/release').read =~ /^\s*(OmniOS)/
fam
end
def postfix_conf_path
if os[:family] == 'solaris' && get_family == 'omnios'
if os[:family] == 'solaris' && family == 'omnios'
'/opt/omni/etc/postfix/'
else
'/etc/postfix'