From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 13 Jul 2013 19:48:14 +0000 (-0300)
Subject: More gnash/shockwave changes
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=8dd23c26db26d6d766325b4de6648add76c8813e;p=puppet-nodo.git

More gnash/shockwave changes
---

diff --git a/manifests/utils/multimedia/gnash.pp b/manifests/utils/multimedia/gnash.pp
new file mode 100644
index 0000000..3cd564f
--- /dev/null
+++ b/manifests/utils/multimedia/gnash.pp
@@ -0,0 +1,17 @@
+class nodo::utils::multimedia::gnash {
+  package { 'flashplugin-nonfree':
+    ensure => purged,
+  }
+
+  package { 'browser-plugin-gnash':
+    ensure => present,
+  }
+
+  # Flash alternative
+  file { "/etc/alternatives/flash-mozilla.so":
+    owner   => root,
+    group   => root,
+    ensure  => "/usr/lib/gnash/libgnashplugin.so",
+    require => Package['browser-plugin-gnash'],
+  }
+}
diff --git a/manifests/utils/multimedia/shockwave.pp b/manifests/utils/multimedia/shockwave.pp
index e167542..d7dc1d6 100644
--- a/manifests/utils/multimedia/shockwave.pp
+++ b/manifests/utils/multimedia/shockwave.pp
@@ -5,9 +5,9 @@ class nodo::utils::multimedia::shockwave {
 
   # Flash alternative
   file { "/etc/alternatives/flash-mozilla.so":
-    ensure  => "/usr/lib/gnash/libgnashplugin.so",
     owner   => root,
     group   => root,
+    ensure  => "/usr/lib/flashplugin-nonfree/libflashplayer.so",
     require => Package['flashplugin-nonfree'],
   }
 }