Add proxy support via class parameters

* proxy_server
* proxy_type

Closes #29

Author: antoineco

README.md

@@ -92,6 +92,15 @@ class { 'oracle_java':
 }
 ```
 
+Download Java archives behind a proxy server
+
+```puppet
+class { 'oracle_java':
+  …
+  proxy_server => 'http://user:[email protected]:8080'
+}
+```
+
 ##Usage
 
 ###Classes and Defined Types
@@ -139,6 +148,14 @@ Do not download the Oracle Java archive from Oracle servers, instead use an alte
 
 Custom MD5 checksum used to verify the archive integrity. Optional. Defaults to the checksum provided by Oracle
 
+#####`proxy_server`
+
+URL of a proxy server used for downloading Java archives
+
+#####`proxy_type`
+
+Type of the proxy server. Valid values are `none`, `http`, `https` and `ftp`. Optional. Default determined by the scheme used in `proxy_server`
+
 ####Define: `oracle_java::installation`
 
 Installs an extra version of Oracle Java in `install_path`

manifests/download.pp

@@ -21,6 +21,14 @@
     group  => 'root'
   }
 
+  Archive {
+    cookie       => 'oraclelicense=accept-securebackup-cookie',
+    source       => $oracle_java::downloadurl,
+    proxy_server => $oracle_java::proxy_server,
+    proxy_type   => $oracle_java::proxy_type,
+    require      => File[$oracle_java::install_path]
+  }
+
   # with checksum check
   if $oracle_java::check_checksum {
     include oracle_java::checksums # get checksums list
@@ -33,20 +41,13 @@
   # download archive
   if $oracle_java::format_real == 'rpm' or $oracle_java::maj_version == '6' {
     archive { "${oracle_java::install_path}/${oracle_java::filename}":
-      #provider => 'curl',
-      cookie  => 'oraclelicense=accept-securebackup-cookie',
-      source  => $oracle_java::downloadurl,
       cleanup => false,
-      require => File[$oracle_java::install_path]
+      extract => false
     }
   } else {
     # also extract and clean up if tar.gz
     archive { "${oracle_java::install_path}/${oracle_java::filename}":
-      #provider     => 'curl',
-      cookie       => 'oraclelicense=accept-securebackup-cookie',
-      source       => $oracle_java::downloadurl,
       cleanup      => true,
-      require      => File[$oracle_java::install_path],
       extract      => true,
       extract_path => $oracle_java::install_path,
       creates      => "${oracle_java::install_path}/${oracle_java::longversion}"

manifests/init.pp

@@ -22,6 +22,10 @@
 #   fetch the package from an alternative URL
 # [*custom_checksum*]
 #   use a custom checksum to verify the archive integrity
+# [*proxy_server*]
+#   proxy server url
+# [*proxy_type*]
+#   proxy server type (valid: 'none'|'http'|'https'|'ftp')
 #
 # === Actions:
 #
@@ -50,7 +54,9 @@
   $add_system_env      = false,
   $install_path        = '/usr/java',
   $custom_download_url = undef,
-  $custom_checksum     = undef
+  $custom_checksum     = undef,
+  $proxy_server        = undef,
+  $proxy_type          = undef
   ) {
   if !$format {
     if $::osfamily =~ /RedHat|Suse/ or $::operatingsystem == 'Mageia' {

manifests/installation.pp

@@ -16,6 +16,10 @@
 #   fetch the package from an alternative URL
 # [*custom_checksum*]
 #   use a custom checksum to verify the archive integrity
+# [*proxy_server*]
+#   proxy server url
+# [*proxy_type*]
+#   proxy server type (valid: 'none'|'http'|'https'|'ftp')
 #
 # === Actions:
 #
@@ -38,7 +42,9 @@
   $check_checksum      = true,
   $add_alternative     = false,
   $custom_download_url = undef,
-  $custom_checksum     = undef
+  $custom_checksum     = undef,
+  $proxy_server        = undef,
+  $proxy_type          = undef
   ) {
 
   # The base class must be included first
@@ -460,23 +466,24 @@
     }
   }
 
+  Archive {
+    cookie       => 'oraclelicense=accept-securebackup-cookie',
+    source       => $downloadurl,
+    proxy_server => $proxy_server,
+    proxy_type   => $proxy_type,
+    require      => File[$install_path]
+  }
+
   # download archive
   if $maj_version == '6' {
     archive { "${install_path}/${filename}":
-      #provider => 'curl',
-      cookie  => 'oraclelicense=accept-securebackup-cookie',
-      source  => $downloadurl,
       cleanup => false,
-      require => File[$install_path]
+      extract => false
     }
   } else {
     # also extract and clean up if tar.gz
     archive { "${install_path}/${filename}":
-      #provider     => 'curl',
-      cookie       => 'oraclelicense=accept-securebackup-cookie',
-      source       => $downloadurl,
       cleanup      => true,
-      require      => File[$install_path],
       extract      => true,
       extract_path => $install_path,
       creates      => "${install_path}/${longversion}"