File tree 2 files changed +3
-2
lines changed
2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -54,7 +54,7 @@ def oracle_downloaded?(download_path, new_resource)
54
54
require 'digest'
55
55
if new_resource . checksum =~ /^[0-9a-f]{32}$/
56
56
downloaded_sha = Digest ::MD5 . file ( download_path ) . hexdigest
57
- downloaded_sha == new_resource . md5
57
+ downloaded_sha == new_resource . md5
58
58
else
59
59
downloaded_sha = Digest ::SHA256 . file ( download_path ) . hexdigest
60
60
downloaded_sha == new_resource . checksum
@@ -78,7 +78,7 @@ def download_direct_from_oracle(tarball_name, new_resource)
78
78
converge_by ( description ) do
79
79
Chef ::Log . debug "downloading oracle tarball straight from the source"
80
80
cmd = shell_out! (
81
- %Q[ curl --create-dirs -L --retry #{ new_resource . retries } --retry-delay #{ new_resource . retry_delay } --cookie "#{ cookie } " #{ new_resource . url } -o #{ download_path } ]
81
+ %Q[ curl --create-dirs -L --retry #{ new_resource . retries } --retry-delay #{ new_resource . retry_delay } --cookie "#{ cookie } " #{ new_resource . url } -o #{ download_path } --connect-timeout #{ new_resource . connect_timeout } ]
82
82
)
83
83
end
84
84
else
Original file line number Diff line number Diff line change 42
42
attribute :alternatives_priority , :kind_of => Integer , :default => 1
43
43
attribute :retries , :kind_of => Integer , :default => 0
44
44
attribute :retry_delay , :kind_of => Integer , :default => 2
45
+ attribute :connect_timeout , :kind_of => Integer , :default => 600 # => 10 minutes
45
46
46
47
# we have to set default for the supports attribute
47
48
# in initializer since it is a 'reserved' attribute name
You can’t perform that action at this time.
0 commit comments