Commit ae9a6dfa authored by Russ Allbery's avatar Russ Allbery Committed by Patrick Radtke
Browse files

Use openjdk-6-jdk on wheezy 

wheezy doesn't have the Sun Java, so use OpenJDK for java::v6 on
wheezy.
parent 98a96fa8

manifests/v6.pp

+16 −9
Original line number Diff line number Diff line
@@ -23,6 +23,12 @@ class java::v6 { 
            }

        }

        'debian': {

            if $::lsbdistcodename == 'wheezy' {

                package { 'openjdk-6-jdk':

                    ensure => present,

                    alias  => 'java6',

                }

            } else {

                preseed_debconf { 'preseed-sun-java6':

                    answer => 'sun-java6-bin.+shared/accepted-sun-dlj-v1-1.+true',

                    source => 'puppet:///java/preseed-sun-java6';
@@ -34,6 +40,7 @@ class java::v6 { 
                    alias   => 'java6',

                }

            }

        }

         'ubuntu': {



            package { 'openjdk-6-jdk':