diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-06-29 16:50:00 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-06-29 16:50:00 -0300 |
| commit | 3a2b922df895b204e14ab8e7cb51661e4956cbc4 (patch) | |
| tree | ca7453b849008ec71dd47cccaed73b14e57c0c25 /manifests/utils/multimedia | |
| parent | adc3ab327f85f7d9c583d8b79b2cac22345c148f (diff) | |
| parent | da49436db33d551c0c0bb09918697102e17f4ec8 (diff) | |
| download | puppet-nodo-3a2b922df895b204e14ab8e7cb51661e4956cbc4.tar.gz puppet-nodo-3a2b922df895b204e14ab8e7cb51661e4956cbc4.tar.bz2 | |
Merge branch 'master' into feature/autoload
Diffstat (limited to 'manifests/utils/multimedia')
| -rw-r--r-- | manifests/utils/multimedia/minimal.pp | 2 | ||||
| -rw-r--r-- | manifests/utils/multimedia/shockwave.pp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/manifests/utils/multimedia/minimal.pp b/manifests/utils/multimedia/minimal.pp index b6562c4..c54a7d3 100644 --- a/manifests/utils/multimedia/minimal.pp +++ b/manifests/utils/multimedia/minimal.pp @@ -1,5 +1,5 @@ class nodo::utils::multimedia::minimal { - package { [ 'mplayer', 'alsa-utils', 'mpg123' ]: + package { [ 'mplayer', 'alsa-utils', 'mpg123', 'mediainfo' ]: ensure => installed, } } diff --git a/manifests/utils/multimedia/shockwave.pp b/manifests/utils/multimedia/shockwave.pp index d7dc1d6..a0d644d 100644 --- a/manifests/utils/multimedia/shockwave.pp +++ b/manifests/utils/multimedia/shockwave.pp @@ -1,4 +1,5 @@ class nodo::utils::multimedia::shockwave { + # See also https://github.com/i-rinat/freshplayerplugin package { 'flashplugin-nonfree': ensure => installed , } |