Merge branch 'master' into feature/autoload

1 files changed, 5 insertions, 5 deletions

diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
index c445277..20d0f2b 100644
--- a/manifests/utils/network.pp
+++ b/manifests/utils/network.pp
@@ -12,7 +12,7 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
               'avahi-discover',     'mdns-scan',             'davfs2',
               'surfraw',            'w3m',                   'mailplate',
               'geoip-bin',          'luakit',                'ssvnc',
-              'rig' ]:
+              'rig',                'sup-mail',              'iceweasel-vimperator' ]:
     ensure => installed,
   }
 
@@ -25,17 +25,17 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
 
   # Old packages
   # About firegpg, see http://tails.boum.org/bugs/FireGPG_may_be_unsafe/
+  # About adblock plus, see http://www.theverge.com/2015/2/2/7963577/google-ads-get-through-adblock
   package { [ 'silc', 'twinkle', 'konqueror', 'transmission', 'amule', 'epiphany-browser',
-              'bittorrent', 'bittornado', 'xul-ext-firegpg' ]:
+              'bittorrent', 'bittornado', 'xul-ext-firegpg',  'xul-ext-adblock-plus' ]:
     ensure => absent,
   }
 
   # Squeeze (or newer) packages
   if $::lsbdistcodename != 'lenny' {
     package { [ 'xul-ext-monkeysphere', 'chromium-browser', 'libical-parser-perl',
-                'maildir-utils',        'icedtea6-plugin',  'xul-ext-adblock-plus',
-                'xul-ext-noscript',     'xul-ext-firebug',  'msva-perl',
-                'chromium-l10n' ]:
+                'maildir-utils',        'icedtea6-plugin',  'xul-ext-noscript',
+                'xul-ext-firebug',      'msva-perl',        'chromium-l10n' ]:
       ensure => installed,
     }