diff options
| -rw-r--r-- | manifests/subsystems/utils.pp | 2 | ||||
| -rw-r--r-- | manifests/subsystems/utils/java.pp | 8 | ||||
| -rw-r--r-- | manifests/subsystems/utils/multimedia.pp | 13 |
3 files changed, 16 insertions, 7 deletions
diff --git a/manifests/subsystems/utils.pp b/manifests/subsystems/utils.pp index 9d0b8b4..e444f7f 100644 --- a/manifests/subsystems/utils.pp +++ b/manifests/subsystems/utils.pp @@ -2,7 +2,7 @@ class utils { package { [ 'screen', 'less', 'bzip2', 'openssl', 'lynx', 'wget', 'unzip', 'nmap', 'telnet', 'tree', 'whois', 'dosfstools', 'dnsutils', - 'bc', 'lsof', 'wipe' ]: + 'bc', 'lsof', 'wipe', 'vrms' ]: ensure => installed, } 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'], diff --git a/manifests/subsystems/utils/multimedia.pp b/manifests/subsystems/utils/multimedia.pp index 246de76..03675ef 100644 --- a/manifests/subsystems/utils/multimedia.pp +++ b/manifests/subsystems/utils/multimedia.pp @@ -19,16 +19,21 @@ class utils::multimedia { 'gqview', 'mpg123', 'audacious', 'qjackctl', 'gimp', 'xine-ui', 'amarok', 'wodim', 'genisoimage', 'dvd+rw-tools', 'inkscape', 'jhead', - 'easytag', 'flashplugin-nonfree', 'vlc', 'audacity', - 'opencubicplayer', 'moc', 'cmus', 'orpheus', + 'easytag', 'gstreamer-tools', 'vlc', 'audacity', + 'opencubicplayer', 'moc', 'cmus', 'youtube-dl', 'cbrpager', 'llgal', 'darksnow', 'mplayer', 'picard', 'ffmpeg2theora', 'oggfwd', 'libasound2-plugins', - 'mencoder', 'v4l-utils', 'gstreamer-tools', 'youtube-dl' ]: + 'mencoder', 'v4l-utils' ]: ensure => installed, } + # Old stuff + package { 'flashplugin-nonfree', + ensure => absent, + } + # Squeeze only - package { 'tucan': + package { [ 'tucan', 'orpheus' ]: ensure => $::lsbdistcodename ? { 'squeeze' => installed, default => absent, |