Adding utils::desktop and renaming utils:server to utils::physical

diff --git a/manifests/init.pp b/manifests/init.pp
index ccf94d44bafc3a7f576d5de7503a2e94998ab7c9..152fcd162492962e39cd770c2e4e907ebae52d23 100644 (file)
--- 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 ad463f8b3ccdedbb24c5a07d63a94ca8d4687e93..1151d8d365f8b8811e6beea0a4a6688a5fc7480c 100644 (file)
--- 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,
+  }
+}