| author | Kristina Tripp <Kristina.Tripp@oracle.com> |
| Fri, 07 Nov 2014 12:43:50 -0800 | |
| branch | s11u2-sru |
| changeset 3460 | 5c5af6e58474 |
| parent 2928 | components/puppet/patches/puppet-05-apply-auditing.patch@43b3da52b84a |
| permissions | -rw-r--r-- |
|
2771
8e4227dc2fc4
16453463 Update Puppet's offerings on Solaris
Virginia Wray <virginia.wray@oracle.com>
parents:
diff
changeset
|
1 |
Add auditing hooks for puppet apply |
|
3460
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
2 |
|
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
3 |
--- puppet-3.6.2/lib/puppet/application/apply.rb.orig 2014-06-09 15:08:19.000000000 -0600 |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
4 |
+++ puppet-3.6.2/lib/puppet/application/apply.rb 2014-06-25 14:57:54.627534169 -0600 |
|
2771
8e4227dc2fc4
16453463 Update Puppet's offerings on Solaris
Virginia Wray <virginia.wray@oracle.com>
parents:
diff
changeset
|
5 |
@@ -1,5 +1,8 @@ |
|
8e4227dc2fc4
16453463 Update Puppet's offerings on Solaris
Virginia Wray <virginia.wray@oracle.com>
parents:
diff
changeset
|
6 |
require 'puppet/application' |
|
8e4227dc2fc4
16453463 Update Puppet's offerings on Solaris
Virginia Wray <virginia.wray@oracle.com>
parents:
diff
changeset
|
7 |
require 'puppet/configurer' |
|
8e4227dc2fc4
16453463 Update Puppet's offerings on Solaris
Virginia Wray <virginia.wray@oracle.com>
parents:
diff
changeset
|
8 |
+if Facter.value(:osfamily) == "Solaris" |
|
8e4227dc2fc4
16453463 Update Puppet's offerings on Solaris
Virginia Wray <virginia.wray@oracle.com>
parents:
diff
changeset
|
9 |
+ require 'PuppetAudit' |
|
8e4227dc2fc4
16453463 Update Puppet's offerings on Solaris
Virginia Wray <virginia.wray@oracle.com>
parents:
diff
changeset
|
10 |
+end |
|
8e4227dc2fc4
16453463 Update Puppet's offerings on Solaris
Virginia Wray <virginia.wray@oracle.com>
parents:
diff
changeset
|
11 |
|
|
8e4227dc2fc4
16453463 Update Puppet's offerings on Solaris
Virginia Wray <virginia.wray@oracle.com>
parents:
diff
changeset
|
12 |
class Puppet::Application::Apply < Puppet::Application |
|
8e4227dc2fc4
16453463 Update Puppet's offerings on Solaris
Virginia Wray <virginia.wray@oracle.com>
parents:
diff
changeset
|
13 |
|
|
3460
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
14 |
@@ -209,6 +212,12 @@ |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
15 |
end |
|
2771
8e4227dc2fc4
16453463 Update Puppet's offerings on Solaris
Virginia Wray <virginia.wray@oracle.com>
parents:
diff
changeset
|
16 |
|
|
3460
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
17 |
begin |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
18 |
+ # configure auditing on Solaris |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
19 |
+ if Facter.value(:osfamily) == "Solaris" |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
20 |
+ audit_handle = PuppetAudit.new |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
21 |
+ audit_handle.audit_start |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
22 |
+ end |
|
2771
8e4227dc2fc4
16453463 Update Puppet's offerings on Solaris
Virginia Wray <virginia.wray@oracle.com>
parents:
diff
changeset
|
23 |
+ |
|
3460
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
24 |
# Compile our catalog |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
25 |
starttime = Time.now |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
26 |
catalog = Puppet::Resource::Catalog.indirection.find(node.name, :use_node => node) |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
27 |
@@ -237,6 +246,12 @@ |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
28 |
rescue => detail |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
29 |
Puppet.log_exception(detail) |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
30 |
exit(1) |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
31 |
+ ensure |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
32 |
+ # clean up auditing records on Solaris |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
33 |
+ if Facter.value(:osfamily) == "Solaris" |
|
2771
8e4227dc2fc4
16453463 Update Puppet's offerings on Solaris
Virginia Wray <virginia.wray@oracle.com>
parents:
diff
changeset
|
34 |
+ audit_handle.audit_stop |
|
8e4227dc2fc4
16453463 Update Puppet's offerings on Solaris
Virginia Wray <virginia.wray@oracle.com>
parents:
diff
changeset
|
35 |
+ audit_handle.audit_teardown |
|
3460
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
36 |
+ end |
|
5c5af6e58474
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
2928
diff
changeset
|
37 |
end |
|
2771
8e4227dc2fc4
16453463 Update Puppet's offerings on Solaris
Virginia Wray <virginia.wray@oracle.com>
parents:
diff
changeset
|
38 |
end |
|
8e4227dc2fc4
16453463 Update Puppet's offerings on Solaris
Virginia Wray <virginia.wray@oracle.com>
parents:
diff
changeset
|
39 |
end |