diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-08-25 19:32:35 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-08-25 19:32:35 -0300 |
| commit | 4f52770441da4a8854adb47892225d20426df57d (patch) | |
| tree | fe0fb840fbbf02b4a4e9dd563a48a4ed58a0a4ea /manifests | |
| parent | eab48bc8d50da549cd4be07d7ede5b25cd876c42 (diff) | |
| parent | de35bf91aaecfdfcb60bde062eb77ead5213e8bf (diff) | |
| download | puppet-nodo-4f52770441da4a8854adb47892225d20426df57d.tar.gz puppet-nodo-4f52770441da4a8854adb47892225d20426df57d.tar.bz2 | |
Merge branch 'master' into develop
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/utils/multimedia/minimal.pp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/manifests/utils/multimedia/minimal.pp b/manifests/utils/multimedia/minimal.pp index c54a7d3..04709ed 100644 --- a/manifests/utils/multimedia/minimal.pp +++ b/manifests/utils/multimedia/minimal.pp @@ -1,5 +1,13 @@ class nodo::utils::multimedia::minimal { - package { [ 'mplayer', 'alsa-utils', 'mpg123', 'mediainfo' ]: + package { [ 'alsa-utils', 'mpg123', 'mediainfo' ]: ensure => installed, } + + package { 'mplayer': + ensure => present, + name => $::lsbdistcodename ? { + 'wheezy' => 'mplayer', + default => 'mplayer2', + }, + } } |