skippy-ec2onrails 0.9.10 → 0.9.11

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

@@ -46,21 +46,24 @@ module CommandLineArgs extend OptiFlagSet
 
   flag "exec" do
     description "what to run if the role of the server matches the -role passed in"
-  end  
+  end
+  
+  optional_switch_flag "v" do
+    description "let you know if the script stopped because it was running in either a different role or environment than the one specified"
+  end
   
   and_process!
 end
 
 #strip out the ':', in case the user enters ':db', or ':app'
-role = ARGV.flags.role.sub(/^:/, '').to_sym
-if ARGV.flags.role && !in_role?(role)
-  puts "This script is not being run because the server is not running under the #{role} role"
+if ARGV.flags.role && !in_role?(ARGV.flags.role.sub(/^:/, '').to_sym)
+  puts "This script is not being run because the server is not running under the #{role} role" if ARGV.flags.v
   exit
 end
 
 curr_env = Ec2onrails::Utils.rails_env
-if ARGV.flags.only_env && ARGV.flags.only_env.strip != curr_env
-  puts "This script is not being run because the server is not running under the #{curr_env} environment"
+if ARGV.flags.only_env && ARGV.flags.only_env.strip.downcase != curr_env.strip.downcase
+  puts "This script is not being run because the server is not running under the #{curr_env} environment" if ARGV.flags.v
   exit
 end
 

data/server/files/usr/local/ec2onrails/bin/init_services.rb

@@ -28,6 +28,13 @@ include Ec2onrails::RolesHelper
 # not already in a web role. Leave as is, as all it does is throw an error
 # until GOD is in the picture, at which case it should be easy to enable
 # and let it handle it instead of the init.d script....
+APP_ROOT = "/mnt/app/current"
+RAILS_ENV = `/usr/local/ec2onrails/bin/rails_env`.strip
+
+#reload configs to pick up any new changes
+Dir.glob("/etc/god/*.god") + Dir.glob("/mnt/app/current/config/god/#{RAILS_ENV}/*.god").each do |f|
+  sudo "god load '#{f}'"
+end
 
 # memcache role:
 if in_role?(:memcache)

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

@@ -28,8 +28,7 @@ require "yaml"
 @rails_env = YAML::load_file("/etc/mongrel_cluster/app.yml")["environment"]
 
 if ARGV.any?
-  result = system "env RAILS_ENV=#{@rails_env} #{ARGV.join(' ')}"
-  raise("error: #{$?}") unless result
+  exec "env RAILS_ENV=#{@rails_env} #{ARGV.join(' ')}"
 else
   puts @rails_env
 end

data/server/files/usr/local/ec2onrails/bin/setup_web_proxy.rb

@@ -53,6 +53,7 @@ when 'apache'
   # sudo "sh -c 'export DEBIAN_FRONTEND=noninteractive; aptitude -q -y install apache2'"
   
   sudo "a2enmod deflate"
+  sudo "a2enmod headers"
   sudo "a2enmod proxy_balancer"
   sudo "a2enmod proxy_http"
   sudo "a2enmod rewrite"
@@ -64,36 +65,39 @@ when 'apache'
   sudo "ln -sf /mnt/log/apache2 /mnt/log/web_proxy"
   
 when 'nginx'
-  #nginx does not have a precompiled package, so....
-  
-  src_dir = "#{Dir.pwd}/src"
+  #stop if already have nginx installed
+  unless system('which nginx') 
+    #nginx does not have a precompiled package, so....
+    nginx_version = "nginx-0.6.35"
+    nginx_tar = "#{nginx_version}.tar.gz"
 
