Adding nodo::personal

diff --git a/manifests/desktop.pp b/manifests/desktop.pp
index 39ce4f0e2dd205309f651aa8b839eba683d40aa8..25fc874f00c75aead7602ddb4dfde79d142464b0 100644 (file)
--- a/manifests/desktop.pp
+++ b/manifests/desktop.pp
@@ -1,7 +1,5 @@
-class nodo::desktop inherits nodo::physical {
+class nodo::desktop inherits nodo::personal {
   include utils::desktop
-  include pam
-  include xorg
 
   # fstab
   file { "/etc/fstab":
@@ -20,10 +18,4 @@ class nodo::desktop inherits nodo::physical {
     mode    => 0644,
     ensure  => present,
   }
-
-  # data
-  file { "/var/data":
-    ensure => directory,
-    mode   => 0755,
-  }
 }

diff --git a/manifests/init.pp b/manifests/init.pp
index 518d86a1260582a96614084fb859bb60534d4713..1f72ac1ff77b9496ab5f453e7a8ea47a8aaf0d75 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -22,6 +22,7 @@ import "subsystems/xorg.pp"
 import "nodo.pp"
 import "physical.pp"
 import "server.pp"
+import "personal.pp"
 import "desktop.pp"
 import "vserver.pp"
 import "web.pp"

diff --git a/manifests/laptop.pp b/manifests/laptop.pp
index d51a643d3eed72d4e1e421c960f65f2124f9731a..1591aa7e4f5bbcb667b44ea96e9fd4127b6fb6e9 100644 (file)
--- a/manifests/laptop.pp
+++ b/manifests/laptop.pp
@@ -1,7 +1,5 @@
-class nodo::laptop inherits nodo::physical {
+class nodo::laptop inherits nodo::personal {
   include utils::laptop
-  include pam
-  include xorg
 
   # fstab
   file { "/etc/fstab":
@@ -20,10 +18,4 @@ class nodo::laptop inherits nodo::physical {
     mode    => 0644,
     ensure  => present,
   }
-
-  # data
-  file { "/var/data":
-    ensure => directory,
-    mode   => 0755,
-  }
 }

diff --git a/manifests/personal.pp b/manifests/personal.pp
new file mode 100644 (file)
index 0000000..9b5bcfc
--- /dev/null
+++ b/manifests/personal.pp
@@ -0,0 +1,12 @@
+# personal computer
+class nodo::personal inherits nodo::physical {
+  include utils::personal
+  include pam
+  include xorg
+
+  # misc user data
+  file { "/var/data":
+    ensure => directory,
+    mode   => 0755,
+  }
+}

diff --git a/manifests/subsystems/utils.pp b/manifests/subsystems/utils.pp
index cedfa32b1887b4883d3aafc473d0e88922fa7e6d..7658eda045e2b9af9d97103274e1735a08e1906a 100644 (file)
--- a/manifests/subsystems/utils.pp
+++ b/manifests/subsystems/utils.pp
@@ -26,8 +26,8 @@ class utils::web {
   }
 }
 
-# Common utilities for desktop
-class utils::desktop {
+# Common utilities for personal
+class utils::personal {
   package { [ 'awesome',           'alsa-tools-gui',          'mutt',
               'irssi',             'offlineimap',             'wyrd',
               'mp3blaster',        'iceweasel',               'eterm',
@@ -82,3 +82,7 @@ class utils::laptop {
     ensure => installed,
   }
 }
+
+# Common utilities for desktop
+class utils::desktop {
+}