From 62b455cf333c5f7f0d20291599ab80f0325b615a Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 13 Jul 2013 16:30:59 -0300 Subject: Adding nodo::utils::multimedia::gnash --- manifests/utils/multimedia.pp | 15 +++------------ manifests/utils/multimedia/flash.pp | 5 ----- manifests/utils/multimedia/shockwave.pp | 13 +++++++++++++ 3 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 manifests/utils/multimedia/flash.pp create mode 100644 manifests/utils/multimedia/shockwave.pp (limited to 'manifests/utils') 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'], + } +} -- cgit v1.2.3