aboutsummaryrefslogtreecommitdiff
path: root/manifests/utils/network.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/utils/network.pp')
-rw-r--r--manifests/utils/network.pp15
1 files changed, 12 insertions, 3 deletions
diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
index cd64f93..0b50a8c 100644
--- a/manifests/utils/network.pp
+++ b/manifests/utils/network.pp
@@ -11,7 +11,7 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
'sslscan', 'muttprofile', 'connect-proxy',
'avahi-discover', 'mdns-scan', 'davfs2',
'surfraw', 'w3m', 'mailplate',
- 'geoip-bin', 'luakit', 'ssvnc',
+ 'geoip-bin', 'ssvnc',
'rig', 'sup-mail', 'iceweasel-vimperator' ]:
ensure => installed,
}
@@ -33,7 +33,7 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
# Squeeze (or newer) packages
if $::lsbdistcodename != 'lenny' {
- package { [ 'xul-ext-monkeysphere', 'chromium-browser', 'libical-parser-perl',
+ package { [ 'xul-ext-monkeysphere', 'libical-parser-perl',
'maildir-utils', 'xul-ext-noscript',
'xul-ext-firebug', 'msva-perl', 'chromium-l10n' ]:
ensure => installed,
@@ -45,6 +45,15 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
}
}
+ 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', 'xul-ext-requestpolicy' ]:
@@ -68,7 +77,7 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
#}
# Wheezy only
- package { [ 'gftp', 'icedtea6-plugin' ]:
+ package { [ 'gftp', 'icedtea6-plugin', 'luakit' ]:
ensure => $::lsbdistcodename ? {
'lenny' => present,
default => absent,