Skip to content

Add proxy support and change S3 uri to use virtual hosting #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 18, 2015
Merged

Add proxy support and change S3 uri to use virtual hosting #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions bin/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ begin
def usage
print <<EOF

install [--sanity-check] <package-type>
install [--sanity-check] [--proxy http://hostname:port] <package-type>
--sanity-check [optional]
--proxy [optional]
package-type: 'rpm', 'deb', or 'auto'

Installs fetches the latest package version of the specified type and
Expand All @@ -72,6 +73,9 @@ the gdebi will be installed using apt-get first.
If --sanity-check is specified, the install script will wait for 3 minutes post installation
to check for a running agent.

To use a HTTP proxy, specify --proxy followed by the proxy server
defined by http://hostname:port

This install script needs Ruby version 2.0.x installed as a prerequisite.
If you do not have Ruby version 2.0.x installed, please install it first.

Expand Down Expand Up @@ -116,9 +120,10 @@ EOF

@sanity_check = false
@reexeced = false
@http_proxy = nil

@args = Array.new(ARGV)
opts = GetoptLong.new(['--sanity-check', GetoptLong::NO_ARGUMENT], ['--help', GetoptLong::NO_ARGUMENT], ['--re-execed', GetoptLong::NO_ARGUMENT])
opts = GetoptLong.new(['--sanity-check', GetoptLong::NO_ARGUMENT], ['--help', GetoptLong::NO_ARGUMENT], ['--re-execed', GetoptLong::NO_ARGUMENT], ['--proxy', GetoptLong::OPTIONAL_ARGUMENT])
opts.each do |opt, args|
case opt
when '--sanity-check'
Expand All @@ -127,6 +132,10 @@ EOF
usage
when '--re-execed'
@reexeced = true
when '--proxy'
if (args != '')
@http_proxy = args
end
end
end
if (ARGV.length < 1)
Expand Down Expand Up @@ -209,9 +218,9 @@ EOF

def get_s3_uri(region, bucket, key)
if (region == 'us-east-1')
URI.parse("https://s3.amazonaws.com/#{bucket}/#{key}")
URI.parse("https://#{bucket}.s3.amazonaws.com/#{key}")
else
URI.parse("https://s3-#{region}.amazonaws.com/#{bucket}/#{key}")
URI.parse("https://#{bucket}.s3-#{region}.amazonaws.com/#{key}")
end
end

Expand All @@ -222,7 +231,7 @@ EOF

# stream package file to disk
begin
uri.open(:ssl_verify_mode => OpenSSL::SSL::VERIFY_PEER, :redirect => true, :read_timeout => 120) do |s3|
uri.open(:ssl_verify_mode => OpenSSL::SSL::VERIFY_PEER, :redirect => true, :read_timeout => 120, :proxy => @http_proxy) do |s3|
package_file.write(s3.read)
end
rescue OpenURI::HTTPError => e
Expand All @@ -239,7 +248,7 @@ EOF
begin
require 'json'

version_string = uri.read(:ssl_verify_mode => OpenSSL::SSL::VERIFY_PEER, :redirect => true, :read_timeout => 120)
version_string = uri.read(:ssl_verify_mode => OpenSSL::SSL::VERIFY_PEER, :redirect => true, :read_timeout => 120, :proxy => @http_proxy)
JSON.parse(version_string)
rescue OpenURI::HTTPError => e
@log.error("Could not find version file to download at '#{uri.to_s}'")
Expand Down