pauldowman-ec2onrails 0.9.10.3 → 0.9.10.4

data/ec2onrails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ec2onrails}
-  s.version = "0.9.10.3"
+  s.version = "0.9.10.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Dowman, Adam Greene"]
-  s.date = %q{2009-08-16}
+  s.date = %q{2009-09-16}
   s.description = %q{Client-side libraries (Capistrano tasks) for managing and  deploying to EC2 on Rails servers.}
   s.email = %q{paul@pauldowman.com}
   s.extra_rdoc_files = ["CHANGELOG", "lib/ec2onrails/capistrano_utils.rb", "lib/ec2onrails/recipes/db.rb", "lib/ec2onrails/recipes/deploy.rb", "lib/ec2onrails/recipes/server.rb", "lib/ec2onrails/recipes.rb", "lib/ec2onrails/version.rb", "lib/ec2onrails.rb", "README.textile"]

data/lib/ec2onrails/recipes.rb

@@ -66,8 +66,8 @@ Capistrano::Configuration.instance.load do
   # The best solution is to use an after hook on "deploy:symlink" or "deploy:update" instead of on
   # "deploy:update_code"
   on :load do
-    before "deploy:symlink", "ec2onrails:server:run_rails_rake_gems_install"
     before "deploy:symlink", "ec2onrails:server:install_system_files"
+    after "deploy:finalize_update", "ec2onrails:server:run_rails_rake_gems_install"
   end  
 
   

data/lib/ec2onrails/version.rb

@@ -18,7 +18,7 @@
 
 module Ec2onrails #:nodoc:
   module VERSION #:nodoc:
-    STRING = "0.9.10.3"
+    STRING = "0.9.10.4"
     
     AMI_ID_32_BIT_US = 'ami-xx'
     AMI_ID_64_BIT_US = 'ami-xx'

data/server/files/etc/mysql/my.cnf

@@ -76,7 +76,7 @@ query_cache_size        = 64M
 # Here you can see queries with especially long duration
 log_slow_queries        = /mnt/log/mysql/mysql-slow.log
 long_query_time = 1
-log-queries-not-using-indexes
+# log-queries-not-using-indexes
 #
 # The following can be used as easy to replay backup logs or for replication.
 #server-id              = 1

data/server/files/etc/nginx/nginx.conf.erb

@@ -109,6 +109,13 @@ http {
     if ($request_filename ~* \.(css|jpg|gif|png)$) {
 	    break;
     }
+
+    # this allows a url /warmup that can be used to cause Passenger to
+    # restart after restart.txt has been touched, even if the maintenance
+    # page is up.
+    if ($request_filename ~* \\/warmup.*$) {
+	    break;
+    }
 		
     # this rewrites all the requests to the maintenance.html
     # page if it exists in the doc root. This is for capistrano's

data/server/files/usr/local/ec2onrails/bin/backup_app_db

@@ -24,7 +24,7 @@ exit unless File.exists?("/mnt/app/current")
 require "rubygems"
 require "optiflag"
 require "fileutils"
-require 'EC2'
+require "AWS"
 require "#{File.dirname(__FILE__)}/../lib/mysql_helper"
 require "#{File.dirname(__FILE__)}/../lib/s3_helper"
 require "#{File.dirname(__FILE__)}/../lib/aws_helper"
@@ -32,7 +32,7 @@ require "#{File.dirname(__FILE__)}/../lib/roles_helper"
 
 require "#{File.dirname(__FILE__)}/../lib/utils"
 
-# Only run if this instance is the db_pimrary
+# Only run if this instance is the db_primary
 # The original code would run on any instance that had /etc/init.d/mysql
 # Which was pretty much all instances no matter what role
 include Ec2onrails::RolesHelper
@@ -55,7 +55,7 @@ if File.exists?("/etc/mysql/conf.d/mysql-ec2-ebs.cnf")  && !ARGV.flags.no_ebs
         
   @aws   = Ec2onrails::AwsHelper.new
   vols = YAML::load(File.read("/etc/ec2onrails/ebs_info.yml"))
-  ec2 = EC2::Base.new( :access_key_id => @aws.aws_access_key, :secret_access_key => @aws.aws_secret_access_key )
+  ec2 = AWS::EC2::Base.new( :access_key_id => @aws.aws_access_key, :secret_access_key => @aws.aws_secret_access_key )
   
   #lets make sure we have space: AMAZON puts a 500 limit on the number of snapshots
   snaps = ec2.describe_snapshots['snapshotSet']['item'] rescue nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pauldowman-ec2onrails
 version: !ruby/object:Gem::Version 
-  version: 0.9.10.3
+  version: 0.9.10.4
 platform: ruby
 authors: 
 - Paul Dowman, Adam Greene
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-16 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -231,7 +231,6 @@ files:
 - TODO
 has_rdoc: false
 homepage: http://ec2onrails.rubyforge.org
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -257,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ec2onrails
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Client-side libraries (Capistrano tasks) for managing and  deploying to EC2 on Rails servers.