diff options
| -rw-r--r-- | manifests/utils/multimedia.pp | 15 | ||||
| -rw-r--r-- | manifests/utils/multimedia/flash.pp | 5 | ||||
| -rw-r--r-- | manifests/utils/multimedia/shockwave.pp | 13 | 
3 files changed, 16 insertions, 17 deletions
diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp index 7939a2a..e570c54 100644 --- a/manifests/utils/multimedia.pp +++ b/manifests/utils/multimedia.pp @@ -33,16 +33,7 @@ class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {      }    } -  # Flash -  package { 'browser-plugin-gnash': -    ensure => installed, -  } - -  # Flash alternative -  file { "/etc/alternatives/flash-mozilla.so": -    ensure  => "/usr/lib/gnash/libgnashplugin.so", -    owner   => root, -    group   => root, -    require => Package['flashplugin-nonfree'], -  } +  # Flash implementation +  $flash = hiera('nodo::utils::multimedia::flash', 'gnash') +  class { "nodo::utils::multimedia::${flash}": }  } diff --git a/manifests/utils/multimedia/flash.pp b/manifests/utils/multimedia/flash.pp deleted file mode 100644 index 0c9d1ae..0000000 --- a/manifests/utils/multimedia/flash.pp +++ /dev/null @@ -1,5 +0,0 @@ -class nodo::utils::multimedia::flash { -  package { 'flashplugin-nonfree': -    ensure => installed , -  } -} diff --git a/manifests/utils/multimedia/shockwave.pp b/manifests/utils/multimedia/shockwave.pp new file mode 100644 index 0000000..e167542 --- /dev/null +++ b/manifests/utils/multimedia/shockwave.pp @@ -0,0 +1,13 @@ +class nodo::utils::multimedia::shockwave { +  package { 'flashplugin-nonfree': +    ensure => installed , +  } + +  # Flash alternative +  file { "/etc/alternatives/flash-mozilla.so": +    ensure  => "/usr/lib/gnash/libgnashplugin.so", +    owner   => root, +    group   => root, +    require => Package['flashplugin-nonfree'], +  } +}  | 
