ec2launcher 1.0.31 → 1.0.32

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.32
+
+* Copied Alestic's runurl script to avoid problems with LaunchPad is down. Switched to using ec2launcher's copy of runurl.
+
 ## 1.0.31
 
 * Added support for pre/post commands to applications. Useful for installing webapps.

data/lib/ec2launcher.rb

@@ -399,7 +399,7 @@ module EC2Launcher
       # ELB
       ##############################
       unless elb_name.nil?
-        instances.each {|instance| attach_to_elb(instance, elb_name) }
+        instances.each {|instance| attach_to_elb(instance, elb_name, ec2_subnet) }
       end
 
       ##############################
@@ -412,34 +412,37 @@ module EC2Launcher
     #
     # @param [AWS::EC2::Instance] instance newly created EC2 instance.
     # @param [String] elb_name name of ELB.
+    # @param [String] subnet subnet name or id. Defaults to nil.
     #
-    def attach_to_elb(instance, elb_name)
+    def attach_to_elb(instance, elb_name, subnet = nil)
       begin
         @log.info ""
         @log.info "Adding to ELB: #{elb_name}"
         elb = AWS::ELB.new
         AWS.memoize do
-          # Build list of availability zones for any existing instances
-          zones = { }
-          zones[instance.availability_zone] = instance.availability_zone
-          elb.load_balancers[elb_name].instances.each do |elb_instance|
-            zones[elb_instance.availability_zone] = elb_instance.availability_zone
-          end
-      
-          # Build list of existing zones
-          existing_zones = { }
-          elb.load_balancers[elb_name].availability_zones.each do |zone|
-            existing_zones[zone.name] = zone
-          end
-      
-          # Enable zones
-          zones.keys.each do |zone_name|
-            elb.load_balancers[elb_name].availability_zones.enable(zones[zone_name])
-          end
-      
-          # Disable zones
-          existing_zones.keys.each do |zone_name|
-            elb.load_balancers[elb_name].availability_zones.disable(existing_zones[zone_name]) unless zones.has_key?(zone_name)
+          unless subnet
+            # Build list of availability zones for any existing instances
+            zones = { }
+            zones[instance.availability_zone] = instance.availability_zone
+            elb.load_balancers[elb_name].instances.each do |elb_instance|
+              zones[elb_instance.availability_zone] = elb_instance.availability_zone
+            end
+        
+            # Build list of existing zones
+            existing_zones = { }
+            elb.load_balancers[elb_name].availability_zones.each do |zone|
+              existing_zones[zone.name] = zone
+            end
+        
+            # Enable zones
+            zones.keys.each do |zone_name|
+              elb.load_balancers[elb_name].availability_zones.enable(zones[zone_name])
+            end
+        
+            # Disable zones
+            existing_zones.keys.each do |zone_name|
+              elb.load_balancers[elb_name].availability_zones.disable(existing_zones[zone_name]) unless zones.has_key?(zone_name)
+            end
           end
       
           elb.load_balancers[elb_name].instances.register(instance)

data/lib/ec2launcher/defaults.rb

@@ -7,6 +7,6 @@ module EC2Launcher
   AVAILABILITY_ZONES = %w{us-east-1a us-east-1b us-east-1c us-east-1d}
   INSTANCE_TYPES = %w{m1.small m1.medium m1.large m1.xlarge t1.micro m2.xlarge m2.2xlarge m2.4xlarge c1.medium c1.xlarge cc1.4xlarge cg1.4xlarge}
 
-  RUN_URL_SCRIPT = "http://bazaar.launchpad.net/~alestic/runurl/trunk/download/head:/runurl-20090817053347-o2e56z7xwq8m9tt6-1/runurl"
+  RUN_URL_SCRIPT = "https://raw.github.com/StudyBlue/ec2launcher/master/startup-scripts/runurl"
   SETUP_SCRIPT = "https://raw.github.com/StudyBlue/ec2launcher/master/startup-scripts/setup.rb"
 end

data/lib/ec2launcher/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2012 Sean Laurent
 #
 module EC2Launcher
-  VERSION = "1.0.31"
+  VERSION = "1.0.32"
 end

data/startup-scripts/runurl

