diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-09-23 16:29:26 -0300 | 
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-09-23 16:29:26 -0300 | 
| commit | 4a880ad141c8deefb41549e5e79c868303e1c296 (patch) | |
| tree | 259be8415b54beb82bcafa6fed2114de49a627b4 /manifests/utils/multimedia | |
| parent | 50d24f812a1ea34e190632cfef4b217490d7522d (diff) | |
| download | puppet-nodo-4a880ad141c8deefb41549e5e79c868303e1c296.tar.gz puppet-nodo-4a880ad141c8deefb41549e5e79c868303e1c296.tar.bz2  | |
Coding style for utilities
Diffstat (limited to 'manifests/utils/multimedia')
| -rw-r--r-- | manifests/utils/multimedia/cdplayer.pp | 6 | ||||
| -rw-r--r-- | manifests/utils/multimedia/downloaders.pp | 4 | ||||
| -rw-r--r-- | manifests/utils/multimedia/extractors.pp | 6 | ||||
| -rw-r--r-- | manifests/utils/multimedia/gnash.pp | 8 | ||||
| -rw-r--r-- | manifests/utils/multimedia/mediacenter.pp | 7 | ||||
| -rw-r--r-- | manifests/utils/multimedia/minimal.pp | 10 | ||||
| -rw-r--r-- | manifests/utils/multimedia/ripper.pp | 12 | ||||
| -rw-r--r-- | manifests/utils/multimedia/scanner.pp | 4 | ||||
| -rw-r--r-- | manifests/utils/multimedia/shockwave.pp | 4 | ||||
| -rw-r--r-- | manifests/utils/multimedia/studio.pp | 20 | 
10 files changed, 67 insertions, 14 deletions
diff --git a/manifests/utils/multimedia/cdplayer.pp b/manifests/utils/multimedia/cdplayer.pp index b006441..05e88ad 100644 --- a/manifests/utils/multimedia/cdplayer.pp +++ b/manifests/utils/multimedia/cdplayer.pp @@ -1,6 +1,10 @@  class nodo::utils::multimedia::cdplayer {    # CD writers and extractors -  package { [ 'mcdp', 'cdtool', 'cd-discid' ]: +  package { [ +    'mcdp', +    'cdtool', +    'cd-discid', +  ]:      ensure => installed,    }  } diff --git a/manifests/utils/multimedia/downloaders.pp b/manifests/utils/multimedia/downloaders.pp index 26e761c..40d610f 100644 --- a/manifests/utils/multimedia/downloaders.pp +++ b/manifests/utils/multimedia/downloaders.pp @@ -1,6 +1,8 @@  class nodo::utils::multimedia::downloaders {    # Jessie onwards -  package { 'youtube-dl': +  package { [ +    'youtube-dl', +  ]:      ensure => $::lsbdistcodename ? {        'wheezy' => absent,        default  => present, diff --git a/manifests/utils/multimedia/extractors.pp b/manifests/utils/multimedia/extractors.pp index 19d3332..a3fde3c 100644 --- a/manifests/utils/multimedia/extractors.pp +++ b/manifests/utils/multimedia/extractors.pp @@ -1,5 +1,9 @@  class nodo::utils::multimedia::extractors { -  package { [ 'rar', 'unrar', 'zip' ]: +  package { [ +    'rar', +    'unrar', +    'zip', +  ]:      ensure => present,    }  } diff --git a/manifests/utils/multimedia/gnash.pp b/manifests/utils/multimedia/gnash.pp index 3cd564f..5283534 100644 --- a/manifests/utils/multimedia/gnash.pp +++ b/manifests/utils/multimedia/gnash.pp @@ -1,9 +1,13 @@  class nodo::utils::multimedia::gnash { -  package { 'flashplugin-nonfree': +  package { [ +    'flashplugin-nonfree', +  ]:      ensure => purged,    } -  package { 'browser-plugin-gnash': +  package { [ +    'browser-plugin-gnash', +  ]:      ensure => present,    } diff --git a/manifests/utils/multimedia/mediacenter.pp b/manifests/utils/multimedia/mediacenter.pp index 362e4f3..d3388b2 100644 --- a/manifests/utils/multimedia/mediacenter.pp +++ b/manifests/utils/multimedia/mediacenter.pp @@ -1,5 +1,10 @@  class nodo::utils::multimedia::mediacenter { -  package { [ 'xbmc', 'upnp-inspector', 'gupnp-tools', 'djmount' ]: +  package { [ +    'xbmc', +    'upnp-inspector', +    'gupnp-tools', +    'djmount', +  ]:      ensure => present,    }  } diff --git a/manifests/utils/multimedia/minimal.pp b/manifests/utils/multimedia/minimal.pp index 04709ed..d779524 100644 --- a/manifests/utils/multimedia/minimal.pp +++ b/manifests/utils/multimedia/minimal.pp @@ -1,9 +1,15 @@  class nodo::utils::multimedia::minimal { -  package { [ 'alsa-utils', 'mpg123', 'mediainfo' ]: +  package { [ +    'alsa-utils', +    'mpg123', +    'mediainfo', +  ]:      ensure => installed,    } -  package { 'mplayer': +  package { [ +    'mplayer', +  ]:      ensure  => present,      name    => $::lsbdistcodename ? {        'wheezy' => 'mplayer', diff --git a/manifests/utils/multimedia/ripper.pp b/manifests/utils/multimedia/ripper.pp index 9fcd12f..c97908d 100644 --- a/manifests/utils/multimedia/ripper.pp +++ b/manifests/utils/multimedia/ripper.pp @@ -1,6 +1,16 @@  class nodo::utils::multimedia::ripper {    # CD writers and extractors -  package { [ 'ripit', 'asunder', 'wodim', 'genisoimage', 'dvd+rw-tools', 'cdrskin', 'cd5', 'eject', 'cdrdao' ]: +  package { [ +    'ripit', +    'asunder', +    'wodim', +    'genisoimage', +    'dvd+rw-tools', +    'cdrskin', +    'cd5', +    'eject', +    'cdrdao', +  ]:      ensure => installed,    }  } diff --git a/manifests/utils/multimedia/scanner.pp b/manifests/utils/multimedia/scanner.pp index 5b5302a..abe8b64 100644 --- a/manifests/utils/multimedia/scanner.pp +++ b/manifests/utils/multimedia/scanner.pp @@ -1,5 +1,7 @@  class nodo::utils::multimedia::scanner { -  package { 'xsane': +  package { [ +    'xsane', +  ]:      ensure => present,    }  } diff --git a/manifests/utils/multimedia/shockwave.pp b/manifests/utils/multimedia/shockwave.pp index a0d644d..cf3a712 100644 --- a/manifests/utils/multimedia/shockwave.pp +++ b/manifests/utils/multimedia/shockwave.pp @@ -1,6 +1,8 @@  class nodo::utils::multimedia::shockwave {    # See also https://github.com/i-rinat/freshplayerplugin -  package { 'flashplugin-nonfree': +  package { [ +    'flashplugin-nonfree', +  ]:      ensure => installed ,    } diff --git a/manifests/utils/multimedia/studio.pp b/manifests/utils/multimedia/studio.pp index 8aadf22..742cf9c 100644 --- a/manifests/utils/multimedia/studio.pp +++ b/manifests/utils/multimedia/studio.pp @@ -1,15 +1,29 @@  class nodo::utils::multimedia::studio { -  package { [ 'ardour', 'hydrogen', 'mixxx' ]: +  package { [ +    'ardour', +    'hydrogen', +    'mixxx', +  ]:      ensure => installed,    }    # Instruments -  package { [ 'amsynth', 'guitarix', 'rakarrack', 'tuxguitar-jack' ]: +  package { [ +    'amsynth', +    'guitarix', +    'rakarrack', +    'tuxguitar-jack', +  ]:      ensure => installed,    }    # LADSPA plugins -  package { [ 'fil-plugins', 'swh-plugins', 'tap-plugins', 'invada-studio-plugins-ladspa' ]: +  package { [ +    'fil-plugins', +    'swh-plugins', +    'tap-plugins', +    'invada-studio-plugins-ladspa', +  ]:      ensure => installed,    }  }  | 
