aboutsummaryrefslogtreecommitdiff
path: root/manifests/utils/bundle
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-09-23 20:21:41 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-09-23 20:21:41 -0300
commit0427a314c3b8bef2a46dac43f7bea41eb33612fd (patch)
tree8caf5c5d1181f50a89413598f99c3351ad12cb94 /manifests/utils/bundle
parentdb03a0e084e5f15fe67a7de1d4fbec0d9a404536 (diff)
downloadpuppet-nodo-0427a314c3b8bef2a46dac43f7bea41eb33612fd.tar.gz
puppet-nodo-0427a314c3b8bef2a46dac43f7bea41eb33612fd.tar.bz2
Utils: more cleanup and organization
Diffstat (limited to 'manifests/utils/bundle')
-rw-r--r--manifests/utils/bundle/poweruser.pp4
-rw-r--r--manifests/utils/bundle/standard.pp3
2 files changed, 5 insertions, 2 deletions
diff --git a/manifests/utils/bundle/poweruser.pp b/manifests/utils/bundle/poweruser.pp
index b4a20b2..51021c2 100644
--- a/manifests/utils/bundle/poweruser.pp
+++ b/manifests/utils/bundle/poweruser.pp
@@ -1,6 +1,7 @@
# Bundle for power users
class nodo::utils::bundle::poweruser {
- include nodo::utils::office
+ include nodo::utils::office::console
+ include nodo::utils::office::gui
include nodo::utils::interface
include nodo::utils::development
include nodo::utils::security
@@ -9,4 +10,5 @@ class nodo::utils::bundle::poweruser {
include nodo::utils::multimedia
include nodo::utils::monkeysphere
include nodo::utils::network::mail
+ include nodo::utils::web::console
}
diff --git a/manifests/utils/bundle/standard.pp b/manifests/utils/bundle/standard.pp
index b63c976..35bb586 100644
--- a/manifests/utils/bundle/standard.pp
+++ b/manifests/utils/bundle/standard.pp
@@ -1,7 +1,8 @@
# Bundle with standard packages
class nodo::utils::bundle::pc {
- include nodo::utils::office
+ include nodo::utils::office::gui
include nodo::utils::printer
include nodo::utils::network
include nodo::utils::network::xmpp
+ include nodo::utils::web::gui
}