1 files changed, 4 insertions, 60 deletions
diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
index 4fa6a54..4a31103 100644
--- a/manifests/utils/network.pp
+++ b/manifests/utils/network.pp
@@ -1,44 +1,4 @@
 class nodo::utils::network inherits nodo::utils::network::minimal {
-  # Misc
-  package { [
-    'pssh',
-    'sslscan',
-  ]:
-    ensure => installed,
-  }
-
-  # Web
-  package { [
-    'links',
-    'elinks',
-    'surfraw',
-    'w3m',
-    'firefox-esr',
-    'chromium',
-    'chromium-l10n',
-    'xul-ext-https-everywhere',
-    'xul-ext-refcontrol',
-    #'xul-ext-pentadactyl',
-    #'xul-ext-stylish',
-    #'maildir-utils',
-    #'libical-parser-perl',
-    #'geoip-bin',
-    #'rig',
-    #'mailplate',
-    #'sup-mail',
-    #'connect-proxy',
-    #'avahi-discover',
-    #'mdns-scan',
-    #'davfs2',
-    #'ssvnc',
-    #'mairix',
-    #'openvpn',
-    #'nicotine',
-    #'sshfs',
-  ]:
-    ensure => installed,
-  }
-
   # Not in use
   #
   # About vimperator, use the addon directly
@@ -47,11 +7,15 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
   # See also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=686087
   #          http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705999
   package { [
+    'gftp',
     'silc',
     'twinkle',
     'konqueror',
     'transmission',
     'amule',
+    'vidalia',
+    'torchat',
+    'luakit',
     'epiphany-browser',
     'bittorrent',
     'bittornado',
@@ -64,28 +28,8 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
     'xul-ext-greasemonkey',
     'iceweasel-vimperator',
     'mozilla-firefox-adblock',
-    'vidalia',
-    'torchat',
-    'gftp',
     'icedtea6-plugin',
-    'luakit',
   ]:
     ensure => absent,
   }
-
-  # Browser alternative
-  file { "/etc/alternatives/x-www-browser":
-    ensure  => "/usr/bin/firefox-esr",
-    owner   => root,
-    group   => root,
-    require => Package['iceweasel'],
-  }
-
-  # Browser alternative: manpage
-  file { "/etc/alternatives/x-www-browser.1.gz":
-    ensure  => "/usr/share/man/man1/firefox-esr.1.gz",
-    owner   => root,
-    group   => root,
-    require => Package['iceweasel'],
-  }
 }