Utils: reorder and cleanup

4 files changed, 16 insertions, 16 deletions

diff --git a/manifests/utils/network/analyzer.pp b/manifests/utils/network/analyzer.pp
index 670ffcb..c3f4f41 100644
--- a/manifests/utils/network/analyzer.pp
+++ b/manifests/utils/network/analyzer.pp
@@ -7,17 +7,9 @@ class nodo::utils::network::analyzer {
     'tcptraceroute',
     'tcpstat',
     'iperf',
-  ]:
-    ensure => installed,
-  }
-
-  package { [
     'zmap',
   ]:
-    ensure  => $::lsbdistcodename ? {
-      'squeeze' => absent,
-      default   => present,
-    }
+    ensure => installed,
   }
 
   # https://www.linode.com/docs/networking/diagnosing-network-issues-with-mtr
diff --git a/manifests/utils/network/irssi.pp b/manifests/utils/network/irssi.pp
index ac2b59a..4784161 100644
--- a/manifests/utils/network/irssi.pp
+++ b/manifests/utils/network/irssi.pp
@@ -11,7 +11,7 @@ class nodo::utils::network::irssi {
     'ttytter',
     'libterm-readkey-perl',
   ]:
-    ensure => present,
+    ensure => absent,
   }
 
   package { [
@@ -33,10 +33,6 @@ class nodo::utils::network::irssi {
   package { [
     'irssi-plugin-silc',
   ]:
-    ensure => $::lsbdistcodename ? {
-      'wheezy' => absent,
-      'jessie' => absent,
-      default  => absent,
-    }
+    ensure => absent,
   }
 }
diff --git a/manifests/utils/network/wicd.pp b/manifests/utils/network/wicd.pp
index 898e043..065d5bb 100644
--- a/manifests/utils/network/wicd.pp
+++ b/manifests/utils/network/wicd.pp
@@ -2,7 +2,7 @@ class nodo::utils::network::wicd {
   package { [
     'wicd',
     'wicd-curses',
-    'wicd-gtk',
+    #'wicd-gtk',
   ]:
     ensure => installed,
   }
diff --git a/manifests/utils/network/xmpp.pp b/manifests/utils/network/xmpp.pp
new file mode 100644
index 0000000..7c019cc
--- /dev/null
+++ b/manifests/utils/network/xmpp.pp
@@ -0,0 +1,12 @@
+class nodo::utils::network::xmpp {
+  package { [
+    'pidgin',
+    'pidgin-encryption',
+    'pidgin-openpgp',
+    'pidgin-otr',
+    'pidgin-privacy-please',
+    'pidgin-plugin-pack',
+  ]:
+    ensure => absent,
+  }
+}