summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests/default.pp
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/modules/site_config/manifests/default.pp
parent373002ee2b7b5373a1ab2f3a1f289bd722ec0d91 (diff)
parent0d6694a0ee00be0f35b18025d86883cf3d4e4a7d (diff)
Merge branch 'bug/1983' into leap
Diffstat (limited to 'puppet/modules/site_config/manifests/default.pp')
-rw-r--r--puppet/modules/site_config/manifests/default.pp5
1 files changed, 2 insertions, 3 deletions
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