Package changes

diff --git a/manifests/subsystem/scanner.pp b/manifests/subsystem/scanner.pp
index db35e4335c47d083e3a18566c3c2ab727d5aa133..89b0cc341c121e3efa53b1734ff38adf0b56a127 100644 (file)
--- a/manifests/subsystem/scanner.pp
+++ b/manifests/subsystem/scanner.pp
@@ -1,5 +1,5 @@
 class nodo::subsystem::scanner($access_list = hiera('nodo::subsystem::scanner::access_list', '')) {
-  package { 'sane':
+  package { [ 'sane', 'sane-utils' ]:
     ensure  => present,
   }
 

diff --git a/manifests/utils/browser/hardened.pp b/manifests/utils/browser/hardened.pp
new file mode 100644 (file)
index 0000000..e641a71
--- /dev/null
+++ b/manifests/utils/browser/hardened.pp
@@ -0,0 +1,9 @@
+class nodo::utils::browser::hardened {
+  package { [ 
+              'torbrowser-launcher',
+              'xul-ext-requestpolicy',
+              'xul-ext-certificatepatrol',
+            ]:
+    ensure  => present,
+  }
+}

diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
index 7aca920c1dfd7e611075a6dea11df519f6eb22fc..fdac740e244f38890e7e3ab8e35b225ec60e002f 100644 (file)
--- a/manifests/utils/network.pp
+++ b/manifests/utils/network.pp
@@ -11,7 +11,7 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
               'sslscan',            'muttprofile',           'connect-proxy',
               'avahi-discover',     'mdns-scan',             'davfs2',
               'surfraw',            'w3m',                   'mailplate',
-              'geoip-bin',          'ssvnc',                 'torbrowser-launcher',
+              'geoip-bin',          'ssvnc',
               'rig',                'sup-mail',              'iceweasel-vimperator' ]:
     ensure => installed,
   }
@@ -38,11 +38,11 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
                 'xul-ext-firebug',      'msva-perl',        'chromium-l10n' ]:
       ensure => installed,
     }
+  }
 
-    # Not using right now
-    package { [ 'xul-ext-torbutton', 'vidalia', 'xul-ext-perspectives', 'xul-ext-greasemonkey' ]:
-      ensure => absent,
-    }
+  # Not using right now
+  package { [ 'xul-ext-torbutton', 'vidalia', 'xul-ext-perspectives', 'xul-ext-greasemonkey', 'torchat' ]:
+    ensure => absent,
   }
 
   package { 'chromium':
@@ -55,19 +55,15 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
 
   # Wheezy (or newer) packages
   if $::lsbdistcodename != 'squeeze' {
-    package { [ 'xul-ext-https-everywhere', 'xul-ext-refcontrol', 'xul-ext-requestpolicy' ]:
+    package { [ 'xul-ext-https-everywhere', 'xul-ext-refcontrol' ]:
       ensure => installed,
     }
 
     # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=686087
     #     http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705999
-    package { [ 'xul-ext-cookie-monster', 'xul-ext-quickproxy', 'xul-ext-certificatepatrol' ]:
+    package { [ 'xul-ext-cookie-monster', 'xul-ext-quickproxy' ]:
       ensure => absent,
     }
-
-    package { [ 'torchat' ]:
-      ensure => installed,
-    }
   }
 
   # Jessie ownwards