author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Mon, 11 Nov 2013 13:23:43 -0800 | |
changeset 1547 | 14b811e3f0f5 |
parent 1474 | 97927b6c1ece |
child 1655 | 2490bf4f53ea |
permissions | -rw-r--r-- |
1409
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
1 |
Add auditing support to agent execution |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
|
1474
97927b6c1ece
17318366 Update Puppet to 3.2.4
Virginia Wray <virginia.wray@oracle.com>
parents:
1409
diff
changeset
|
3 |
--- puppet-3.2.4/lib/puppet/agent.rb.orig 2013-03-08 16:03:45.000000000 -0700 |
97927b6c1ece
17318366 Update Puppet to 3.2.4
Virginia Wray <virginia.wray@oracle.com>
parents:
1409
diff
changeset
|
4 |
+++ puppet-3.2.4/lib/puppet/agent.rb 2013-03-08 16:03:45.000000000 -0700 |
1409
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
5 |
@@ -1,5 +1,8 @@ |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
6 |
require 'sync' |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
7 |
require 'puppet/application' |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
8 |
+if Facter.value(:osfamily) == "Solaris" |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
9 |
+ require 'PuppetAudit' |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
10 |
+end |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
|
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
12 |
# A general class for triggering a run of another |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
13 |
# class. |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
@@ -35,6 +38,11 @@ |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
15 |
return |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
end |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
|
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
18 |
+ if Facter.value(:osfamily) == "Solaris" |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
19 |
+ audit_handle = PuppetAudit.new |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
20 |
+ audit_handle.audit_start |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
21 |
+ end |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
22 |
+ |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
23 |
result = nil |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
24 |
block_run = Puppet::Application.controlled_run do |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
25 |
splay |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
26 |
@@ -50,6 +58,10 @@ |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
27 |
end |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
28 |
end |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
29 |
end |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
30 |
+ if Facter.value(:osfamily) == "Solaris" |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
31 |
+ audit_handle.audit_stop |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
32 |
+ audit_handle.audit_teardown |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
33 |
+ end |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
34 |
true |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
35 |
end |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
36 |
Puppet.notice "Shutdown/restart in progress (#{Puppet::Application.run_status.inspect}); skipping run" unless block_run |