v2.1.0

* Added checksum check on downloaded archive
* New `check_checksum` parameter
* Refactoring
* Better support of Mageia Linux

Author: antoineco

CHANGELOG.md

@@ -1,3 +1,11 @@
+###2.1.0
+
+* Added checksum check on downloaded archive
+  * Java 7u60+ only for now. Contact me if you want to **HELP** me supporting older versions :)
+* New `check_checksum` parameter
+* Refactoring
+* Better support of Mageia Linux
+
 ###2.0.0
 
 * Support tar.gz format

README.md

@@ -20,7 +20,7 @@ This module downloads the desired Java version from Oracle's website and install
 
 Java SE archives are available from the Oracle [Java SE Downloads](http://www.oracle.com/technetwork/java/javase/downloads/index.html) and Oracle [Java Archive](http://www.oracle.com/technetwork/java/archive-139210.html) pages.
 
-This module is suitable for pretty much any Linux system. It currently supports all released versions from Java SE 7 on.
+This module is suitable for pretty much any Linux system. It currently supports all released Java SE versions from JSE 7 on.
 
 ##Setup
 
@@ -70,6 +70,15 @@ class { '::oracle_java':
 }
 ```
 
+Disable checksum validation
+
+```puppet
+class { '::oracle_java':
+  …
+  check_checksum => false
+}
+```
+
 ##Usage
 
 ####Class: `oracle_java`
@@ -92,9 +101,12 @@ What envionment type to install. Valid values are 'jre' and 'jdk'. Defaults to '
 
 What format of installation archive to retrieve. Valid values are 'rpm' and 'tar.gz'. Default depends on the platform
 
+#####`check_checksum`
+Enable checksum validation on downloaded archives. Boolean value. Defaults to 'true'
+
 ##Limitations
 
-* Prior to Java 8u20, two different releases of the same Java series could not cohabit on the same system when installed from RPM. Each new version would override the previous one. This does not happen with tar.gz archives.
+* Prior to Java 8u20, two different releases of the same Java series could not cohabit on the same system when installed from RPM. Each new version would override the previous one. This does not happen with tar.gz archives however.
 
 ##Credits
 

manifests/checksums.pp

@@ -1,26 +1,52 @@
 # == Class: oracle_java::download
+#
+# This class is used to download and check the appropriate Java archive file
+#
 class oracle_java::download {
   # The base class must be included first
   if !defined(Class['oracle_java']) {
     fail('You must include the oracle_java base class before using any oracle_java sub class')
   }
 
-  # get checksums list
-  include oracle_java::checksums
-
   # make sure install/download directory exists
   file { '/usr/java':
     ensure => directory,
     mode   => '0755',
     owner  => 'root',
     group  => 'root'
-  } ->
+  }
+
+  # get checksums list
+  include oracle_java::checksums
+
   # download archive
-  archive { "/usr/java/${oracle_java::filename}":
-    cookie        => "oraclelicense=accept-securebackup-cookie",
-    source        => $oracle_java::downloadurl,
-    checksum      => $oracle_java::checksums::checksum,
-    checksum_type => 'md5',
-    cleanup       => false
+  # WITH checksum check
+  if $oracle_java::check_checksum {
+    # TEMPORARY CONDITIONAL BLOCK, until I finally gather checksums for all supported Java versions
+    if $oracle_java::maj_version == '8' or ($oracle_java::maj_version == '7' and $oracle_java::min_version >= '60') {
+      archive { "/usr/java/${oracle_java::filename}":
+        cookie        => "oraclelicense=accept-securebackup-cookie",
+        source        => $oracle_java::downloadurl,
+        checksum      => $oracle_java::checksums::checksum,
+        checksum_type => 'md5',
+        cleanup       => false,
+        require       => File['/usr/java']
+      }
+    } else {
+      archive { "/usr/java/${oracle_java::filename}":
+        cookie  => "oraclelicense=accept-securebackup-cookie",
+        source  => $oracle_java::downloadurl,
+        cleanup => false,
+        require => File['/usr/java']
+      }
+    }
+  } else {
+    # WITHOUT checksum check
+    archive { "/usr/java/${oracle_java::filename}":
+      cookie  => "oraclelicense=accept-securebackup-cookie",
+      source  => $oracle_java::downloadurl,
+      cleanup => false,
+      require => File['/usr/java']
+    }
   }
 }

manifests/download.pp

@@ -10,6 +10,8 @@
 #   envionment type to install (valid: 'jre'|'jdk')
 # [*format*]
 #   archive format (valid: 'rpm'|'tar.gz')
+# [*check_checksum*]
+#   enable checksum validation on downloaded archives (boolean)
 #
 # === Actions:
 #
@@ -29,11 +31,12 @@
 #    format  => 'rpm'
 #  }
 #
-class oracle_java ($version = '8', $type = 'jre', $format = undef) {
+class oracle_java ($version = '8', $type = 'jre', $format = undef, $check_checksum = true) {
   if !$format {
-    case $::osfamily {
-      /RedHat|Suse/ : { $format_real = 'rpm' }
-      default       : { $format_real = 'tar.gz' }
+    if $::osfamily =~ /RedHat|Suse/ or $::operatingsystem == 'Mageia' {
+      $format_real = 'rpm'
+    } else {
+      $format_real = 'tar.gz'
     }
   } else {
     $format_real = $format
@@ -43,6 +46,7 @@
   validate_re($version, '^([0-9]|[0-9]u[0-9]{1,2})$', '$version must be formated as \'major\'u\'minor\' or just \'major\'')
   validate_re($type, '^(jre|jdk)$', '$type must be either \'jre\' or \'jdk\'')
   validate_re($format_real, '^(rpm|tar\.gz)$', '$format must be either \'rpm\' or \'tar.gz\'')
+  validate_bool($check_checksum)
 
   # set to latest release if no minor version was provided
   if $version == '8' {
@@ -52,33 +56,42 @@
   } else {
     $version_real = $version
   }
-  
+
   # translate system architecture to expected value
   case $::architecture {
     /x86_64|amd64/ : { $arch = 'x64' }
     'x86'          : { $arch = 'i586' }
     default        : { fail("oracle_java does not support architecture ${::architecture} (yet)") }
   }
 
-  # determine build numbers, checksums, etc.
-  include oracle_java::javalist
+  # get major/minor version numbers
+  $array_version = split($version_real, 'u')
+  $maj_version = $array_version[0]
+  $min_version = $array_version[1]
+
+  # remove extra particle if minor version is 0
+  $version_final = delete($oracle_java::version_real, 'u0')
+  $longversion = $min_version ? {
+    '0'       => "${oracle_java::type}1.${maj_version}.0",
+    /^[0-9]$/ => "${oracle_java::type}1.${maj_version}.0_0${min_version}",
+    default   => "${oracle_java::type}1.${maj_version}.0_${min_version}"
+  }
 
-  # define installer filename and download URL
-  $filename = "${type}-${oracle_java::javalist::version_final}-linux-${arch}.${format_real}"
-  $downloadurl = "http://download.oracle.com/otn-pub/java/jdk/${oracle_java::javalist::version_final}${oracle_java::javalist::build}/${filename}"
+  # define installer filename
+  $filename = "${type}-${version_final}-linux-${arch}.${format_real}"
+
+  # define download URL
+  include oracle_java::javalist
+  $downloadurl = "http://download.oracle.com/otn-pub/java/jdk/${version_final}${oracle_java::javalist::build}/${filename}"
 
   # define package name
-  if $oracle_java::javalist::maj_version == '8' and $oracle_java::javalist::min_version >= '20' {
-    $packagename = $oracle_java::javalist::longversion
+  if $maj_version == '8' and $min_version >= '20' {
+    $packagename = $longversion
   } else {
     $packagename = $type
   }
 
-  # include classes as required
-  if !defined(Class['archive']) {
-    include archive
-  }
-
+  # annnnd... let's go
   include oracle_java::download
   include oracle_java::install
   Class['oracle_java::download'] ~> Class['oracle_java::install']

manifests/init.pp

@@ -1,10 +1,18 @@
 # == Class: oracle_java::install
+#
+# This class is a wrapper to either install or extract the downloaded Java archive file
+#
 class oracle_java::install {
   # The base class must be included first
   if !defined(Class['oracle_java']) {
     fail('You must include the oracle_java base class before using any oracle_java sub class')
   }
 
+  # dependency
+  if !defined(Class['archive']) {
+    include archive
+  }
+
   case $oracle_java::format_real {
     'rpm'    : { contain oracle_java::install::rpm }
     'tar.gz' : { contain oracle_java::install::targz }

manifests/install.pp

@@ -1,4 +1,7 @@
 # == Class: oracle_java::install::rpm
+#
+# This class is used to install the RPM version of Java
+#
 class oracle_java::install::rpm {
   # The base class must be included first
   if !defined(Class['oracle_java']) {

manifests/install/rpm.pp

@@ -1,4 +1,7 @@
 # == Class: oracle_java::install::targz
+#
+# This class is used to extract the tar.gz version of Java
+#
 class oracle_java::install::targz {
   # The base class must be included first
   if !defined(Class['oracle_java']) {

manifests/install/targz.pp

@@ -1,14 +1,12 @@
 # == Class: oracle_java::javalist
+#
+# This class associates a Java version number with its build number
+#
 class oracle_java::javalist {
-  # get major/minor version numbers
-  $array_version = split($oracle_java::version_real, 'u')
-  $maj_version = $array_version[0]
-  $min_version = $array_version[1]
-
   # associate build number to release version
-  case $maj_version {
+  case $oracle_java::maj_version {
     8       : {
-      case $min_version {
+      case $oracle_java::min_version {
         '25'    : { $build = '-b17' }
         '20'    : { $build = '-b26' }
         '11'    : { $build = '-b12' }
@@ -18,7 +16,7 @@
       }
     }
     7       : {
-      case $min_version {
+      case $oracle_java::min_version {
         '72'    : { $build = '-b14' }
         '71'    : { $build = '-b14' }
         '67'    : { $build = '-b01' }
@@ -48,15 +46,7 @@
       }
     }
     default : {
-      fail("oracle_java module does not support Java SE version ${maj_version} (yet)")
+      fail("oracle_java module does not support Java SE version ${oracle_java::maj_version} (yet)")
     }
   }
-
-  # remove extra particle if minor version is 0
-  $version_final = delete($oracle_java::version_real, 'u0')
-  $longversion = $min_version ? {
-    '0'       => "${oracle_java::type}1.${maj_version}.0",
-    /^[0-9]$/ => "${oracle_java::type}1.${maj_version}.0_0${min_version}",
-    default   => "${oracle_java::type}1.${maj_version}.0_${min_version}"
-  }
 }

manifests/javalist.pp

@@ -5,8 +5,8 @@
   "project_page": "https://github.com/tOnI0/aco-oracle_java",
   "source": "git://github.com/tOnI0/aco-oracle_java.git",
   "summary": "Puppet module to install Oracle Java on Linux systems",
-  "version": "2.0.0",
-  "tags": ["rpm","jre","jdk","oracle","java"],
+  "version": "2.1.0",
+  "tags": ["jre","jdk","oracle","java"],
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
@@ -125,13 +125,10 @@
       ]
     },
     {
-      "operatingsystem": "Mageia"
-    },
-    {
-      "operatingsystem": "Mandriva"
-    },
-    {
-      "operatingsystem": "Mandrake"
+      "operatingsystem": "Mageia",
+      "operatingsystemrelease": [
+        "4"
+      ]
     }
   ]
 }