]> gitweb.fluxo.info Git - puppet-nodo.git/commitdiff
Managing java alternative just on debian boxes
authorSilvio Rhatto <rhatto@riseup.net>
Mon, 14 Feb 2011 15:59:23 +0000 (13:59 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Mon, 14 Feb 2011 15:59:23 +0000 (13:59 -0200)
manifests/subsystems/utils.pp

index ff9edf16bb08d7d93a67753726e7b8dddda8b9a6..92e606b622f0989c90ecef6f0a189ac2be246cf0 100644 (file)
@@ -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,