10 files changed, 50 insertions, 24 deletions
diff --git a/manifests/utils/multimedia/cdplayer.pp b/manifests/utils/multimedia/cdplayer.pp
index 05e88ad..e2c7a71 100644
--- a/manifests/utils/multimedia/cdplayer.pp
+++ b/manifests/utils/multimedia/cdplayer.pp
@@ -1,10 +1,12 @@
-class nodo::utils::multimedia::cdplayer {
+class nodo::utils::multimedia::cdplayer (
+  $ensure = 'installed',
+) {
   # CD writers and extractors
   package { [
     'mcdp',
     'cdtool',
     'cd-discid',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }
diff --git a/manifests/utils/multimedia/downloaders.pp b/manifests/utils/multimedia/downloaders.pp
index 40d610f..49aa51f 100644
--- a/manifests/utils/multimedia/downloaders.pp
+++ b/manifests/utils/multimedia/downloaders.pp
@@ -1,11 +1,13 @@
-class nodo::utils::multimedia::downloaders {
+class nodo::utils::multimedia::downloaders (
+  $ensure = 'installed',
+) {
   # Jessie onwards
   package { [
     'youtube-dl',
   ]:
     ensure => $::lsbdistcodename ? {
       'wheezy' => absent,
-      default  => present,
+      default  => $ensure,
     }
   }
 }
diff --git a/manifests/utils/multimedia/extractors.pp b/manifests/utils/multimedia/extractors.pp
index a3fde3c..909a547 100644
--- a/manifests/utils/multimedia/extractors.pp
+++ b/manifests/utils/multimedia/extractors.pp
@@ -1,9 +1,11 @@
-class nodo::utils::multimedia::extractors {
+class nodo::utils::multimedia::extractors (
+  $ensure = 'installed',
+) {
   package { [
     'rar',
     'unrar',
     'zip',
   ]:
-    ensure => present,
+    ensure => $ensure,
   }
 }
diff --git a/manifests/utils/multimedia/gnash.pp b/manifests/utils/multimedia/gnash.pp
index 5283534..f6cee10 100644
--- a/manifests/utils/multimedia/gnash.pp
+++ b/manifests/utils/multimedia/gnash.pp
@@ -1,4 +1,6 @@
-class nodo::utils::multimedia::gnash {
+class nodo::utils::multimedia::gnash (
+  $ensure = 'installed',
+) {
   package { [
     'flashplugin-nonfree',
   ]:
@@ -8,14 +10,17 @@ class nodo::utils::multimedia::gnash {
   package { [
     'browser-plugin-gnash',
   ]:
-    ensure => present,
+    ensure => $ensure,
   }
 
   # Flash alternative
   file { "/etc/alternatives/flash-mozilla.so":
     owner   => root,
     group   => root,
-    ensure  => "/usr/lib/gnash/libgnashplugin.so",
+    ensure  => $ensure ? {
+      'installed','present' => "/usr/lib/gnash/libgnashplugin.so",
+      default               => undef,
+    },
     require => Package['browser-plugin-gnash'],
   }
 }
diff --git a/manifests/utils/multimedia/mediacenter.pp b/manifests/utils/multimedia/mediacenter.pp
index d3388b2..ad996c8 100644
--- a/manifests/utils/multimedia/mediacenter.pp
+++ b/manifests/utils/multimedia/mediacenter.pp
@@ -1,10 +1,12 @@
-class nodo::utils::multimedia::mediacenter {
+class nodo::utils::multimedia::mediacenter (
+  $ensure = 'installed',
+) {
   package { [
     'xbmc',
     'upnp-inspector',
     'gupnp-tools',
     'djmount',
   ]:
-    ensure => present,
+    ensure => $ensure,
   }
 }
diff --git a/manifests/utils/multimedia/minimal.pp b/manifests/utils/multimedia/minimal.pp
index 3459daa..fe220f4 100644
--- a/manifests/utils/multimedia/minimal.pp
+++ b/manifests/utils/multimedia/minimal.pp
@@ -1,10 +1,12 @@
-class nodo::utils::multimedia::minimal {
+class nodo::utils::multimedia::minimal (
+  $ensure = 'installed',
+) {
   package { [
     'alsa-utils',
     'mpg123',
     'mediainfo',
     'mplayer2',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }
diff --git a/manifests/utils/multimedia/ripper.pp b/manifests/utils/multimedia/ripper.pp
index c97908d..51b431b 100644
--- a/manifests/utils/multimedia/ripper.pp
+++ b/manifests/utils/multimedia/ripper.pp
@@ -1,4 +1,6 @@
-class nodo::utils::multimedia::ripper {
+class nodo::utils::multimedia::ripper(
+  $ensure = 'installed',
+) {
   # CD writers and extractors
   package { [
     'ripit',
@@ -11,6 +13,6 @@ class nodo::utils::multimedia::ripper {
     'eject',
     'cdrdao',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }
diff --git a/manifests/utils/multimedia/scanner.pp b/manifests/utils/multimedia/scanner.pp
index abe8b64..f8c4eca 100644
--- a/manifests/utils/multimedia/scanner.pp
+++ b/manifests/utils/multimedia/scanner.pp
@@ -1,7 +1,9 @@
-class nodo::utils::multimedia::scanner {
+class nodo::utils::multimedia::scanner (
+  $ensure = 'installed',
+) {
   package { [
     'xsane',
   ]:
-    ensure => present,
+    ensure => $ensure,
   }
 }
diff --git a/manifests/utils/multimedia/shockwave.pp b/manifests/utils/multimedia/shockwave.pp
index cf3a712..6ff22ed 100644
--- a/manifests/utils/multimedia/shockwave.pp
+++ b/manifests/utils/multimedia/shockwave.pp
@@ -1,16 +1,21 @@
-class nodo::utils::multimedia::shockwave {
+class nodo::utils::multimedia::shockwave (
+  $ensure = 'installed',
+) {
   # See also https://github.com/i-rinat/freshplayerplugin
   package { [
     'flashplugin-nonfree',
   ]:
-    ensure => installed ,
+    ensure => $ensure,
   }
 
   # Flash alternative
   file { "/etc/alternatives/flash-mozilla.so":
     owner   => root,
     group   => root,
-    ensure  => "/usr/lib/flashplugin-nonfree/libflashplayer.so",
+    ensure  => $ensure ? {
+      'present','installed' => "/usr/lib/flashplugin-nonfree/libflashplayer.so",
+      default               => undef,
+    },
     require => Package['flashplugin-nonfree'],
   }
 }
diff --git a/manifests/utils/multimedia/studio.pp b/manifests/utils/multimedia/studio.pp
index 742cf9c..72b42b1 100644
--- a/manifests/utils/multimedia/studio.pp
+++ b/manifests/utils/multimedia/studio.pp
@@ -1,10 +1,12 @@
-class nodo::utils::multimedia::studio {
+class nodo::utils::multimedia::studio (
+  $ensure = 'installed',
+) {
   package { [
     'ardour',
     'hydrogen',
     'mixxx',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 
   # Instruments
@@ -14,7 +16,7 @@ class nodo::utils::multimedia::studio {
     'rakarrack',
     'tuxguitar-jack',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 
   # LADSPA plugins
@@ -24,6 +26,6 @@ class nodo::utils::multimedia::studio {
     'tap-plugins',
     'invada-studio-plugins-ladspa',
   ]:
-    ensure => installed,
+    ensure => $ensure,
   }
 }