aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-07-13 16:30:59 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-07-13 16:30:59 -0300
commit62b455cf333c5f7f0d20291599ab80f0325b615a (patch)
treebced88f0373d1bee9af8d855b096a7c925f064a2 /manifests
parentac63151341b51ad47716ed20ba69114aabe124c6 (diff)
downloadpuppet-nodo-62b455cf333c5f7f0d20291599ab80f0325b615a.tar.gz
puppet-nodo-62b455cf333c5f7f0d20291599ab80f0325b615a.tar.bz2
Adding nodo::utils::multimedia::gnash
Diffstat (limited to 'manifests')
-rw-r--r--manifests/utils/multimedia.pp15
-rw-r--r--manifests/utils/multimedia/flash.pp5
-rw-r--r--manifests/utils/multimedia/shockwave.pp13
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'],
+ }
+}