aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-06-17 10:54:09 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-06-17 10:54:09 -0300
commit8d3a82fcea042bec9f3d2342317a97d84c5d8735 (patch)
treef11770a0c37a27bd775c8fd4f630014500ced873 /manifests
parentf3c7c26329edfdaa6ac32b6c7555198130876782 (diff)
downloadpuppet-nodo-8d3a82fcea042bec9f3d2342317a97d84c5d8735.tar.gz
puppet-nodo-8d3a82fcea042bec9f3d2342317a97d84c5d8735.tar.bz2
Removes xul-ext-adblock-plus package
Diffstat (limited to 'manifests')
-rw-r--r--manifests/utils/network.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
index c6bb206..20d0f2b 100644
--- a/manifests/utils/network.pp
+++ b/manifests/utils/network.pp
@@ -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,
}