-  nginx_img = "http://sysoev.ru/nginx/nginx-0.6.32.tar.gz"
-  fair_bal_img = "http://github.com/gnosek/nginx-upstream-fair/tarball/master"
-  nginx_dir = "#{src_dir}/nginx"
-  puts "installing nginx 6.32 (src dir: #{nginx_dir})"
-  run "mkdir -p -m 755 #{nginx_dir} &&  rm -rf #{nginx_dir}/*"
-  run "mkdir -p -m 755 #{nginx_dir}/modules/nginx-upstream-fair"
-  run "cd #{nginx_dir} && wget -q #{nginx_img} && tar -xzf nginx-0.6.32.tar.gz"
-  
-  run "cd #{nginx_dir}/modules && \
-       wget -q #{fair_bal_img} && \
-       tar -xzf *nginx-upstream-fair*.tar.gz -o -C ./nginx-upstream-fair && \
-       mv nginx-upstream-fair/*/* nginx-upstream-fair/."
-       
-  sudo "sh -c 'export DEBIAN_FRONTEND=noninteractive; aptitude -q -y install libpcre3-dev'"
-    
-  run "cd #{nginx_dir}/nginx-0.6.32 && \
-       ./configure \
-         --sbin-path=/usr/sbin \
-         --conf-path=/etc/nginx/nginx.conf \
-         --pid-path=/var/run/nginx.pid \
-         --with-http_ssl_module \
-         --with-http_stub_status_module \
-         --add-module=#{nginx_dir}/modules/nginx-upstream-fair && \
-       make && \
-       sudo make install"
+    nginx_img = "http://sysoev.ru/nginx/#{nginx_tar}"
+    fair_bal_img = "http://github.com/gnosek/nginx-upstream-fair/tarball/master"
+    src_dir = "/tmp/src/nginx"
+    puts "installing nginx #{nginx_version} (src dir: #{src_dir})"
+    #make sure the dir is created but empty...lets start afresh
+    run "mkdir -p -m 755 #{src_dir}/ &&  rm -rf #{src_dir}/*" 
+    run "mkdir -p -m 755 #{src_dir}/modules/nginx-upstream-fair"
+    run "cd #{src_dir} && wget -q #{nginx_img} && tar -xzf #{nginx_tar}"
+
+    run "cd #{src_dir}/modules && \
+         wget -q #{fair_bal_img} && \
+         tar -xzf *nginx-upstream-fair*.tar.gz -o -C ./nginx-upstream-fair && \
+         mv nginx-upstream-fair/*/* nginx-upstream-fair/."
 
+    sudo "sh -c 'export DEBIAN_FRONTEND=noninteractive; aptitude -q -y install libpcre3-dev'"
+
+    run "cd #{src_dir}/#{nginx_version} && \
+         ./configure \
+           --sbin-path=/usr/sbin \
+           --conf-path=/etc/nginx/nginx.conf \
+           --pid-path=/var/run/nginx.pid \
+           --with-http_ssl_module \
+           --with-http_stub_status_module \
+           --add-module=#{src_dir}/modules/nginx-upstream-fair && \
+         make && \
+         sudo make install"
+  end
   run "sudo rm -rf /usr/local/nginx/logs; sudo ln -sf /mnt/log/nginx /usr/local/nginx/logs"
   #an init.d script is in the default server config... lets link it up
   sudo "ln -sf /etc/init.d/nginx /etc/init.d/web_proxy"

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

@@ -0,0 +1,40 @@
+#!/bin/sh
+ 
+# This file is part of EC2 on Rails.
+# http://rubyforge.org/projects/ec2onrails/
+#
+# Copyright 2007 Paul Dowman, http://pauldowman.com/
+#
+# EC2 on Rails is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# EC2 on Rails is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+ 
+ 
+# Check if the hostname has been updated.
+# This can happen if the user associated or disassociated an Elastic IP
+ 
+OLD_HOSTNAME=`hostname`
+/usr/local/ec2onrails/startup-scripts/every-startup/get-hostname.sh
+NEW_HOSTNAME=`hostname`
+if [ $OLD_HOSTNAME != $NEW_HOSTNAME ] ; then
+  echo "Hostname has changed (from $OLD_HOSTNAME to $NEW_HOSTNAME)"
+  
+  echo "Restarting god..."
+  /etc/init.d/god  restart > /dev/null
+  
+  echo "Running full database backup into new bucket..."
+  # We run the full backup because the bucket name is expected to be based on
+  # the hostname.
+  # Kill any current backup job first.
+  killall -q -u root backup_app_db.rb
+  /usr/local/ec2onrails/bin/backup_app_db.rb --reset
+fi

data/server/files/usr/local/ec2onrails/lib/mysql_helper.rb

@@ -40,7 +40,7 @@ module Ec2onrails
     def load_db_config(config_file)
       db_config = YAML::load(ERB.new(File.read(config_file)).result)
       if db_config && db_config[@rails_env].nil?
