aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-03-13 16:45:36 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-03-13 16:45:36 -0300
commit23aac8343b41559ab229fa20cbf9ef691c1a8a07 (patch)
tree119cd5af0f0169fd07e29d2429327aee00e5f77b
parent1177a1b036fc12efc37bba0bc7830d491d428e2a (diff)
downloadpuppet-nodo-23aac8343b41559ab229fa20cbf9ef691c1a8a07.tar.gz
puppet-nodo-23aac8343b41559ab229fa20cbf9ef691c1a8a07.tar.bz2
Adding utils::desktop and renaming utils:server to utils::physical
-rw-r--r--manifests/init.pp4
-rw-r--r--manifests/utils.pp14
2 files changed, 15 insertions, 3 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index ccf94d4..152fcd1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -118,7 +118,7 @@ class nodo::physical inherits nodo {
include firewire
include sysctl
include ups
- include utils::server
+ include utils::physical
include smartmontools
# Time configuration
@@ -171,6 +171,8 @@ class nodo::server inherits nodo::physical {
}
class nodo::desktop inherits nodo::physical {
+ include utils::desktop
+
# fstab
file { "/etc/fstab":
source => "puppet://$desktop/modules/nodo/etc/fstab/desktop",
diff --git a/manifests/utils.pp b/manifests/utils.pp
index ad463f8..1151d8d 100644
--- a/manifests/utils.pp
+++ b/manifests/utils.pp
@@ -5,8 +5,8 @@ class utils {
}
}
-# Common utilities for servers
-class utils::server {
+# Common utilities for physical
+class utils::physical {
package { 'nload':
ensure => installed,
}
@@ -25,3 +25,13 @@ class utils::web {
ensure => installed,
}
}
+
+# Common utilities for desktops
+class utils::desktop {
+ package { [ 'awesome', 'alsa-tools-gui', 'mutt',
+ 'irssi', 'offlineimap', 'wyrd',
+ 'mp3blaster', 'iceweasel', 'eterm',
+ 'libpam-mount' ]:
+ ensure => installed,
+ }
+}