aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-06-16 22:29:25 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-06-16 22:29:25 -0300
commit8b6adbcf91eaaf9e52eb28d17d6812c6d76a8211 (patch)
tree0cfe33a6f5f8c9b9d49b39c2e1a797e24d8dfc0c /manifests
parentd12149adbfed8f9cf496ffe81c6ba6cd8611e4cb (diff)
downloadpuppet-nodo-8b6adbcf91eaaf9e52eb28d17d6812c6d76a8211.tar.gz
puppet-nodo-8b6adbcf91eaaf9e52eb28d17d6812c6d76a8211.tar.bz2
Moving youtube-dl into nodo::utils::storage::archive
Diffstat (limited to 'manifests')
-rw-r--r--manifests/utils/multimedia.pp11
-rw-r--r--manifests/utils/storage/archive.pp2
2 files changed, 6 insertions, 7 deletions
diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp
index 562f84f..dfbf004 100644
--- a/manifests/utils/multimedia.pp
+++ b/manifests/utils/multimedia.pp
@@ -3,12 +3,11 @@ class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
# Multimedia
package { [ 'alsa-tools-gui', 'mp3blaster', 'netpbm',
'gqview', 'audacious', 'qjackctl',
- 'gimp', 'xine-ui', 'v4l-utils', 'inkscape',
- 'easytag', 'gstreamer-tools', 'vlc', 'audacity',
- 'opencubicplayer', 'youtube-dl', 'mencoder', 'libasound2-plugins',
- 'cbrpager', 'llgal', 'darksnow',
- 'picard', 'ffmpeg2theora', 'oggfwd', 'jhead',
- 'pavucontrol', 'lame' ]:
+ 'gimp', 'xine-ui', 'v4l-utils', 'inkscape',
+ 'easytag', 'gstreamer-tools', 'vlc', 'audacity',
+ 'opencubicplayer', 'mencoder', 'libasound2-plugins', 'lame',
+ 'cbrpager', 'llgal', 'darksnow', 'pavucontrol',
+ 'picard', 'ffmpeg2theora', 'oggfwd', 'jhead' ]:
ensure => installed,
}
diff --git a/manifests/utils/storage/archive.pp b/manifests/utils/storage/archive.pp
index 2ebd361..58920a9 100644
--- a/manifests/utils/storage/archive.pp
+++ b/manifests/utils/storage/archive.pp
@@ -1,5 +1,5 @@
class nodo::utils::storage::archive {
- package { [ 'git-annex', 'jigdo-file' ]:
+ package { [ 'git-annex', 'jigdo-file', 'youtube-dl' ]:
ensure => installed,
}
}