]> gitweb.fluxo.info Git - puppet-nodo.git/commitdiff
Removes xul-ext-adblock-plus package
authorSilvio Rhatto <rhatto@riseup.net>
Wed, 17 Jun 2015 13:54:09 +0000 (10:54 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Wed, 17 Jun 2015 13:54:09 +0000 (10:54 -0300)
manifests/utils/network.pp

index c6bb206739488c8de7bd10f479bfca41284b2df4..20d0f2ba93e22a855132c79ab2fa438bdc70c322 100644 (file)
@@ -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,
     }