From 845b084bc6c4ac74d74fea68d844b095b570df1e Mon Sep 17 00:00:00 2001
From: Adam Henry Lewenberg <adamhl@stanford.edu>
Date: Fri, 15 May 2015 13:49:03 -0700
Subject: [PATCH] parameter so vmguest class can choose to not install tripwire
---
NEWS | 5 +++++
manifests/puppetclient.pp | 4 ++--
manifests/vmguest.pp | 16 +++++++++++++---
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/NEWS b/NEWS
index 6731e10..92a0c65 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+UNRELEASED
+
+ [vmguest] Add a parameter to allow the non-installation of the
+ tripwire client. (adamhl)
+
release/004.043 (2015-05-15)
[dns] Remove the legacy "C" DNS servers from resolv.conf. Networking is
diff --git a/manifests/puppetclient.pp b/manifests/puppetclient.pp
index 2c4112c..2c9e20d 100644
--- a/manifests/puppetclient.pp
+++ b/manifests/puppetclient.pp
@@ -46,8 +46,8 @@ class base::puppetclient {
}
# Install an auth.conf as additional protection against a Puppet
- # vulnerability that could unauthenticated Puppet nodes to manipulate
- # its configuration.
+ # vulnerability that could allow unauthenticated Puppet nodes to
+ # manipulate its configuration.
file { '/etc/puppet/auth.conf':
content => template('base/puppetclient/auth.conf.erb'),
}
diff --git a/manifests/vmguest.pp b/manifests/vmguest.pp
index 05de8ca..744ee89 100644
--- a/manifests/vmguest.pp
+++ b/manifests/vmguest.pp
@@ -1,8 +1,17 @@
# Configuration used on VMware guests.
-class base::vmguest {
- include base::vmguest::syslog,
- base::vmguest::tripwire
+# $use_tripwire: if set to true will include the tripwire client
+# class.
+# Default: true
+
+class base::vmguest(
+ $use_tripwire = true
+) {
+ include base::vmguest::syslog
+
+ if ($use_tripwire) {
+ include base::vmguest::tripwire
+ }
# Install filter-syslog rules to ignore vmware-tools noise.
file { '/etc/filter-syslog/vmguest':
@@ -17,6 +26,7 @@ class base::vmguest {
'precise' => 'open-vm-dkms',
'raring' => 'open-vm-dkms',
'wheezy' => 'open-vm-dkms',
+ 'jessie' => 'open-vm-tools-dkms',
default => 'open-vm-tools-dkms',
}
package {
--
GitLab