aboutsummaryrefslogtreecommitdiff
path: root/manifests/subsystems/utils/debian.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/subsystems/utils/debian.pp')
-rw-r--r--manifests/subsystems/utils/debian.pp32
1 files changed, 24 insertions, 8 deletions
diff --git a/manifests/subsystems/utils/debian.pp b/manifests/subsystems/utils/debian.pp
index a8f2b9d..0d74beb 100644
--- a/manifests/subsystems/utils/debian.pp
+++ b/manifests/subsystems/utils/debian.pp
@@ -65,14 +65,6 @@ class utils::personal::debian {
ensure => installed,
}
- # Java alternative
- file { "/etc/alternatives/java":
- ensure => "/usr/lib/jvm/java-6-sun/jre/bin/java",
- owner => root,
- group => root,
- require => Package['sun-java6-jre'],
- }
-
# Lenny only
package { [ 'mozilla-firefox-adblock' ]:
ensure => $lsbdistcodename ? {
@@ -142,4 +134,28 @@ class utils::personal::debian {
group => root,
require => Package['flashplugin-nonfree'],
}
+
+ # 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'],
+ }
+
+ # Java alternative
+ file { "/etc/alternatives/java":
+ ensure => "/usr/lib/jvm/java-6-sun/jre/bin/java",
+ owner => root,
+ group => root,
+ require => Package['sun-java6-jre'],
+ }
}