From 47205a5956d5caeefc0188d73dfc62d05ab16ab1 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 30 Jan 2013 17:59:09 -0200
Subject: Removing old and unused packages; adding vrms

---
 manifests/subsystems/utils/java.pp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'manifests/subsystems/utils/java.pp')

diff --git a/manifests/subsystems/utils/java.pp b/manifests/subsystems/utils/java.pp
index 903bc73..49f25ee 100644
--- a/manifests/subsystems/utils/java.pp
+++ b/manifests/subsystems/utils/java.pp
@@ -1,12 +1,16 @@
 class utils::java {
   # Java
   package { [ 'sun-java6-jre', 'openjdk-6-jre' ]:
-    ensure => installed,
+    ensure => absent,
+  }
+
+  package { 'default-jre':
+    ensure => present,
   }
 
   # Java alternative
   file { "/etc/alternatives/java":
-    ensure  => "/usr/lib/jvm/java-6-sun/jre/bin/java",
+    ensure  => "/usr/lib/jvm/java-6-openjdk/jre/bin/java",
     owner   => root,
     group   => root,
     require => Package['sun-java6-jre'],
-- 
cgit v1.2.3