Skip to content

Commit

Permalink
Remove incorrect logic -- Should always be /etc/auditd.conf
Browse files Browse the repository at this point in the history
Signed-off-by: Brian Dwyer <brian.dwyer@broadridge.com>
  • Loading branch information
bdwyertech committed Nov 28, 2018
1 parent e62190c commit 84c30ce
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
9 changes: 0 additions & 9 deletions libraries/auditd_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,5 @@ def auditd_rulefile(ruleset = 'audit.rules')
'/etc/audit/audit.rules'
end
end

def auditd_conffile(conf_file = 'audit.conf')
if platform_family?('rhel') && node['platform_version'].to_i >= 6
::File.join('/etc/audit/', conf_file)
else
'/etc/audit/auditd.conf'
end
end

end
end
4 changes: 1 addition & 3 deletions resources/conf_file.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
property :cookbook, String

action :create do
extend AuditD::Helper

template auditd_conffile(new_resource.name) do
template '/etc/audit/auditd.conf' do
source "#{new_resource.name}.conf.erb"
cookbook new_resource.cookbook if new_resource.cookbook
notifies :reload, 'service[auditd]'
Expand Down

0 comments on commit 84c30ce

Please sign in to comment.