From 4bcfc76f275a0c69e94d9da4dcbfc427adb4e8aa Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Mon, 26 Oct 2015 11:10:30 +0100 Subject: [PATCH 1/2] simplify auditd name --- lib/resources/auditd_conf.rb | 2 +- lib/resources/auditd_rules.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/resources/auditd_conf.rb b/lib/resources/auditd_conf.rb index 1349c791d..20f5b5e2b 100644 --- a/lib/resources/auditd_conf.rb +++ b/lib/resources/auditd_conf.rb @@ -14,7 +14,7 @@ require 'utils/simpleconfig' # end class AuditDaemonConf < Vulcano.resource(1) - name 'audit_daemon_conf' + name 'auditd_conf' def initialize(path = nil) @conf_path = path || '/etc/audit/auditd.conf' diff --git a/lib/resources/auditd_rules.rb b/lib/resources/auditd_rules.rb index 52cf918b5..20a38d917 100644 --- a/lib/resources/auditd_rules.rb +++ b/lib/resources/auditd_rules.rb @@ -13,7 +13,7 @@ # end class AuditDaemonRules < Vulcano.resource(1) - name 'audit_daemon_rules' + name 'auditd_rules' def initialize @content = vulcano.command('/sbin/auditctl -l').stdout.chomp From 126ce88bce781a050a8dd0cef89345bddc8aac0d Mon Sep 17 00:00:00 2001 From: Christoph Hartmann Date: Mon, 26 Oct 2015 12:16:38 +0100 Subject: [PATCH 2/2] fix unit tests --- test/unit/resources/auditd_conf_test.rb | 2 +- test/unit/resources/auditd_rules_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/resources/auditd_conf_test.rb b/test/unit/resources/auditd_conf_test.rb index 71f03d0b7..bc6440387 100644 --- a/test/unit/resources/auditd_conf_test.rb +++ b/test/unit/resources/auditd_conf_test.rb @@ -7,7 +7,7 @@ require 'vulcano/resource' describe 'Vulcano::Resources::AuditDaemonConf' do it 'check audit daemon config parsing' do - resource = MockLoader.new(:windows).load_resource('audit_daemon_conf') + resource = MockLoader.new(:windows).load_resource('auditd_conf') _(resource.space_left_action).must_equal 'SYSLOG' _(resource.action_mail_acct).must_equal 'root' _(resource.tcp_listen_queue).must_equal '5' diff --git a/test/unit/resources/auditd_rules_test.rb b/test/unit/resources/auditd_rules_test.rb index b8fcfb5aa..44e605b23 100644 --- a/test/unit/resources/auditd_rules_test.rb +++ b/test/unit/resources/auditd_rules_test.rb @@ -7,7 +7,7 @@ require 'vulcano/resource' describe 'Vulcano::Resources::AuditDaemonRules' do it 'check audit policy parsing' do - resource = MockLoader.new(:windows).load_resource('audit_daemon_rules') + resource = MockLoader.new(:windows).load_resource('auditd_rules') _(resource.send('LIST_RULES')).must_equal [ 'exit,always syscall=rmdir,unlink', 'exit,always auid=1001 (0x3e9) syscall=open',