aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-02-14 13:59:23 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-02-14 13:59:23 -0200
commitf3f36d795eda489212ea20638f8b7db177f4e6be (patch)
treec5717c7e724e61165d42a02be15e73de291b2c14
parent7401b7b6f2d6b7483308aa302cc1847bfe3c2e9d (diff)
downloadpuppet-nodo-f3f36d795eda489212ea20638f8b7db177f4e6be.tar.gz
puppet-nodo-f3f36d795eda489212ea20638f8b7db177f4e6be.tar.bz2
Managing java alternative just on debian boxes
-rw-r--r--manifests/subsystems/utils.pp17
1 files changed, 9 insertions, 8 deletions
diff --git a/manifests/subsystems/utils.pp b/manifests/subsystems/utils.pp
index ff9edf1..92e606b 100644
--- a/manifests/subsystems/utils.pp
+++ b/manifests/subsystems/utils.pp
@@ -76,6 +76,14 @@ class utils::personal {
package { [ 'mozilla-firefox-adblock', 'iceweasel', 'sun-java6-jre', 'hplip' ]:
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'],
+ }
}
default: { }
}
@@ -121,14 +129,7 @@ class utils::personal {
}
}
- # App alternatives
- file { "/etc/alternatives/java":
- ensure => "/usr/lib/jvm/java-6-sun/jre/bin/java",
- owner => root,
- group => root,
- require => Package['sun-java6-jre'],
- }
-
+ # Flash alternative
file { "/etc/alternatives/flash-mozilla.so":
ensure => "/usr/lib/flashplugin-nonfree/libflashplayer.so",
owner => root,