summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-07-03 10:11:05 -0400
committerMicah Anderson <micah@riseup.net>2013-07-03 10:11:05 -0400
commitf657473f72d3f6119dddbe9b6c5cc7262adcc4c0 (patch)
tree93b0831cff3f8ca433cf51742deaa7f0a15fac9d /puppet
parent373002ee2b7b5373a1ab2f3a1f289bd722ec0d91 (diff)
parent0d6694a0ee00be0f35b18025d86883cf3d4e4a7d (diff)
Merge branch 'bug/1983' into leap
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_config/manifests/base_packages.pp28
-rw-r--r--puppet/modules/site_config/manifests/default.pp5
2 files changed, 30 insertions, 3 deletions
diff --git a/puppet/modules/site_config/manifests/base_packages.pp b/puppet/modules/site_config/manifests/base_packages.pp
new file mode 100644
index 00000000..3d40f7a2
--- /dev/null
+++ b/puppet/modules/site_config/manifests/base_packages.pp
@@ -0,0 +1,28 @@
+class site_config::base_packages {
+
+ # base set of packages that we want to have installed everywhere
+ package { [ 'etckeeper', 'screen', 'less' ]:
+ ensure => installed,
+ }
+
+ # base set of packages that we want to remove everywhere
+ package { [ 'acpi', 'acpid', 'acpi-support-base', 'eject', 'ftp',
+ 'laptop-detect', 'lpr', 'nfs-common', 'nfs-kernel-server',
+ 'portmap', 'pppconfig', 'pppoe', 'pump', 'qstat', 'rpcbind',
+ 'samba-common', 'samba-common-bin', 'smbclient', 'tcl8.5',
+ 'tk8.5', 'os-prober', 'unzip', 'xauth', 'x11-common',
+ 'x11-utils', 'xterm' ]:
+ ensure => absent;
+ }
+
+ if $::virtual == 'virtualbox' {
+ $virtualbox_ensure = present
+ } else {
+ $virtualbox_ensure = absent
+ }
+
+ package { [ 'build-essential', 'fontconfig-config', 'g++', 'g++-4.7', 'gcc',
+ 'gcc-4.6', 'gcc-4.7', 'cpp', 'cpp-4.6', 'cpp-4.7', 'libc6-dev' ]:
+ ensure => $virtualbox_ensure
+ }
+}
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index 5518ea56..00eee9d0 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -31,9 +31,8 @@ class site_config::default {
stage => setup,
}
- package { [ 'etckeeper' ]:
- ensure => installed,
- }
+ # install/remove base packages
+ include site_config::base_packages
# include basic shorewall config
include site_shorewall::defaults