-        puts "the rails environment '#{@rails_env}' was not found in this db onfig file: #{config_file}"
+        puts "the rails environment '#{@rails_env}' was not found in this db config file: #{config_file}"
       end
       db_config = db_config[@rails_env]
       @database = db_config['database']

data/server/files/usr/local/ec2onrails/lib/s3_helper.rb

@@ -26,6 +26,7 @@ require "#{File.dirname(__FILE__)}/aws_helper"
 
 module Ec2onrails
   class S3Helper
+    SCRATCH_SPACE = '/mnt/tmp'
 
     # make attributes available for specs
     attr_accessor :bucket
@@ -63,6 +64,27 @@ module Ec2onrails
       create_bucket
       AWS::S3::S3Object.store(s3_key(file), open(file), @bucket)
     end
+    
+    def store_dir(dir, options={})
+      FileUtils.mkdir_p SCRATCH_SPACE
+      create_bucket
+      compress = options[:compress]
+      exclude  = options[:exclude]
+      
+      #should be of the format:
+      # mnt-app-shared_ec2-75-101-250-19__20090217-183411.tgz
+      archive_nm = "#{Ec2onrails::Utils.hostname}__#{Time.new.strftime('%Y%m%d-%H%M%S')}"
+      archive_nm += compress ? ".tgz" : 'tar'  
+      cmd = "cd #{SCRATCH_SPACE} && tar -cph"
+      cmd += 'z' if compress
+      cmd += "f #{archive_nm} -C / #{dir[1..-1]} "
+      cmd += " --exclude=#{exclude} "
+      system(cmd)
+      file = "#{SCRATCH_SPACE}/#{archive_nm}"
+      AWS::S3::S3Object.store(s3_key(archive_nm), open(file), @bucket)
+    ensure
+      system "nice -n 15 rm -f #{file}" 
+    end      
 
     def retrieve_file(file)
       key = s3_key(file)

data/server/files/usr/local/ec2onrails/startup-scripts/every-startup/get-hostname.sh

@@ -20,6 +20,4 @@
 
 # Set the hostname to this instance's public hostname
 
-hostname `curl http://169.254.169.254/latest/meta-data/public-hostname`
-sudo god reload
-
+hostname `curl -s http://169.254.169.254/latest/meta-data/public-hostname`

data/server/rakefile.rb

@@ -80,6 +80,7 @@ end
   ruby
   ruby1.8-dev
   subversion
+  sysstat
   unzip
   vim
   wget
@@ -100,11 +101,14 @@ end
   "grempe-amazon-ec2",
   "aws-s3",
   "god",
+  "RubyInline",
   "memcache-client",
   "mongrel",
   "mongrel_cluster",
   "optiflag",
   "rails",
+  "rails -v '~> 2.2.2'",
+  "rails -v '~> 2.1.2'",
   "rails -v '~> 2.0.5'",
   "rails -v '~> 1.2.6'",
   "rake"
@@ -113,7 +117,7 @@ end
 @build_root = "/mnt/build"
 @fs_dir = "#{@build_root}/ubuntu"
 
-@version = [Ec2onrails::VERSION::MAJOR, Ec2onrails::VERSION::MINOR, Ec2onrails::VERSION::TINY].join('.')
+@version = [Ec2onrails::VERSION::STRING]
 
 task :default => :configure
 
@@ -147,8 +151,9 @@ task :install_gems => [:install_packages] do |t|
     run_chroot "gem update --system --no-rdoc --no-ri"
     run_chroot "gem update --no-rdoc --no-ri"
     run_chroot "gem sources -a http://gems.github.com"
-    @rubygems.each do |gem|
-      run_chroot "gem install #{gem} --no-rdoc --no-ri"
+#    run_chroot "cp /root/.gemrc /home/app" # so the app user also has access to gems.github.com
+    @rubygems.each do |g|
+      run_chroot "gem install #{g} --no-rdoc --no-ri"
     end
   end
 end
@@ -157,7 +162,6 @@ desc "Configure the image"
 task :configure => [:install_gems] do |t|
   unless_completed(t) do
     sh("cp -r files/* #{@fs_dir}")
