aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-04-20 23:30:16 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-04-20 23:30:16 -0300
commit92e4e4d6734b62cbbe620ee1951f1b78af274674 (patch)
tree7baf64586ad3167c7dc86f04d7c1ee689bb22efc
parent1d9b6e9155a6fcba5ed1da499c8d71bfd9cef550 (diff)
downloadpuppet-nodo-92e4e4d6734b62cbbe620ee1951f1b78af274674.tar.gz
puppet-nodo-92e4e4d6734b62cbbe620ee1951f1b78af274674.tar.bz2
Moving mediainfo to nodo::utils::multimedia::minimal
-rw-r--r--manifests/utils/multimedia.pp2
-rw-r--r--manifests/utils/multimedia/minimal.pp2
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp
index 26d771e..12f537d 100644
--- a/manifests/utils/multimedia.pp
+++ b/manifests/utils/multimedia.pp
@@ -9,7 +9,7 @@ class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
'cbrpager', 'llgal', 'darksnow', 'pavucontrol',
'picard', 'ffmpeg2theora', 'oggfwd', 'jhead',
'gxine', 'totem', 'faad', 'gmtp',
- 'gphotofs', 'jmtpfs', 'mediainfo' ]:
+ 'gphotofs', 'jmtpfs' ]:
ensure => installed,
}
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,
}
}