Adding media::groups class

diff --git a/manifests/nas.pp b/manifests/nas.pp
index 56e5944c6ef42b8d79ea7fd58aadceb91a9bdda8..84352abd072726ebe9d851c1f58d35fecc7c9652 100644 (file)
--- a/manifests/nas.pp
+++ b/manifests/nas.pp
@@ -221,8 +221,8 @@ class nodo::nas {
   # Media folders
   #
 
-  # Main class
-  class { 'media::folders': }
+  # Main classes
+  class { [ 'media::folders', 'media::groups' ]: }
   
   # Make sure basic media exist, no matter if there is an external disk attached
   $cache = hiera('nodo::media::folders', '')

diff --git a/manifests/personal.pp b/manifests/personal.pp
index f6477781c295ba2ac092ad494e159aaab9e995c4..3718cb5d4c9090b72c76c9d9bae70612cf06c703 100644 (file)
--- a/manifests/personal.pp
+++ b/manifests/personal.pp
@@ -20,8 +20,8 @@ class nodo::personal {
     use_nagios => hiera('nodo::personal::use_nagios', false),
   }
 
-  # Media folders
-  class { 'media::folders': }
+  # Media folders and groups
+  class { [ 'media::folders', 'media::groups' ]: }
 
   # Mountpoint for encrypted home folders
   file { [ '/mnt/crypt/', '/mnt/crypt/home' ]:

diff --git a/manifests/subsystems/media.pp b/manifests/subsystems/media.pp
index 0e808c90dfa96334f2eb30ef9e4c772af575fa09..cbe89b91830ed9eb7c3f8438d685074daf5a8372 100644 (file)
--- a/manifests/subsystems/media.pp
+++ b/manifests/subsystems/media.pp
@@ -30,3 +30,9 @@ class media::folders(
     ensure => "/var/cache/media",
   }
 }
+
+class media::groups {
+  group { 'incoming':
+    ensure => 'present',
+  }
+}