Lots of subsystem refactoring; minor node changes

1 files changed, 11 insertions, 4 deletions

diff --git a/manifests/personal.pp b/manifests/personal.pp
index 9b7272a..dc89d15 100644
--- a/manifests/personal.pp
+++ b/manifests/personal.pp
@@ -3,7 +3,8 @@ class nodo::personal {
   include nodo::physical
   include utils::personal
   include pam
-  include xorg
+
+  class { 'xorg': }
 
   if $lsbdistcodename == 'squeeze' {
     include gdm
@@ -27,9 +28,15 @@ class nodo::personal {
     mode   => 0755,
   }
 
-  # Old torrent cache
-  file { "/var/cache/torrents":
-    ensure => absent,
+  # Hostname cache for general use
+  file { "/var/cache/${hostname}":
+    ensure => directory,
     mode   => 0755,
   }
+
+  # Link to the media cache, useful to have unique remotes
+  # for git-annex in removable media
+  file { "/var/cache/${hostname}/media":
+    ensure => "/var/cache/media",
+  }
 }