aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/desktop.pp10
-rw-r--r--manifests/init.pp1
-rw-r--r--manifests/laptop.pp10
-rw-r--r--manifests/personal.pp12
-rw-r--r--manifests/subsystems/utils.pp8
5 files changed, 21 insertions, 20 deletions
diff --git a/manifests/desktop.pp b/manifests/desktop.pp
index 39ce4f0..25fc874 100644
--- 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 518d86a..1f72ac1 100644
--- 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 d51a643..1591aa7 100644
--- 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
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 cedfa32..7658eda 100644
--- 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 {
+}