Make /var/cache/media link to /var/cache/$hostname and not the other way

diff --git a/manifests/subsystem/media/folders.pp b/manifests/subsystem/media/folders.pp
index 243c2451f3a9f94ef1d5bd710f20f391ca73ac5d..4495bae98f6973c23f00be70bbc8e757130903dd 100644 (file)
--- a/manifests/subsystem/media/folders.pp
+++ b/manifests/subsystem/media/folders.pp
@@ -4,14 +4,20 @@ class nodo::subsystem::media::folders(
   $owner = hiera('nodo::subsystem::media::folders::owner', false),
   $group = hiera('nodo::subsystem::media::folders::group', false)
 ) {
-  # Removable media folder
+  # Removable media folders
   file { [ "/media/usb", "/media/cdrom", "/media/tablet", "/media/phone" ]:
     ensure => directory,
     mode   => 0755,
   }
 
-  # Media cache
-  file { "$base":
+  # Local cache for general use
+  file { "/var/cache/${::hostname}":
+    ensure => directory,
+    mode   => 0755,
+  }
+
+  # Local media cache
+  file { "/var/cache/${::hostname}/media":
     ensure => $cache,
     mode   => 0755,
     owner  => $owner ? {
@@ -24,6 +30,12 @@ class nodo::subsystem::media::folders(
     },
   }
 
+  # Link to the media cache, useful to have unique remotes
+  # for git-annex in removable media
+  file { "$base":
+    ensure => "/var/cache/${::hostname}/media",
+  }
+
   # Code and load folders
   file { [ "${base}/code", "${base}/load" ]:
     ensure => directory,
@@ -43,16 +55,4 @@ class nodo::subsystem::media::folders(
   file { "/var/data":
     ensure => "$base",
   }
-
-  # 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 => "$base",
-  }
 }