-    sh("find #{@fs_dir} -type d -name .svn -o -name .git | xargs rm -rf")
     replace("#{@fs_dir}/etc/motd.tail", /!!VERSION!!/, "Version #{@version}")
         
     run_chroot "/usr/sbin/adduser --gecos ',,,' --disabled-password app"
@@ -175,6 +179,9 @@ task :configure => [:install_gems] do |t|
     # TODO find out the most correct solution here, there seems to be a bug in
     # both feisty and gutsy where the dhcp daemon runs as dhcp but the dir
     # that it tries to write to is owned by root and not writable by others.
+    # *** Do we still need this? The problem was constant messages in the syslog
+    # after the first DHCP lease expired (after 12 hours or so).
+    # We can probably assume Eric's base image does the right thing.
     run_chroot "chown -R dhcp /var/lib/dhcp3"
     
     #make sure that god is setup to reboot at startup
@@ -185,7 +192,7 @@ end
 desc "This task is for deploying the contents of /files to a running server image to test config file changes without rebuilding."
 task :deploy_files do |t|
   raise "need 'key' and 'host' env vars defined" unless ENV['key'] && ENV['host']
-  run "rsync -rlvzcC --rsh='ssh -l root -i #{ENV['key']}' files/ #{ENV['host']}:/"
+  run "rsync -rlvzcCp --rsh='ssh -l root -i #{ENV['key']}' files/ #{ENV['host']}:/"
 end
 
 ##################

data/test/test_app/config/deploy.rb

@@ -16,6 +16,6 @@ set :ec2onrails_config, {
   :packages => [],
   :rubygems => [],
   :timezone => "Canada/Eastern",
-  :server_config_files_root => "../server_config",
+  :server_config_files_root => "../server_configs",
   :services_to_restart => %w(sysklogd)
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: skippy-ec2onrails
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors: 
 - Paul Dowman, Adam Greene
@@ -9,47 +9,42 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-19 00:00:00 -08:00
+date: 2009-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    - - "="
       - !ruby/object:Gem::Version 
         version: 2.4.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: archive-tar-minitar
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    - - "="
       - !ruby/object:Gem::Version 
         version: 0.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: optiflag
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    - - "="
       - !ruby/object:Gem::Version 
         version: 0.6.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -66,6 +61,9 @@ extensions: []
 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
@@ -78,6 +76,9 @@ files:
 - examples/deploy.rb
 - examples/s3.yml
 - 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
@@ -95,7 +96,7 @@ files:
 - server/files/etc/apache2/sites-available/app.custom
 - server/files/etc/apache2/sites-available/default
 - server/files/etc/apache2/sites-available/default-ssl
-- server/files/etc/cron.d/backup_app_db_to_s3
+- server/files/etc/cron.d/ec2onrails
 - server/files/etc/cron.daily/app
 - server/files/etc/cron.daily/logrotate_post
 - server/files/etc/cron.hourly/app
@@ -109,6 +110,7 @@ files:
 - server/files/etc/environment
 - server/files/etc/god/app.god
 - server/files/etc/god/db.god
+- server/files/etc/god/dkim_filter.god
 - server/files/etc/god/examples/have_god_daemonize.god
 - server/files/etc/god/master.conf
 - server/files/etc/god/memcache.god
@@ -140,6 +142,7 @@ files:
 - server/files/usr/bin/god
 - server/files/usr/local/ec2onrails/bin/archive_file.rb
 - server/files/usr/local/ec2onrails/bin/backup_app_db.rb
+- server/files/usr/local/ec2onrails/bin/backup_dir.rb
 - server/files/usr/local/ec2onrails/bin/ec2_meta_data.rb
 - server/files/usr/local/ec2onrails/bin/exec_runner
 - server/files/usr/local/ec2onrails/bin/init_services.rb
@@ -150,6 +153,7 @@ files:
 - server/files/usr/local/ec2onrails/bin/set_rails_env
 - server/files/usr/local/ec2onrails/bin/set_roles.rb
 - server/files/usr/local/ec2onrails/bin/setup_web_proxy.rb
+- server/files/usr/local/ec2onrails/bin/update_hostname
 - server/files/usr/local/ec2onrails/config
 - server/files/usr/local/ec2onrails/COPYING
 - server/files/usr/local/ec2onrails/lib/aws_helper.rb