diff --git a/manifests/oracle.pp b/manifests/oracle.pp index 5245c4b..f9580a1 100644 --- a/manifests/oracle.pp +++ b/manifests/oracle.pp @@ -50,6 +50,9 @@ # @param jce # Install Oracles Java Cryptographic Extensions into the JRE or JDK # +# @param jce_url +# Full URL to the jce zip file +# # @param basedir # Directory under which the installation will occur. If not set, defaults to # /usr/lib/jvm for Debian and /usr/java for RedHat. @@ -81,6 +84,7 @@ define java::oracle ( $url = undef, $url_hash = undef, $jce = false, + $jce_url = undef, $basedir = undef, $manage_basedir = false, $package_type = undef, @@ -97,11 +101,17 @@ define java::oracle ( } if $jce { - $jce_download = $version ? { - '8' => 'http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip', - '7' => 'http://download.oracle.com/otn-pub/java/jce/7/UnlimitedJCEPolicyJDK7.zip', - '6' => 'http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip', - default => undef + if $jce_url { + $jce_download = $jce_url + $cookie = undef + } else { + $jce_download = $version ? { + '8' => 'http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip', + '7' => 'http://download.oracle.com/otn-pub/java/jce/7/UnlimitedJCEPolicyJDK7.zip', + '6' => 'http://download.oracle.com/otn-pub/java/jce_policy/6/jce_policy-6.zip', + default => undef + } + $cookie = 'gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie' } } @@ -329,7 +339,7 @@ define java::oracle ( } archive { "/tmp/jce-${version}.zip": source => $jce_download, - cookie => 'gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie', + cookie => $cookie, extract => true, extract_path => $jce_path, extract_flags => '-oj', @@ -353,5 +363,4 @@ define java::oracle ( notice ("Action ${ensure} not supported.") } } - -} +} \ No newline at end of file