Major refactor

1 files changed, 80 insertions, 0 deletions

diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
new file mode 100644
index 0000000..196038a
--- /dev/null
+++ b/manifests/utils/network.pp
@@ -0,0 +1,80 @@
+class nodo::utils::network inherits nodo::utils::network::minimal {
+  # Network
+  package { [ 'mutt',               'offlineimap',           
+              'newsbeuter',         'nicotine',              'sshfs',
+              'bogofilter',         'fetchmail',             'procmail',
+              'msmtp',              'mairix',                'notmuch-mutt',
+              'links',              'gftp',                  'iceweasel',
+              'openvpn',            'pssh',                  'mutt-patched',
+              'pidgin',             'pidgin-encryption',     'pidgin-openpgp',
+              'pidgin-otr',         'pidgin-privacy-please', 'pidgin-plugin-pack',
+              'sslscan',            'muttprofile',           'connect-proxy',
+              'avahi-discover',     'mdns-scan' ]:
+    ensure => installed,
+  }
+
+  # Fix: ensure that fetchmail is not a service
+  service { 'fetchmail':
+    ensure  => stopped,
+    enable  => false,
+    require => Package['fetchmail'],
+  }
+
+  # Old packages
+  # About firegpg, see http://tails.boum.org/bugs/FireGPG_may_be_unsafe/
+  package { [ 'silc', 'twinkle', 'konqueror', 'transmission', 'amule', 'epiphany-browser',
+              'bittorrent', 'bittornado', 'xul-ext-firegpg' ]:
+    ensure => absent,
+  }
+
+  # Squeeze (or newer) packages
+  if $::lsbdistcodename != 'lenny' {
+    package { [ 'xul-ext-monkeysphere', 'chromium-browser', 'libical-parser-perl',
+                'maildir-utils',        'icedtea6-plugin',  'xul-ext-adblock-plus',
+                'xul-ext-noscript',     'xul-ext-firebug' ]:
+      ensure => installed,
+    }
+
+    # Not using right now
+    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',
+                'xul-ext-requestpolicy' ]:
+      ensure => installed,
+    }
+
+    package { [ 'torchat' ]:
+      ensure => installed,
+    }
+  }
+
+  # Lenny only
+  package { [ 'mozilla-firefox-adblock' ]:
+    ensure => $::lsbdistcodename ? {
+      'lenny' => present,
+      default => absent,
+    },
+  }
+
+  # Browser alternative
+  file { "/etc/alternatives/x-www-browser":
+    ensure  => "/usr/bin/iceweasel",
+    owner   => root,
+    group   => root,
+    require => Package['iceweasel'],
+  }
+
+  # Browser alternative: manpage
+  file { "/etc/alternatives/x-www-browser.1.gz":
+    ensure  => "/usr/share/man/man1/iceweasel.1.gz",
+    owner   => root,
+    group   => root,
+    require => Package['iceweasel'],
+  }
+}