Moving youtube-dl into nodo::utils::storage::archive

diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp
index 562f84f33bcff5c08f19950011ad3c9750a0e704..dfbf004d528ed1a99acbda22b1a28b34652eecb3 100644 (file)
--- 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 2ebd3610efdd9907618483ce59ec959697a5e0d1..58920a99e6b7578a5be596850226bdf1b14f0d94 100644 (file)
--- 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,
   }
 }