Merge branch 'master' into develop

10 files changed, 65 insertions, 20 deletions

diff --git a/manifests/utils.pp b/manifests/utils.pp
index 770d027..8f572b6 100644
--- a/manifests/utils.pp
+++ b/manifests/utils.pp
@@ -29,6 +29,11 @@ class nodo::utils {
   #  ensure => installed,
   #}
 
+  # To be considered
+  #package { 'needrestart':
+  #  ensure  => present,
+  #}
+
   # Obsolete
   if !defined(Package['git-core']) {
     package { 'git-core':
diff --git a/manifests/utils/development/git.pp b/manifests/utils/development/git.pp
index 03790f3..b5fc5aa 100644
--- a/manifests/utils/development/git.pp
+++ b/manifests/utils/development/git.pp
@@ -1,9 +1,10 @@
 class nodo::utils::development::git {
-  package { [ 'gitk',       'git-gui',  'tig',    'git-cola',          'git-stuff', 'legit',
+  package { [ 'gitk',       'git-gui',  'tig',    'git-cola',          'legit',
               'git-extras', 'git-flow', 'topgit', 'git-remote-gcrypt', ]:
     ensure => installed,
   }
 
+  # Newer packages
   package { 'git-crypt':
     ensure => $::lsbdistcodename ? {
       'stretch' => present,
@@ -11,4 +12,12 @@ class nodo::utils::development::git {
       default   => absent,
     }
   }
+
+  # Wheezy only
+  package { 'git-stuff':
+    ensure => $::lsbdistcodename ? {
+      'wheezy' => present,
+      default  => absent,
+    },
+  }
 }
diff --git a/manifests/utils/development/system.pp b/manifests/utils/development/system.pp
index 9423f14..e654e38 100644
--- a/manifests/utils/development/system.pp
+++ b/manifests/utils/development/system.pp
@@ -1,5 +1,12 @@
 class nodo::utils::development::system {
-  package { [ 'debirf', 'xorriso', 'unetbootin', 'kpartx', 'openocd', 'live-build' ]:
+  package { [ 'debirf', 'xorriso', 'kpartx', 'openocd', 'live-build' ]:
     ensure => installed,
   }
+
+  package { 'unetbootin':
+    ensure => $::lsbdistcodename ? {
+      'wheezy' => present,
+      default  => absent,
+    },
+  }
 }
diff --git a/manifests/utils/interface.pp b/manifests/utils/interface.pp
index 235d88a..e772a17 100644
--- a/manifests/utils/interface.pp
+++ b/manifests/utils/interface.pp
@@ -28,4 +28,9 @@ class nodo::utils::interface inherits nodo::utils::interface::console {
       default   => 'rxvt-unicode-256color',
     }
   }
+
+  # To be considered
+  #package { 'needrestart-session':
+  #  ensure  => present,
+  #}
 }
diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp
index 12f537d..a61a88f 100644
--- a/manifests/utils/multimedia.pp
+++ b/manifests/utils/multimedia.pp
@@ -2,10 +2,10 @@
 class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
   # Multimedia
   package { [ 'alsa-tools-gui',  'mp3blaster',          'netpbm',
-              'gqview',          'audacious',           'qjackctl',
+              'audacious',       'qjackctl',
               'gimp',            'xine-ui',             'v4l-utils',          'inkscape',
               'easytag',         'gstreamer-tools',     'vlc',                'audacity',
-              'opencubicplayer', 'mencoder',            'libasound2-plugins', 'lame',
+              'opencubicplayer', 'libasound2-plugins',  'lame',
               'cbrpager',        'llgal',               'darksnow',           'pavucontrol',
               'picard',          'ffmpeg2theora',       'oggfwd',             'jhead',
               'gxine',           'totem',               'faad',               'gmtp',
@@ -26,15 +26,16 @@ class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
     }
   }
 
-  # Wheezy onwards
-  package { 'landell':
+  # Wheezy only
+  package { [ 'landell', 'gqview', 'mencoder' ]:
     ensure => $::lsbdistcodename ? {
       'squeeze' => absent,
-      default   => installed,
+      'wheezy'  => installed,
+      default   => absent,
     }
   }
 
-  # Flash implementation
-  $flash = hiera('nodo::utils::multimedia::flash', 'gnash')
-  class { "nodo::utils::multimedia::${flash}": }
+  # Flash implementation (deprecated)
+  #$flash = hiera('nodo::utils::multimedia::flash', 'gnash')
+  #class { "nodo::utils::multimedia::${flash}": }
 }
diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
index cd64f93..0b50a8c 100644
--- a/manifests/utils/network.pp
+++ b/manifests/utils/network.pp
@@ -11,7 +11,7 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
               'sslscan',            'muttprofile',           'connect-proxy',
               'avahi-discover',     'mdns-scan',             'davfs2',
               'surfraw',            'w3m',                   'mailplate',
-              'geoip-bin',          'luakit',                'ssvnc',
+              'geoip-bin',          'ssvnc',
               'rig',                'sup-mail',              'iceweasel-vimperator' ]:
     ensure => installed,
   }
@@ -33,7 +33,7 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
 
   # Squeeze (or newer) packages
   if $::lsbdistcodename != 'lenny' {
-    package { [ 'xul-ext-monkeysphere', 'chromium-browser', 'libical-parser-perl',
+    package { [ 'xul-ext-monkeysphere', 'libical-parser-perl',
                 'maildir-utils',        'xul-ext-noscript',
                 'xul-ext-firebug',      'msva-perl',        'chromium-l10n' ]:
       ensure => installed,
@@ -45,6 +45,15 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
     }
   }
 
+  package { 'chromium':
+    ensure  => present,
+    name    => $::lsbdistcodename ? {
+      'wheezy' => 'chromium-browser',
+      default  => 'chromium',
+    },
+  }
+
+
   # Wheezy (or newer) packages
   if $::lsbdistcodename != 'squeeze' {
     package { [ 'xul-ext-https-everywhere', 'xul-ext-refcontrol', 'xul-ext-requestpolicy' ]:
@@ -68,7 +77,7 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
   #}
 
   # Wheezy only
-  package { [ 'gftp', 'icedtea6-plugin' ]:
+  package { [ 'gftp', 'icedtea6-plugin', 'luakit' ]:
     ensure => $::lsbdistcodename ? {
       'lenny' => present,
       default => absent,
diff --git a/manifests/utils/network/analyzer.pp b/manifests/utils/network/analyzer.pp
index 8ceffcc..4d19c43 100644
--- a/manifests/utils/network/analyzer.pp
+++ b/manifests/utils/network/analyzer.pp
@@ -1,5 +1,5 @@
 class nodo::utils::network::analyzer {
-  package { [ 'tshark', 'arping', 'fping', 'oping', 'tcptraceroute', 'tcpstat' ]:
+  package { [ 'tshark', 'arping', 'fping', 'oping', 'tcptraceroute', 'tcpstat', 'iperf' ]:
     ensure => installed,
   }
 
diff --git a/manifests/utils/network/irssi.pp b/manifests/utils/network/irssi.pp
index 08df04a..e0a94b5 100644
--- a/manifests/utils/network/irssi.pp
+++ b/manifests/utils/network/irssi.pp
@@ -20,7 +20,8 @@ class nodo::utils::network::irssi {
   package { 'irssi-plugin-silc':
     ensure => $::lsbdistcodename ? {
       'wheezy' => absent,
-      default  => present,
+      'jessie' => absent,
+      default  => absent,
     }
   }
 }
diff --git a/manifests/utils/office.pp b/manifests/utils/office.pp
index f9b4350..d4638b0 100644
--- a/manifests/utils/office.pp
+++ b/manifests/utils/office.pp
@@ -1,6 +1,6 @@
 class nodo::utils::office {
   # Office
-  package { [ 'wyrd',                'vim-gtk',             'gobby',
+  package { [ 'vim-gtk',             'gobby',
               'sc',                  'antiword',            'dia',
               'kalarm',              'pandoc',              'gnumeric',
               'cups-client',         'hplip',               'cups-bsd',
@@ -30,6 +30,14 @@ class nodo::utils::office {
     }
   }
 
+  # Wheezy only
+  package { 'wyrd':
+    ensure => $::lsbdistcodename ? {
+      'wheezy' => present,
+      default  => absent,
+    },
+  }
+
   # Wheezy onwards
   package { 'libreoffice':
     ensure => $::lsbdistcodename ? {
diff --git a/manifests/utils/ruby.pp b/manifests/utils/ruby.pp
index 2ea8b9b..0025b6b 100644
--- a/manifests/utils/ruby.pp
+++ b/manifests/utils/ruby.pp
@@ -1,7 +1,7 @@
 class nodo::utils::ruby {
   # Gem packages
   package { 'capistrano':
-    ensure   => installed,
+    ensure   => absent,
     provider => $::lsbdistcodename ? {
       'squeeze' => gem,
        default  => apt,
@@ -24,21 +24,21 @@ class nodo::utils::ruby {
 
   if !defined(Package['rubygems']) {
     package { 'rubygems':
-      ensure  => installed,
+      ensure  => absent,
       require => Package['ruby'],
     }
   }
 
   if !defined(Package['ruby-dev']) {
     package { 'ruby-dev':
-      ensure  => installed,
+      ensure  => absent,
       require => Package['ruby'],
     }
   }
 
   if !defined(Package['libgpgme-ruby1.8']) {
     package { 'libgpgme-ruby1.8':
-      ensure  => installed,
+      ensure  => absent,
       require => Package['ruby'],
     }
   }