From c2d43ddc1b49aca23f6a9cf9d7006bb326310b07 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 24 Feb 2011 19:22:38 -0300 Subject: Cleanup --- manifests/subsystems/utils/debian.pp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'manifests') diff --git a/manifests/subsystems/utils/debian.pp b/manifests/subsystems/utils/debian.pp index 8584e5f..b15c421 100644 --- a/manifests/subsystems/utils/debian.pp +++ b/manifests/subsystems/utils/debian.pp @@ -1,6 +1,7 @@ class utils::personal::debian { # System - package { [ 'libpam-mount', 'ecryptfs-utils', 'openjdk-6-jre', 'gawk', ]: + package { [ 'libpam-mount', 'ecryptfs-utils', 'openjdk-6-jre', 'gawk', + 'sun-java6-jre', ]: ensure => installed, } @@ -25,7 +26,7 @@ class utils::personal::debian { 'sc', 'antiword', 'broffice.org', 'kalarm', 'texlive-latex-base', 'texlive-latex-recommended', 'texlive-latex-extra', 'pandoc', 'gnumeric', - 'cups-client', ]: + 'cups-client', 'hplip', ]: ensure => installed, } @@ -35,7 +36,7 @@ class utils::personal::debian { 'irssi-plugin-silc', 'bogofilter', 'fetchmail', 'procmail', 'msmtp', 'mairix', 'konqueror', 'bittorrent', 'irssi-scripts', 'links', 'twinkle', 'bittornado', - 'rtorrent', ]: + 'rtorrent', 'iceweasel', ]: ensure => installed, } @@ -57,10 +58,6 @@ class utils::personal::debian { ensure => installed, } - package { [ 'iceweasel', 'sun-java6-jre', 'hplip' ]: - ensure => installed, - } - # Java alternative file { "/etc/alternatives/java": ensure => "/usr/lib/jvm/java-6-sun/jre/bin/java", -- cgit v1.2.3