Merge branch 'master' of https://github.com/elmer/ec2-boot-init into …

…elmer-master
ripienaar · Feb 1, 2011 · b712a79 · b712a79
2 parents ca9d387 + 82730cb
commit b712a79
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/ec2-boot-init.init b/ec2-boot-init.init
@@ -2,7 +2,7 @@
 #
 # ec2-boot-init	Bootstrapper for EC2
 #
-# chkconfig: 345 24 76
+# chkconfig: 345 60 76
 #
 # description: Bootstraps EC2 instances in a way that enables you to
 #              customise a standard image into different configurations

diff --git a/lib/ec2boot.rb b/lib/ec2boot.rb
@@ -1,4 +1,5 @@
 require 'net/http'
+require 'net/https'
 require 'yaml'
 require 'fileutils'
 

diff --git a/lib/ec2boot/util.rb b/lib/ec2boot/util.rb
@@ -12,6 +12,7 @@ class Util
         def self.get_url(url, file=nil)
             uri = URI.parse(url)
             http = Net::HTTP.new(uri.host, uri.port)
+            http.use_ssl = (uri.scheme == 'https')
 
             retries = 5