From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 2 Jul 2016 16:36:20 +0000 (-0300)
Subject: Not using iceweasel-vimperator from package
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=90c281c402a436efb74472ef751f8962ad51f262;p=puppet-nodo.git

Not using iceweasel-vimperator from package
---

diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
index fdac740..1d9d876 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',          'ssvnc',
-              'rig',                'sup-mail',              'iceweasel-vimperator' ]:
+              'rig',                'sup-mail' ]:
     ensure => installed,
   }
 
@@ -23,6 +23,11 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
     require => Package['fetchmail'],
   }
 
+  # Using the addon directly
+  package { 'iceweasel-vimperator':
+    ensure => absent,
+  }
+
   # 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