aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-02-24 19:22:38 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-02-24 19:22:38 -0300
commitc2d43ddc1b49aca23f6a9cf9d7006bb326310b07 (patch)
tree5ec7793b59190ccee2d5d678b599ecdf0c7f9aa8
parentfa46b18927b5672a96611a37938e3bd6a842c5fe (diff)
downloadpuppet-nodo-c2d43ddc1b49aca23f6a9cf9d7006bb326310b07.tar.gz
puppet-nodo-c2d43ddc1b49aca23f6a9cf9d7006bb326310b07.tar.bz2
Cleanup
-rw-r--r--manifests/subsystems/utils/debian.pp11
1 files changed, 4 insertions, 7 deletions
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",