aboutsummaryrefslogtreecommitdiff
path: root/manifests/subsystems/utils/network.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/subsystems/utils/network.pp')
-rw-r--r--manifests/subsystems/utils/network.pp19
1 files changed, 7 insertions, 12 deletions
diff --git a/manifests/subsystems/utils/network.pp b/manifests/subsystems/utils/network.pp
index 6604067..0a0e9c9 100644
--- a/manifests/subsystems/utils/network.pp
+++ b/manifests/subsystems/utils/network.pp
@@ -34,22 +34,22 @@ class utils::network::minimal {
class utils::network inherits utils::network::minimal {
# Network
- package { [ 'mutt', 'offlineimap', 'epiphany-browser',
+ package { [ 'mutt', 'offlineimap',
'newsbeuter', 'nicotine', 'sshfs',
'bogofilter', 'fetchmail', 'procmail',
'msmtp', 'mairix', 'notmuch-mutt',
- 'bittorrent', 'links', 'gftp',
- 'bittornado', 'iceweasel', 'transmission',
- 'openvpn', 'amule', 'pssh',
+ 'links', 'gftp', 'iceweasel',
+ 'openvpn', 'pssh', 'mutt-patched'
'pidgin', 'pidgin-encryption', 'pidgin-openpgp',
'pidgin-otr', 'pidgin-privacy-please', 'pidgin-plugin-pack',
- 'sslscan', 'muttprofile', 'connect-proxy',
- 'mutt-patched' ]:
+ 'sslscan', 'muttprofile', 'connect-proxy' ]:
ensure => installed,
}
# Old packages
- package { [ 'silc', 'twinkle', 'konqueror']:
+ # 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,
}
@@ -61,11 +61,6 @@ class utils::network inherits utils::network::minimal {
ensure => installed,
}
- # See http://tails.boum.org/bugs/FireGPG_may_be_unsafe/
- package { 'xul-ext-firegpg':
- ensure => absent,
- }
-
# Not using right now
package { [ 'xul-ext-torbutton', 'vidalia', 'xul-ext-perspectives', 'xul-ext-greasemonkey' ]:
ensure => absent,