Introducing 'nodo::subsystem::media::folders::base'

diff --git a/manifests/nas/share.pp b/manifests/nas/share.pp
index 6a0d6d3acc8f1db31a65c82bf4e9af35e3e0358b..447228675191b617c549100c7a71e0b89f4c89c4 100644 (file)
--- a/manifests/nas/share.pp
+++ b/manifests/nas/share.pp
@@ -79,7 +79,7 @@ define nodo::nas::share(
   }
 
   # Make sure basic media exist, no matter which disk is attached
-  $cache = hiera('nodo::subsystem::media::folders::cache', '')
+  $cache = hiera('nodo::subsystem::media::folders::base', '/var/cache/media')
 
   if $cache != '' {
     file { [ "${cache}/${name}" ]:

diff --git a/manifests/subsystem/media/folders.pp b/manifests/subsystem/media/folders.pp
index 3f812e7e7a450a10bddc7b4fe6b9a1ea46522d8a..11d2f26764f62db7f4ad47e7c1adf42e748e7e2e 100644 (file)
--- a/manifests/subsystem/media/folders.pp
+++ b/manifests/subsystem/media/folders.pp
@@ -1,4 +1,5 @@
 class nodo::subsystem::media::folders(
+  $base  = hiera('nodo::subsystem::media::folders::base',  '/var/cache/media'),
   $cache = hiera('nodo::subsystem::media::folders::cache', directory),
   $owner = hiera('nodo::subsystem::media::folders::owner', false),
   $group = hiera('nodo::subsystem::media::folders::group', false)
@@ -10,7 +11,7 @@ class nodo::subsystem::media::folders(
   }
 
   # Media cache
-  file { "/var/cache/media":
+  file { "$base":
     ensure => $cache,
     mode   => 0755,
     owner  => $owner ? {
@@ -25,7 +26,7 @@ class nodo::subsystem::media::folders(
 
   # Data folder is a cache
   file { "/var/data":
-    ensure => "/var/cache/media",
+    ensure => "$base",
   }
 
   # Hostname cache for general use
@@ -37,6 +38,6 @@ class nodo::subsystem::media::folders(
   # 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",
+    ensure => "$base",
   }
 }