@@ -0,0 +1,206 @@
+#!/bin/sh
+#
+# runurl - Download a URL and run as a program, passing in arguments
+#
+# Copyright (C) 2009 Eric Hammond <ehammond@thinksome.com>
+#
+
+error() { echo "$@" 1>&2; }
+fail() { [ $# -eq 0 ] || error "${BNAME}:" "$1"; exit ${2:-1}; }
+debug() { [ "$DEBUG" = "0" ] || error "${BNAME}:" "$@"; }
+cleanup() { [ -z "${TEMP_D}" -o ! -d "${TEMP_D}" ] || rm -Rf "${TEMP_D}"; }
+
+DEBUG="0"
+TEMP_D=""
+BNAME=${0##*/}
+
+while [ $# -gt 0 ]; do
+  case $1 in
+    -\?|--help) pod2text "${0}"; exit 0;;
+    -d|--debug) DEBUG=1;                    shift 1 ;;
+    -*)         fail "Unrecognized option: $1 (try --help)";;
+    *)          url="$1";                   shift 1; break ;;
+  esac
+done
+
+[ -n "$url" ] || fail "Missing URL specification (try --help)"
+
+trap cleanup 0 
+
+TEMP_D=$(mktemp -d ${TEMPDIR:-/tmp}/${BNAME}.XXXXXX) &&
+  runfile="${TEMP_D}/runfile" && wgetfile="${TEMP_D}/wget.out" ||
+  fail "failed to make tempdir"
+
+debug "downloading $url"
+
+wget                           \
+  --retry-connrefused          \
+  --tries=20                   \
+  "--output-document=$runfile" \
+  "--output-file=$wgetfile"    \
+  "$url"
+
+wgetstatus=$?
+if [ $wgetstatus != 0 ]; then
+  cat $wgetfile >&2
+  fail "wget failed: $wgetstatus" "${wgetstatus}"
+fi
+
+chmod 700 "${runfile}" || fail "failed to change perms of ${runfile}"
+
+debug "running"
+$runfile "$@"
+
+exitstatus=$?
+
+debug "exit status $exitstatus"
+
+exit $exitstatus
+
+#
+# To read the documentation in this file use the command:
+#
+#   perldoc runurl
+#
+
+=head1 NAME
+
+runurl - Download a URL and run as a program, passing in arguments
+
+=head1 SYNOPSYS
+
+runurl [I<OPTS>] I<URL> [I<ARGS>]...
+
+=head1 OPTIONS
+
+=over 8
+
+=item B<-?> B<--help>
+
+Debug mode
+
+=item B<-d> B<--debug>
+
+Debug mode
+
+=back
+
+=head1 ARGUMENTS
+
+=over 8
+
+=item B<URL>
+
+The URL of the progran to download and run
+
+=item B<ARGS>
+
+Options and arguments for the downloaded program
+
+=back
+
+=head1 DESCRIPTION
+
+The B<runurl> command is a simple tool that downloads a program (or
+script) from the specified URL and runs it.
+
+The first argument to the B<runurl> command is the URL of a script or
+program that should be run.  Any leading "http://" may be omitted, but
+"https://" or "ftp://" and the like must still be specified.
+
+All remaining arguments listed after the URL (including ones which
+look like options) are passed verbatim to the program as its own
+options and arguments when it is run.
+
+The exit code of B<runurl> is the exit code of the program, unless the
+original download of the URL failed, in which case that error is
+returned.
+
+=head1 EXAMPLES
+
+If the following content is stored at http://run.alestic.com/demo/hello
+
+  #!/bin/bash
+  echo "hello, $1"
+
+then this command:
+
+  runurl run.alestic.com/demo/hello world
+
+will itself output:
+
+  hello, world
+
+=head1 CAVEATS
+
+Only run content that you control or completely trust.
+
+Just because you like the content of a URL when you look at it in your
+browser does not mean that it will still look like that when B<runurl>
+goes to run it.  It could change at any point to something that is
+broken or even malicious unless it is under your control.
+
+Realize that you are depending on the network for commands to succeed.
+If the content is temporarily unavailable or has been moved, then the
+B<runurl> command will fail.
+
+=head1 DEPENDENCIES
+
+This program requires that the following already be installed:
+
+  wget
+
+=head1 SEE ALSO
+
+The B<runurl> project site:
+
+  https://launchpad.net/runurl
+
+Article about using B<runurl> for initial configuration of Amazon EC2
+instances:
+
+  http://alestic.com/2009/08/runurl
+
+=head1 INSTALLATION
+
+On most Ubuntu releases, the B<runurl> package can be installed
+directly from the Alestic.com PPA using the following commands:
+
+ code=$(lsb_release -cs)
+ echo "deb http://ppa.launchpad.net/alestic/ppa/ubuntu $code main"|
+   sudo tee /etc/apt/sources.list.d/alestic-ppa.list
+ sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BE09C571
+ sudo apt-get update
+ sudo apt-get install -y runurl
+
+=head1 BUGS
+
+Please report bugs at https://bugs.launchpad.net/runurl
+
+=head1 CREDITS
+
+Thanks to the following for submitting improvements to the code
+
+  Scott Moser
+
+=head1 AUTHOR
+
+Eric Hammond <ehammond@thinksome.com>
+
+=head1 LICENSE
+
+Copyright 2009 Eric Hammond <ehammond@thinksome.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+=cut

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.31
+  version: 1.0.32
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -74,6 +74,7 @@ files:
 - lib/ec2launcher/instance_paths_config.rb
 - lib/ec2launcher/security_group_handler.rb
 - lib/ec2launcher/version.rb
+- startup-scripts/runurl
 - startup-scripts/setup.rb
 - startup-scripts/setup_instance.rb
 homepage: https://github.com/StudyBlue/ec2launcher