6 files changed, 75 insertions, 117 deletions
diff --git a/manifests/utils/personal/debian.pp b/manifests/utils/bundle/debian.pp
index 91f6193..23ce9d6 100644
--- a/manifests/utils/personal/debian.pp
+++ b/manifests/utils/bundle/debian.pp
@@ -1,4 +1,4 @@
-class nodo::utils::personal::debian {
+class nodo::utils::bundle::debian {
   # ISO image handling
   include nodo::utils::storage::iso
 
diff --git a/manifests/utils/personal/poweruser.pp b/manifests/utils/bundle/poweruser.pp
index db81a42..b4a20b2 100644
--- a/manifests/utils/personal/poweruser.pp
+++ b/manifests/utils/bundle/poweruser.pp
@@ -1,5 +1,5 @@
 # Bundle for power users
-class nodo::utils::personal::poweruser {
+class nodo::utils::bundle::poweruser {
   include nodo::utils::office
   include nodo::utils::interface
   include nodo::utils::development
@@ -7,4 +7,6 @@ class nodo::utils::personal::poweruser {
   include nodo::utils::network
   include nodo::utils::storage::archive
   include nodo::utils::multimedia
+  include nodo::utils::monkeysphere
+  include nodo::utils::network::mail
 }
diff --git a/manifests/utils/personal/standard.pp b/manifests/utils/bundle/standard.pp
index 73ad271..b63c976 100644
--- a/manifests/utils/personal/standard.pp
+++ b/manifests/utils/bundle/standard.pp
@@ -1,5 +1,5 @@
 # Bundle with standard packages
-class nodo::utils::personal::pc {
+class nodo::utils::bundle::pc {
   include nodo::utils::office
   include nodo::utils::printer
   include nodo::utils::network
diff --git a/manifests/utils/monkeysphere.pp b/manifests/utils/monkeysphere.pp
new file mode 100644
index 0000000..8da90b9
--- /dev/null
+++ b/manifests/utils/monkeysphere.pp
@@ -0,0 +1,11 @@
+class nodo::utils::monkeysphere {
+  # Monkeysphere
+  package { [
+    'xul-ext-monkeysphere',
+    'xul-ext-noscript',
+    'xul-ext-firebug',
+    'msva-perl',
+  ]:
+    ensure => installed,
+  }
+}
diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
index cb9e5c5..4fa6a54 100644
--- a/manifests/utils/network.pp
+++ b/manifests/utils/network.pp
@@ -1,27 +1,31 @@
 class nodo::utils::network inherits nodo::utils::network::minimal {
-  # Network
+  # Misc
   package { [
-    'mutt',
-    'offlineimap',
-    'newsbeuter',
-    'bogofilter',
-    'fetchmail',
-    'procmail',
-    'msmtp',
-    'notmuch-mutt',
-    'links',
-    'elinks',
-    'firefox-esr',
     'pssh',
-    'mutt-patched',
     'sslscan',
-    'muttprofile',
+  ]:
+    ensure => installed,
+  }
+
+  # Web
+  package { [
+    'links',
+    'elinks',
     'surfraw',
     'w3m',
-    'mailplate',
-    'geoip-bin',
-    'rig',
-    'sup-mail',
+    'firefox-esr',
+    'chromium',
+    'chromium-l10n',
+    'xul-ext-https-everywhere',
+    'xul-ext-refcontrol',
+    #'xul-ext-pentadactyl',
+    #'xul-ext-stylish',
+    #'maildir-utils',
+    #'libical-parser-perl',
+    #'geoip-bin',
+    #'rig',
+    #'mailplate',
+    #'sup-mail',
     #'connect-proxy',
     #'avahi-discover',
     #'mdns-scan',
@@ -35,23 +39,13 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
     ensure => installed,
   }
 
-  # Fix: ensure that fetchmail is not a service
-  service { 'fetchmail':
-    ensure  => stopped,
-    enable  => false,
-    require => Package['fetchmail'],
-  }
-
-  # Using the addon directly
-  package { [
-    'iceweasel-vimperator',
-  ]:
-    ensure => absent,
-  }
-
-  # Old packages
+  # Not in use
+  #
+  # About vimperator, use the addon directly
   # 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
+  # See also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=686087
+  #          http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705999
   package { [
     'silc',
     'twinkle',
@@ -63,98 +57,25 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
     'bittornado',
     'xul-ext-firegpg',
     'xul-ext-adblock-plus',
-  ]:
-    ensure => absent,
-  }
-
-  # Squeeze (or newer) packages
-  if $::lsbdistcodename != 'lenny' {
-    package { [ 
-      'xul-ext-monkeysphere',
-      'libical-parser-perl',
-      'maildir-utils',
-      'xul-ext-noscript',
-      'xul-ext-firebug',
-      'msva-perl',
-      'chromium-l10n',
-    ]:
-      ensure => installed,
-    }
-  }
-
-  # Not using right now
-  package { [
+    'xul-ext-cookie-monster',
+    'xul-ext-quickproxy',
     'xul-ext-torbutton',
-    'vidalia',
     'xul-ext-perspectives',
     'xul-ext-greasemonkey',
+    'iceweasel-vimperator',
+    'mozilla-firefox-adblock',
+    'vidalia',
     'torchat',
-  ]:
-    ensure => absent,
-  }
-
-  package { [
-    'chromium',
-  ]:
-    ensure  => present,
-    name    => $::lsbdistcodename ? {
-      'wheezy' => 'chromium-browser',
-      default  => 'chromium',
-    },
-  }
-
-  # Wheezy (or newer) packages
-  if $::lsbdistcodename != 'squeeze' {
-    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',
-    ]:
-      ensure => absent,
-    }
-  }
-
-  # Jessie ownwards
-  #package { [
-  #  'xul-ext-pentadactyl',
-  #  'xul-ext-stylish',
-  #]:
-  #  ensure => installed,
-  #}
-
-  # Wheezy only
-  package { [
     'gftp',
     'icedtea6-plugin',
     'luakit',
   ]:
-    ensure => $::lsbdistcodename ? {
-      'lenny' => present,
-      default => absent,
-    },
-  }
-
-  # Lenny only
-  package { [
-    'mozilla-firefox-adblock',
-  ]:
-    ensure => $::lsbdistcodename ? {
-      'lenny' => present,
-      default => absent,
-    },
+    ensure => absent,
   }
 
   # Browser alternative
   file { "/etc/alternatives/x-www-browser":
-    ensure  => "/usr/bin/iceweasel",
+    ensure  => "/usr/bin/firefox-esr",
     owner   => root,
     group   => root,
     require => Package['iceweasel'],
@@ -162,7 +83,7 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
 
   # Browser alternative: manpage
   file { "/etc/alternatives/x-www-browser.1.gz":
-    ensure  => "/usr/share/man/man1/iceweasel.1.gz",
+    ensure  => "/usr/share/man/man1/firefox-esr.1.gz",
     owner   => root,
     group   => root,
     require => Package['iceweasel'],
diff --git a/manifests/utils/network/mail.pp b/manifests/utils/network/mail.pp
new file mode 100644
index 0000000..02287c3
--- /dev/null
+++ b/manifests/utils/network/mail.pp
@@ -0,0 +1,24 @@
+class nodo::utils::network::mail {
+  # Mail
+  package { [
+    'mutt',
+    'mutt-patched',
+    'muttprofile',
+    'notmuch-mutt',
+    'offlineimap',
+    'newsbeuter',
+    'bogofilter',
+    'fetchmail',
+    'procmail',
+    'msmtp',
+  ]:
+    ensure => installed,
+  }
+
+  # Fix: ensure that fetchmail is not a service
+  service { 'fetchmail':
+    ensure  => stopped,
+    enable  => false,
+    require => Package['fetchmail'],
+  }
+}