Adding more multimedia and network packages

diff --git a/manifests/subsystems/utils/multimedia.pp b/manifests/subsystems/utils/multimedia.pp
index 00a68e2118b5add13e5bd1328f9e3a4c109400c7..6f3c5df2b14430d1ab8f6a5f4241849ff46a31e4 100644 (file)
--- a/manifests/subsystems/utils/multimedia.pp
+++ b/manifests/subsystems/utils/multimedia.pp
@@ -27,6 +27,13 @@ class utils::multimedia {
     ensure => installed,
   }
 
+  package { 'landell':
+    ensure => $lsbdistcodename ? {
+      'squeeze' => absent,
+      default   => installed,
+    }
+  }
+
   # Flash alternative
   file { "/etc/alternatives/flash-mozilla.so":
     ensure  => "/usr/lib/flashplugin-nonfree/libflashplayer.so",

diff --git a/manifests/subsystems/utils/network.pp b/manifests/subsystems/utils/network.pp
index 6cd8c9deeae952d9e02e9554fb2718b6f055a365..b9b8870b68580dd5ac0ab29977076923870f2ab1 100644 (file)
--- a/manifests/subsystems/utils/network.pp
+++ b/manifests/subsystems/utils/network.pp
@@ -50,7 +50,8 @@ class utils::network inherits utils::network::minimal {
   # Squeeze (or newer) packages
   if $lsbdistcodename != 'lenny' {
     package { [ 'xul-ext-monkeysphere', 'chromium-browser', 'libical-parser-perl',
-                'maildir-utils',        'icedtea6-plugin', ]:
+                'maildir-utils',        'icedtea6-plugin',  'xul-ext-adblock-plus',
+                'xul-ext-noscript',     'xul-ext-firebug' ]:
       ensure => installed,
     }
 
@@ -60,11 +61,19 @@ class utils::network inherits utils::network::minimal {
     }
 
     # Not using right now
-    package { [ 'xul-ext-torbutton', 'vidalia' ]:
+    package { [ 'xul-ext-torbutton', 'vidalia', 'xul-ext-perspectives', 'xul-ext-greasemonkey' ]:
       ensure => absent,
     }
   }
 
+  # Wheezy (or newer) packages
+  if $lsbdistcodename != 'squeeze' {
+    package { [ 'xul-ext-pentadactyl',    'xul-ext-https-everywhere', 'xul-ext-certificatepatrol',
+                'xul-ext-cookie-monster', 'xul-ext-refcontrol', 'xul-ext-quickproxy' ]:
+      ensure => installed,
+    }
+  }
+
   # Lenny only
   package { [ 'mozilla-firefox-adblock' ]:
     ensure => $lsbdistcodename ? {