ec2onrails 0.9.7 → 0.9.8

data/History.txt

@@ -1,3 +1,29 @@
+== 0.9.8 XXXX-XX-XX
+
+* ami-XXXX (32-bit) and ami-XXXX (64-bit)
+* This is another test release, still not intended to be production-ready. Look for version 1.0. Almost there!!
+* Incremental database backups instead of doing a full mysqldump each time (full dump is done once nightly). (Thanks to Markus Bengts for the bug fix)
+* Added monit monitoring daemon: monitors mysqld, apache, memcached, mongrels, system load and free drive space
+* Enabled postfix by default, mail is delivered to admin user (or use new ec2onrails[:admin_mail_forward_address] option in deploy.rb to forward admin mail to an email address)
+* Apache now supports SSL, set :ec2onrails[:enable_ssl] = true to enable and upload ssl cert & key (there is also a self-signed cert generated for each instance on first startup)
+* Base image now built with Eric Hammond's EC2 Ubuntu script: http://alestic.com/ (using svn revision 44)
+* Now installing latest rubygems (version 1.1.1) from source instead of using Ubuntu package
+* Apache now denies access to any file in a directory named .svn, to protect the subversion info of those who deploy with Capistrano "checkout" method
+* Added force-proxy-request-1.0 and proxy-nokeepalive for proxy requests to mongrel to fix occasional "proxy: error reading status line from remote server" error (mongrel doesn't support keep-alive anyway), see apache bug #37770
+* Increased default memcache size to 128m, and memcache now listens on all interfaces for clustered use
+* Tuned MySQL setting defaults for better performance
+* restore_db_and_deploy task now runs migrations after restoring db
+* upgrade_packages task now does "safe upgrade" instead of "full upgrade"
+* Now requires Capistrano 2.3.0
+* Bug fix: #20040: installing or upgrading packages no longer breaks - /etc/apt/sources.list is now correct
+* Bug fix: #19808: Capistrano database tasks don't try to load database config if there are no hosts in the "db" role (with :primary => true, slave roles not yet supported)
+* Bug fix: #19791: MySQL no longer fails after rebundling due to missing /mnt/mysql_data
+* Bug fix: #14555: Syslog messages about unacknowledged DHCP requests is no longer occurring
+* Bug fix: Database backup and restore scripts now exit if already backing up or restoring.
+* Bug fix: EC2 ephemeral store and swap volumes were not correctly mounted
+* Bug fix: Reload apache config when setting roles to find new app hosts.
+
+
 == 0.9.7 2008-03-03
 
 * ami-5c0aef35 (32-bit) and ami-540aef3d (64-bit)

data/config/hoe.rb

@@ -59,7 +59,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\\n\\n")
-  p.extra_deps = [['capistrano', '>= 2.0.0'], ['archive-tar-minitar', '>= 0.5.1'], ['optiflag', '>= 0.6.5']]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
+  p.extra_deps = [['capistrano', '>= 2.3.0'], ['archive-tar-minitar', '>= 0.5.1'], ['optiflag', '>= 0.6.5']]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
   
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
   

data/lib/ec2onrails/capistrano_utils.rb

@@ -5,6 +5,11 @@ module Ec2onrails
       raise("error: #{$?}") unless result
     end
     
+    def run_init_script(script, arg)
+      # since init scripts might have the execute bit unset by the set_roles script we need to check
+      sudo "sh -c 'if [ -x /etc/init.d/#{script} ] ; then /etc/init.d/#{script} #{arg}; fi'"
+    end
+    
     def make_admin_role_for(role)
       newrole = "#{role.to_s}_admin".to_sym
       roles[role].each do |srv_def|
@@ -16,13 +21,13 @@ module Ec2onrails
       end
     end
     
-    # return hostnames for the role named role_sym. It must have the options given or no hostnames will be returned
+    # return hostnames for the role named role_sym that has the specified options
     def hostnames_for_role(role_sym, options = {})
       role = roles[role_sym]
       unless role
         return []
       end
-      role.reject{|s| s.options != options}.collect{|s| s.host}.join(',')
+      role.select{|s| s.options == options}.collect{|s| s.host}
     end
   end
-end
+end

data/lib/ec2onrails/recipes.rb

@@ -19,6 +19,7 @@
 require 'fileutils'
 include FileUtils
 require 'tmpdir'
+require 'pp'
 require 'zlib'
 require 'archive/tar/minitar'
 include Archive::Tar
@@ -41,39 +42,47 @@ Capistrano::Configuration.instance.load do
   set :deploy_to, "/mnt/app"
   set :use_sudo, false
   set :user, "app"
+
+  # make an "admin" role for each role, and create arrays containing
+  # the names of admin roles and non-admin roles for convenience
+  set :all_admin_role_names, []
+  set :all_non_admin_role_names, []
+  roles.keys.clone.each do |name|
+    make_admin_role_for(name)
+    all_non_admin_role_names << name
+    all_admin_role_names << "#{name.to_s}_admin".to_sym
+  end
   
-  make_admin_role_for :web
-  make_admin_role_for :app
-  make_admin_role_for :db
-  
-  roles[:web_admin].to_s
-  roles[:app_admin].to_s
-  roles[:db_admin].to_s
+  after "deploy:symlink", "ec2onrails:server:set_roles"
+  after "deploy:cold", "ec2onrails:db:init_backup"
   
   # override default start/stop/restart tasks
   namespace :deploy do
     desc <<-DESC
-      Overrides the default Capistrano deploy:start, directly calls \
+      Overrides the default Capistrano deploy:restart, uses \
       /etc/init.d/mongrel
     DESC
-    task :start, :roles => :app do
-      run "/etc/init.d/mongrel start"
+    task :start, :roles => :app_admin do
+      run_init_script("mongrel", "start")
+      sudo "sleep 30 && monit -g app monitor all" # give the service 30 seconds to start before attempting to monitor it
     end
     
     desc <<-DESC
-      Overrides the default Capistrano deploy:stop, directly calls \
+      Overrides the default Capistrano deploy:restart, uses \
       /etc/init.d/mongrel
     DESC
-    task :stop, :roles => :app do
-      run "/etc/init.d/mongrel stop"
+    task :stop, :roles => :app_admin do
+      sudo "monit -g app unmonitor all"
+      run_init_script("mongrel", "stop")
     end
     
     desc <<-DESC
-      Overrides the default Capistrano deploy:restart, directly calls \
+      Overrides the default Capistrano deploy:restart, uses \
       /etc/init.d/mongrel
     DESC
-    task :restart, :roles => :app do
-      run "/etc/init.d/mongrel restart"
+    task :restart, :roles => :app_admin do
+      deploy.stop
+      deploy.start
     end
   end
   
@@ -82,7 +91,7 @@ Capistrano::Configuration.instance.load do
       Show the AMI id's of the current images for this version of \
       EC2 on Rails.
     DESC
-    task :ami_ids, :roles => [:web, :db, :app] do
+    task :ami_ids do
       puts "32-bit server image for EC2 on Rails #{ec2onrails_version}: #{image_id_32_bit}"
       puts "64-bit server image for EC2 on Rails #{ec2onrails_version}: #{image_id_64_bit}"
     end
@@ -114,42 +123,35 @@ Capistrano::Configuration.instance.load do
         run_local "scp -i '#{privkey}' app@#{host}:.ssh/authorized_keys #{pubkey}"
       end
     end
-        
+    
     desc <<-DESC
-      Start a new server instance and prepare it for a cold deploy.
+      Prepare a newly-started instance for a cold deploy.
     DESC
-    task :setup, :roles => [:web, :db, :app] do
-      ec2.start_instance
+    task :setup, :roles => all_admin_role_names do
+      server.set_admin_mail_forward_address
       server.set_timezone
       server.install_packages
       server.install_gems
       server.deploy_files
+      server.enable_ssl if cfg[:enable_ssl]
       server.set_rails_env
       server.restart_services
       deploy.setup
-      server.set_roles
       db.create
     end
     
     desc <<-DESC
       Deploy and restore database from S3
     DESC
-    task :restore_db_and_deploy, :roles => [:web, :db, :app] do
+    task :restore_db_and_deploy do
       db.recreate
       deploy.update_code
       deploy.symlink
-      # don't need to migrate because we're restoring the db
       db.restore
-      deploy.restart
+      deploy.migrations
     end
     
-    namespace :ec2 do      
-      desc <<-DESC
-      DESC
-      task :start_instance, :roles => [:web, :db, :app] do
-        # TODO
-      end
-      
+    namespace :ec2 do
       desc <<-DESC
       DESC
       task :configure_firewall do
@@ -160,27 +162,28 @@ Capistrano::Configuration.instance.load do
     namespace :db do
       desc <<-DESC
         [internal] Load configuration info for the database from 
-        config/database.yml.
+        config/database.yml, and start mysql (it must be running
+        in order to interact with it).
       DESC
-      task :load_config, :roles => :db do
-        db_config = YAML::load(ERB.new(File.read("config/database.yml")).result)[rails_env]
-        cfg[:db_name] = db_config['database']
-        cfg[:db_user] = db_config['username']
-        cfg[:db_password] = db_config['password']
-        cfg[:db_host] = db_config['host']
-        cfg[:db_socket] = db_config['socket']
+      task :load_config do
+        unless hostnames_for_role(:db, :primary => true).empty?
+          db_config = YAML::load(ERB.new(File.read("config/database.yml")).result)[rails_env.to_s]
+          cfg[:db_name] = db_config['database']
+          cfg[:db_user] = db_config['username']
+          cfg[:db_password] = db_config['password']
+          cfg[:db_host] = db_config['host']
+          cfg[:db_socket] = db_config['socket']
         
-        if (cfg[:db_host].nil? || cfg[:db_host].empty?) && 
-          (cfg[:db_host] != 'localhost' || cfg[:db_host] != '127.0.0.1') && 
-          (cfg[:db_socket].nil? || cfg[:db_socket].empty?)
-            raise "ERROR: missing database config. Make sure database.yml contains a '#{rails_env}' section with either 'host: localhost' or 'socket: /var/run/mysqld/mysqld.sock'."
-        end
+          if (cfg[:db_host].nil? || cfg[:db_host].empty?) && (cfg[:db_socket].nil? || cfg[:db_socket].empty?)
+              raise "ERROR: missing database config. Make sure database.yml contains a '#{rails_env}' section with either 'host: hostname' or 'socket: /var/run/mysqld/mysqld.sock'."
+          end
         
-        [cfg[:db_name], cfg[:db_user], cfg[:db_password]].each do |s|
-          if s.nil? || s.empty?
-            raise "ERROR: missing database config. Make sure database.yml contains a '#{rails_env}' section with a database name, user, and password."
-          elsif s.match(/['"]/)
-            raise "ERROR: database config string '#{s}' contains quotes."
+          [cfg[:db_name], cfg[:db_user], cfg[:db_password]].each do |s|
+            if s.nil? || s.empty?
+              raise "ERROR: missing database config. Make sure database.yml contains a '#{rails_env}' section with a database name, user, and password."
+            elsif s.match(/['"]/)
+              raise "ERROR: database config string '#{s}' contains quotes."
+            end
           end
         end
       end
@@ -193,8 +196,21 @@ Capistrano::Configuration.instance.load do
       task :create, :roles => :db do
         on_rollback { drop }
         load_config
-        run "echo 'create database if not exists #{cfg[:db_name]};' | mysql -u root"
-        run "echo \"grant all on #{cfg[:db_name]}.* to '#{cfg[:db_user]}'@'%' identified by '#{cfg[:db_password]}';\" | mysql -u root"
+        start
+        run %{mysql -u root -e "create database if not exists #{cfg[:db_name]};"}
+        run %{mysql -u root -e "grant all on #{cfg[:db_name]}.* to '#{cfg[:db_user]}'@'%' identified by '#{cfg[:db_password]}';"}
+        run %{mysql -u root -e "grant reload on *.* to '#{cfg[:db_user]}'@'%' identified by '#{cfg[:db_password]}';"}
+        run %{mysql -u root -e "grant super on *.* to '#{cfg[:db_user]}'@'%' identified by '#{cfg[:db_password]}';"}
+      end
+      
+      desc <<-DESC
+        Make sure the MySQL server has been started, just in case the db role 
+        hasn't been set, e.g. when called from ec2onrails:setup.
+        (But don't enable monitoring on it.)
+      DESC
+      task :start, :roles => :db_admin do
+        sudo "chmod a+x /etc/init.d/mysql"
+        sudo "/etc/init.d/mysql start"
       end
       
       desc <<-DESC
@@ -204,7 +220,7 @@ Capistrano::Configuration.instance.load do
       DESC
       task :drop, :roles => :db do
         load_config
-        run "echo 'drop database if exists #{cfg[:db_name]};' | mysql -u root"
+        run %{mysql -u root -e "drop database if exists #{cfg[:db_name]};"}
       end
       
       desc <<-DESC
@@ -221,7 +237,7 @@ Capistrano::Configuration.instance.load do
       DESC
       task :set_root_password, :roles => :db do
         if cfg[:mysql_root_password]
-          run %{echo "set password for root@localhost=password('#{cfg[:mysql_root_password]}');" | mysql -u root}
+          run %{mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('#{cfg[:mysql_root_password]}') WHERE User='root'; FLUSH PRIVILEGES;"}
         end
       end
       
@@ -230,17 +246,26 @@ Capistrano::Configuration.instance.load do
         ec2onrails_config[:archive_to_bucket]. The filename will be \
         "app-<timestamp>.sql.gz".
       DESC
-      task :archive, :roles => [:db] do
-        run "/usr/local/ec2onrails/bin/backup_app_db.rb --bucket #{cfg[:archive_to_bucket]} --file app-#{Time.new.strftime('%Y-%m-%d--%H-%M-%S')}.sql.gz"
+      task :archive, :roles => :db do
+        run "/usr/local/ec2onrails/bin/backup_app_db.rb --noreset --bucket #{cfg[:archive_to_bucket]} --dir database-#{Time.new.strftime('%Y-%m-%d--%H-%M-%S')}"
       end
       
       desc <<-DESC
         Restore the MySQL database from the S3 bucket specified by \
         ec2onrails_config[:restore_from_bucket]. The archive filename is \
-        expected to be the default, "app.sql.gz".
+        expected to be the default, "mysqldump.sql.gz".
+      DESC
+      task :restore, :roles => :db do
+        run "/usr/local/ec2onrails/bin/restore_app_db.rb --bucket #{cfg[:restore_from_bucket]} --dir #{cfg[:restore_from_bucket_subdir]}"
+      end
+      
+      desc <<-DESC
+        [internal] Initialize the default backup folder on S3 (i.e. do a full
+        backup of the newly-created db so the automatic incremental backups 
+        make sense).
       DESC
-      task :restore, :roles => [:db] do
-        run "/usr/local/ec2onrails/bin/restore_app_db.rb --bucket #{cfg[:restore_from_bucket]}"
+      task :init_backup, :roles => :db do
+        run "/usr/local/ec2onrails/bin/backup_app_db.rb"
       end
     end
     
@@ -250,36 +275,45 @@ Capistrano::Configuration.instance.load do
         the appropriate settings for each role, and starts and/or stops the \
         relevant services.
       DESC
-      task :set_roles, :roles => [:web_admin, :db_admin, :app_admin] do
+      task :set_roles, :roles => all_admin_role_names do
         # TODO generate this based on the roles that actually exist so arbitrary new ones can be added
-        sudo "/usr/local/ec2onrails/bin/set_roles.rb web=#{hostnames_for_role(:web)} app=#{hostnames_for_role(:app)} db_primary=#{hostnames_for_role(:db, :primary => true)} memcache=#{hostnames_for_role(:memcache)}"
+        roles = {
+          :web =>        hostnames_for_role(:web),
+          :app =>        hostnames_for_role(:app),
+          :db_primary => hostnames_for_role(:db, :primary => true),
+          :memcache =>   hostnames_for_role(:memcache)
+        }
+        roles_yml = YAML::dump(roles)
+        put roles_yml, "/tmp/roles.yml"
+        sudo "cp /tmp/roles.yml /etc/ec2onrails"
+        sudo "/usr/local/ec2onrails/bin/set_roles.rb"
       end
 
       desc <<-DESC
         Change the default value of RAILS_ENV on the server. Technically
         this changes the server's mongrel config to use a different value
-        for "environment". The value is specified in :rails_env
+        for "environment". The value is specified in :rails_env.
+        Be sure to do deploy:restart after this.
       DESC
-      task :set_rails_env, :roles => [:web_admin, :db_admin, :app_admin] do
+      task :set_rails_env, :roles => all_admin_role_names do
         rails_env = fetch(:rails_env, "production")
         sudo "/usr/local/ec2onrails/bin/set_rails_env #{rails_env}"
-        deploy.restart
       end
       
       desc <<-DESC
         Upgrade to the newest versions of all Ubuntu packages.
       DESC
-      task :upgrade_packages, :roles => [:web_admin, :db_admin, :app_admin] do
+      task :upgrade_packages, :roles => all_admin_role_names do
         sudo "aptitude -q update"
-        run "export DEBIAN_FRONTEND=noninteractive; sudo aptitude -q -y dist-upgrade"
+        run "export DEBIAN_FRONTEND=noninteractive; sudo aptitude -q -y safe-upgrade"
       end
       
       desc <<-DESC
         Upgrade to the newest versions of all rubygems.
       DESC
-      task :upgrade_gems, :roles => [:web_admin, :db_admin, :app_admin] do
+      task :upgrade_gems, :roles => all_admin_role_names do
         sudo "gem update --system --no-rdoc --no-ri"
-        sudo "gem update -y --no-rdoc --no-ri" do |ch, str, data|
+        sudo "gem update --no-rdoc --no-ri" do |ch, str, data|
           ch[:data] ||= ""
           ch[:data] << data
           if data =~ />\s*$/
@@ -301,7 +335,7 @@ Capistrano::Configuration.instance.load do
         'dpkg-reconfigure packagename' or replace the package's config files \
         using the 'ec2onrails:server:deploy_files' task.
       DESC
-      task :install_packages, :roles => [:web_admin, :db_admin, :app_admin] do
+      task :install_packages, :roles => all_admin_role_names do
         if cfg[:packages] && cfg[:packages].any?
           run "export DEBIAN_FRONTEND=noninteractive; sudo aptitude -q -y install #{cfg[:packages].join(' ')}"
         end
@@ -311,10 +345,10 @@ Capistrano::Configuration.instance.load do
         Install extra rubygems. Set ec2onrails_config[:rubygems], it should \
         be with an array of strings.
       DESC
-      task :install_gems, :roles => [:web_admin, :db_admin, :app_admin] do
+      task :install_gems, :roles => all_admin_role_names do
         if cfg[:rubygems]
           cfg[:rubygems].each do |gem|
-            sudo "gem install #{gem} -y --no-rdoc --no-ri" do |ch, str, data|
+            sudo "gem install #{gem} --no-rdoc --no-ri" do |ch, str, data|
               ch[:data] ||= ""
               ch[:data] << data
               if data =~ />\s*$/
@@ -333,7 +367,7 @@ Capistrano::Configuration.instance.load do
         A convenience task to upgrade existing packages and gems and install \
         specified new ones.
       DESC
-      task :upgrade_and_install_all, :roles => [:web_admin, :db_admin, :app_admin] do
+      task :upgrade_and_install_all, :roles => all_admin_role_names do
         upgrade_packages
         upgrade_gems
         install_packages
@@ -349,7 +383,7 @@ Capistrano::Configuration.instance.load do
         directory and file as the value. For example 'Africa/Abidjan' or \
         'posix/GMT' or 'Canada/Eastern'.
       DESC
-      task :set_timezone, :roles => [:web_admin, :db_admin, :app_admin] do
+      task :set_timezone, :roles => all_admin_role_names do
         if cfg[:timezone]
           sudo "bash -c 'echo #{cfg[:timezone]} > /etc/timezone'"
           sudo "cp /usr/share/zoneinfo/#{cfg[:timezone]} /etc/localtime"
@@ -358,9 +392,13 @@ Capistrano::Configuration.instance.load do
       
       desc <<-DESC
         Deploy a set of config files to the server, the files will be owned by \
-        root. This doesn't delete any files from the server.
+        root. This doesn't delete any files from the server. This is intended
+        mainly for customized config files for new packages installed via the \
+        ec2onrails:server:install_packages task. Subdirectories and files \
+        inside here will be placed within the same directory structure \
+        relative to the root of the server's filesystem.
       DESC
-      task :deploy_files, :roles => [:web_admin, :db_admin, :app_admin] do
+      task :deploy_files, :roles => all_admin_role_names do
         if cfg[:server_config_files_root]
           begin
             filename = "config_files.tar"
@@ -383,30 +421,30 @@ Capistrano::Configuration.instance.load do
         to an array of strings. It's assumed that each service has a script \
         in /etc/init.d
       DESC
-      task :restart_services, :roles => [:web_admin, :db_admin, :app_admin] do
+      task :restart_services, :roles => all_admin_role_names do
         if cfg[:services_to_restart] && cfg[:services_to_restart].any?
           cfg[:services_to_restart].each do |service|
-            sudo "/etc/init.d/#{service} restart"
+            run_init_script(service, "restart")
           end
         end
       end
       
       desc <<-DESC
+        Set the email address that mail to the admin user forwards to.
       DESC
-      task :enable_mail_server, :roles => [:web_admin, :db_admin, :app_admin] do
-        # TODO
+      task :set_admin_mail_forward_address, :roles => all_admin_role_names do
+        put cfg[:admin_mail_forward_address], "/home/admin/.forward"
       end
-      
-      desc <<-DESC
-      DESC
-      task :add_user, :roles => [:web_admin, :db_admin, :app_admin] do
-        # TODO
-      end
-      
+
       desc <<-DESC
+        Enable ssl for the web server. The SSL cert file should be in
+        /etc/ssl/certs/default.pem and the SSL key file should be in
+        /etc/ssl/private/default.key (use the deploy_files task).
       DESC
-      task :run_script, :roles => [:web_admin, :db_admin, :app_admin] do
-        # TODO
+      task :enable_ssl, :roles => :web_admin do
+        sudo "a2enmod ssl"
+        sudo "a2ensite default-ssl"
+        sudo "/etc/init.d/apache2 restart"
       end
     end
     

data/lib/ec2onrails/version.rb

@@ -20,10 +20,10 @@ module Ec2onrails #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 7
+    TINY  = 8
     STRING = [MAJOR, MINOR, TINY].join('.')
     
-    AMI_ID_32_BIT = 'ami-5c0aef35'
-    AMI_ID_64_BIT = 'ami-540aef3d'
+    AMI_ID_32_BIT = 'ami-b657b2df'
+    AMI_ID_64_BIT = 'ami-8957b2e0'
   end
 end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>EC2 on Rails</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/ec2onrails"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/ec2onrails" class="numbers">0.9.7</a>
+      <a href="http://rubyforge.org/projects/ec2onrails" class="numbers">0.9.8</a>
     </div>
     <h2>Deploy a Ruby on Rails app on <span class="caps">EC2</span> in five minutes</h2>
 
@@ -55,22 +55,27 @@ your Rails app.</p>
 
 
 	<ul>
-	<li>Ready to deploy a Rails app with little or no configuration of the server required.</li>
-		<li>Automatic backup of MySQL database to S3.</li>
-		<li>Capistrano tasks to customize the server image, archive and restore the database to/from S3, and more (available as a rubygem).</li>
+	<li>Ready to deploy a Rails app with little or no configuration of the server required</li>
+		<li>Automatic backup of MySQL database to S3 (full backup nightly + incremental backup using binary logs every 10 minutes)</li>
+		<li>Capistrano tasks to customize the server image, archive and restore the database to/from S3, and more (available as a rubygem)</li>
 		<li>Mongrel_cluster behind Apache 2.2, configured according to 
   <a href="http://blog.codahale.com/2006/06/19/time-for-a-grown-up-server-rails-mongrel-apache-capistrano-and-you/">Coda Hale&#8217;s excellent guide</a></li>
-		<li>Ruby on Rails 1.2.5</li>
+		<li>Ruby on Rails 2.0.2 and 1.2.6</li>
 		<li>Ruby 1.8.6</li>
 		<li>MySQL 5</li>
-		<li>Ubuntu 7.10 &#8220;Gutsy&#8221; with <a href="http://wiki.xensource.com/xenwiki/XenSpecificGlibc">Xen versions of standard libs</a> (<a href="http://packages.ubuntu.com/gutsy/libs/libc6-xen">libc6-xen</a> package).</li>
+		<li><a href="http://www.danga.com/memcached/">memcached</a></li>
+		<li><a href="http://www.tildeslash.com/monit/">monit</a> system monitoring</li>
+		<li>Ubuntu 7.10 &#8220;Gutsy&#8221; base image built using <a href="http://alestic.com/">Eric Hammond&#8217;s <span class="caps">EC2</span> Ubuntu script</a></li>
+		<li><span class="caps">SSL</span> support</li>
 		<li>Amazon <span class="caps">AMI</span> tools installed</li>
 		<li>A script to rebundle a customized version of the image in one step if required</li>
 		<li>MySQL, Apache, and syslog configured to use /mnt for data and logging so you don&#8217;t fill up <span class="caps">EC2</span>&#8217;s small root filesystem</li>
 		<li>Automatically archives Rails and Apache logs to S3 nightly.</li>
 		<li>32-bit and 64-bit images available (supports all instance types, small to extra large).</li>
-		<li>Created using a build file, full source is available.</li>
-		<li>Multiple instance support.</li>
+		<li>Created using a build file, full source is <a href="http://rubyforge.org/scm/?group_id=4552">available</a> (the <span class="caps">EC2</span> on Rails script is run from <a href="http://alestic.com/">Eric Hammond&#8217;s <span class="caps">EC2</span> Ubuntu script</a>)</li>
+		<li>Supports multiple instances</li>
+		<li>Automatically runs hourly, daily, weekly and monthly scripts if they exist in Rails application&#8217;s script directory</li>
+		<li>Local <span class="caps">SMTP</span> server (postfix)</li>
 	</ul>
 
 
@@ -108,7 +113,8 @@ to the instance defined in your Capistrano &#8220;db&#8221; role.</p>
 	<h4>4. Start up one or more instances of the image.</h4>
 
 
-	<p>Soon there will be a Capistrano task to do this for you. In the meantime read the 
+	<p>Soon there will be a Capistrano task to do this for you. In the meantime I&#8217;m not going to lie, this part is complicated
+the first time. Read the 
 <a href="http://docs.amazonwebservices.com/AWSEC2/2007-08-29/GettingStartedGuide/running-an-instance.html">running an instance section</a>
 in Amazon&#8217;s getting started guide.</p>
 
@@ -117,6 +123,9 @@ in Amazon&#8217;s getting started guide.</p>
 or do <code>cap ec2onrails:ami_ids</code> from within the app that you configured in the previous step.</p>
 
 
+	<p><em><span class="caps">NOTE</span>: Only use the images that match the current version of the gem.</em></p>
+
+
 	<p>Please see the <a href="http://ec2onrails.rubyforge.org/svn/trunk/gem/History.txt">change log</a> for release notes, and 
 see the <a href="http://rubyforge.org/tracker/?atid=17558&#38;group_id=4552&#38;func=browse">list of open issues</a>.</p>
 
@@ -142,7 +151,8 @@ If you&#8217;re using multiple instances, be sure to allow them network access t
 
 
 	<p>Technically all you should need to connect to the server is the private key file, the public key is on the server. 
-But for some reason Capistrano requires that you have both the public key and the private key files together on the client.</p>
+But for some reason 
+<a href="http://groups.google.com/group/capistrano/browse_thread/thread/1102208ff925d18">Capistrano requires that you have both the public key and the private key files together on the client</a>.</p>
 
 
 	<p>From within the root of your rails app do:</p>
@@ -150,12 +160,15 @@ But for some reason Capistrano requires that you have both the public key and th
 
 <pre>cap ec2onrails:get_public_key_from_server</pre>
 
+	<p>Note, this will only work if you have an external ssh command in the path, it won&#8217;t work for most Windows users.</p>
+
+
 	<h4>6. Deploy the app with Capistrano</h4>
 
 
 <pre>
 cap ec2onrails:setup
-cap deploy:migrations
+cap deploy:cold
 </pre>
 
 	<p>Yes, it&#8217;s that easy! The setup task will set the server&#8217;s timezone, install any 
@@ -178,15 +191,15 @@ files to the server (they will be owned by root). It&#8217;s intended mainly for
 customized config files for new packages installed via the install_packages
 task.
 	<ul>
-	<li>ec2onrails:server:deploy_files</li>
-		<li>ec2onrails:server:set_timezone</li>
-		<li>ec2onrails:server:upgrade_gems</li>
-		<li>ec2onrails:server:upgrade_packages</li>
-		<li>ec2onrails:server:install_gems</li>
-		<li>ec2onrails:server:install_packages</li>
-		<li>ec2onrails:server:upgrade_and_install_all</li>
-		<li>ec2onrails:server:restart_services</li>
-		<li>ec2onrails:server:set_roles
+	<li><code>cap ec2onrails:server:deploy_files</code></li>
+		<li><code>cap ec2onrails:server:set_timezone</code></li>
+		<li><code>cap ec2onrails:server:upgrade_gems</code></li>
+		<li><code>cap ec2onrails:server:upgrade_packages</code></li>
+		<li><code>cap ec2onrails:server:install_gems</code></li>
+		<li><code>cap ec2onrails:server:install_packages</code></li>
+		<li><code>cap ec2onrails:server:upgrade_and_install_all</code></li>
+		<li><code>cap ec2onrails:server:restart_services</code></li>
+		<li><code>cap ec2onrails:server:set_roles</code>
 - Customizes each instance for it&#8217;s role(s) (as defined in your Capistrano deploy.rb file).
 For now this just makes sure that only the appropriate services (Apache, Mongrel, and/or MySQL)
 are running. Eventually this will customize settings for the running services also. Note that
@@ -200,30 +213,30 @@ bucket) onto a staging server that has the current production version of my
 app. I then deploy the new version which tests migrations exactly as they&#8217;ll
 run on the production server.
 	<ul>
-	<li>ec2onrails:db:archive</li>
-		<li>ec2onrails:db:restore</li>
-		<li>ec2onrails:db:create</li>
-		<li>ec2onrails:db:drop</li>
-		<li>ec2onrails:db:recreate</li>
-		<li>ec2onrails:db:set_root_password</li>
+	<li><code>cap ec2onrails:db:archive</code></li>
+		<li><code>cap ec2onrails:db:restore</code></li>
+		<li><code>cap ec2onrails:db:create</code></li>
+		<li><code>cap ec2onrails:db:drop</code></li>
+		<li><code>cap ec2onrails:db:recreate</code></li>
+		<li><code>cap ec2onrails:db:set_root_password</code></li>
 	</ul>
 
 
 	<ul>
-	<li>ec2onrails:ami_ids
+	<li><code>cap ec2onrails:ami_ids</code>
 - Shows the <span class="caps">AMI</span> id&#8217;s of the images that match the current version of the gem.</li>
 	</ul>
 
 
 	<ul>
-	<li>ec2onrails:setup
+	<li><code>cap ec2onrails:setup</code>
 - This is a convenience task to get a new instance completely set up in one
 step, everything except deploying the app.</li>
 	</ul>
 
 
 	<ul>
-	<li>ec2onrails:restore_db_and_deploy
+	<li><code>cap ec2onrails:restore_db_and_deploy</code>
 - Another convenience task to recreate the db, restore data to it from an s3
 bucket and deploy the app, useful to set up a staging server.</li>
 	</ul>
@@ -299,18 +312,26 @@ or send me an <a href="http://pauldowman.com/contact/">email</a>.</p>
 	<h2>How to submit patches</h2>
 
 
-	<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
-
+Pleae read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a>.
+The source code can be checked out anonymously using: 
+<pre>
+svn checkout http://ec2onrails.rubyforge.org/svn/trunk ec2onrails
+</pre>
 
-	<p>The trunk repository is <code>svn://rubyforge.org/var/svn/ec2onrails/trunk</code> for anonymous access.</p>
+	<p>Patches can be submitted to the <a href="http://rubyforge.org/tracker/?atid=17560&#38;group_id=4552&#38;func=browse">RubyForge Tracker</a> 
+or <a href="http://pauldowman.com/contact/">emailed directly to me</a> .</p>
 
 
 	<h2>License</h2>
 
 
 	<p>This code is free to use under the terms of the <span class="caps">GPL</span> v2.</p>
+
+
+	<p>If you find <span class="caps">EC2</span> on Rails useful please <a href="http://www.workingwithrails.com/person/10131-paul-dowman">recommend Paul Dowman</a>
+at Working With Rails.</p>
     <p class="coda">
-      <a href="http://pauldowman.com/contact/">Paul Dowman</a>, 2nd March 2008<br>
+      <a href="http://pauldowman.com/contact/">Paul Dowman</a>, 19th May 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -15,22 +15,27 @@ _Deploying a simple rails app is simple, and complex customization (if required)
 
 Features of the EC2 image:
 
-* Ready to deploy a Rails app with little or no configuration of the server required.
-* Automatic backup of MySQL database to S3.
-* Capistrano tasks to customize the server image, archive and restore the database to/from S3, and more (available as a rubygem).
+* Ready to deploy a Rails app with little or no configuration of the server required
+* Automatic backup of MySQL database to S3 (full backup nightly + incremental backup using binary logs every 10 minutes)
+* Capistrano tasks to customize the server image, archive and restore the database to/from S3, and more (available as a rubygem)
 * Mongrel_cluster behind Apache 2.2, configured according to 
   "Coda Hale's excellent guide":http://blog.codahale.com/2006/06/19/time-for-a-grown-up-server-rails-mongrel-apache-capistrano-and-you/
-* Ruby on Rails 1.2.5
+* Ruby on Rails 2.0.2 and 1.2.6
 * Ruby 1.8.6
 * MySQL 5
-* Ubuntu 7.10 "Gutsy" with "Xen versions of standard libs":http://wiki.xensource.com/xenwiki/XenSpecificGlibc ("libc6-xen":http://packages.ubuntu.com/gutsy/libs/libc6-xen package).
+* "memcached":http://www.danga.com/memcached/
+* "monit":http://www.tildeslash.com/monit/ system monitoring
+* Ubuntu 7.10 "Gutsy" base image built using "Eric Hammond's EC2 Ubuntu script":http://alestic.com/
+* SSL support
 * Amazon AMI tools installed
 * A script to rebundle a customized version of the image in one step if required
 * MySQL, Apache, and syslog configured to use /mnt for data and logging so you don't fill up EC2's small root filesystem
 * Automatically archives Rails and Apache logs to S3 nightly.
 * 32-bit and 64-bit images available (supports all instance types, small to extra large).
-* Created using a build file, full source is available.
-* Multiple instance support.
+* Created using a build file, full source is "available":http://rubyforge.org/scm/?group_id=4552 (the EC2 on Rails script is run from "Eric Hammond's EC2 Ubuntu script":http://alestic.com/)
+* Supports multiple instances
+* Automatically runs hourly, daily, weekly and monthly scripts if they exist in Rails application's script directory
+* Local SMTP server (postfix)
 
 
 h2. Using the image
@@ -60,13 +65,16 @@ to the instance defined in your Capistrano "db" role.
 
 h4. 4. Start up one or more instances of the image.
 
-Soon there will be a Capistrano task to do this for you. In the meantime read the 
+Soon there will be a Capistrano task to do this for you. In the meantime I'm not going to lie, this part is complicated
+the first time. Read the 
 "running an instance section":http://docs.amazonwebservices.com/AWSEC2/2007-08-29/GettingStartedGuide/running-an-instance.html
 in Amazon's getting started guide.
 
 For the AMI id's of the current images see the "change log":http://ec2onrails.rubyforge.org/svn/trunk/gem/History.txt
 or do <code>cap ec2onrails:ami_ids</code> from within the app that you configured in the previous step.
 
+_NOTE: Only use the images that match the current version of the gem._
+
 Please see the "change log":http://ec2onrails.rubyforge.org/svn/trunk/gem/History.txt for release notes, and 
 see the "list of open issues":http://rubyforge.org/tracker/?atid=17558&group_id=4552&func=browse.
 
@@ -88,18 +96,21 @@ If you're using multiple instances, be sure to allow them network access to each
 h4. 5. Copy your public key from the server to keep Capistrano happy
 
 Technically all you should need to connect to the server is the private key file, the public key is on the server. 
-But for some reason Capistrano requires that you have both the public key and the private key files together on the client.
+But for some reason 
+"Capistrano requires that you have both the public key and the private key files together on the client":http://groups.google.com/group/capistrano/browse_thread/thread/1102208ff925d18.
 
 From within the root of your rails app do:
 
 <pre>cap ec2onrails:get_public_key_from_server</pre>
 
+Note, this will only work if you have an external ssh command in the path, it won't work for most Windows users.
+
 
 h4. 6. Deploy the app with Capistrano
 
 <pre>
 cap ec2onrails:setup
-cap deploy:migrations
+cap deploy:cold
 </pre>
 
 Yes, it's that easy! The setup task will set the server's timezone, install any 
@@ -117,15 +128,15 @@ gems and Ubuntu packages to be installed. The deploy_files task uploads
 files to the server (they will be owned by root). It's intended mainly for
 customized config files for new packages installed via the install_packages
 task.
-* ec2onrails:server:deploy_files
-* ec2onrails:server:set_timezone
-* ec2onrails:server:upgrade_gems
-* ec2onrails:server:upgrade_packages
-* ec2onrails:server:install_gems
-* ec2onrails:server:install_packages
-* ec2onrails:server:upgrade_and_install_all
-* ec2onrails:server:restart_services
-* ec2onrails:server:set_roles
+* <code>cap ec2onrails:server:deploy_files</code>
+* <code>cap ec2onrails:server:set_timezone</code>
+* <code>cap ec2onrails:server:upgrade_gems</code>
+* <code>cap ec2onrails:server:upgrade_packages</code>
+* <code>cap ec2onrails:server:install_gems</code>
+* <code>cap ec2onrails:server:install_packages</code>
+* <code>cap ec2onrails:server:upgrade_and_install_all</code>
+* <code>cap ec2onrails:server:restart_services</code>
+* <code>cap ec2onrails:server:set_roles</code>
 - Customizes each instance for it's role(s) (as defined in your Capistrano deploy.rb file).
 For now this just makes sure that only the appropriate services (Apache, Mongrel, and/or MySQL)
 are running. Eventually this will customize settings for the running services also. Note that
@@ -136,21 +147,21 @@ For example, I use this to restore the current production data (from my actual p
 bucket) onto a staging server that has the current production version of my
 app. I then deploy the new version which tests migrations exactly as they'll
 run on the production server.
-* ec2onrails:db:archive
-* ec2onrails:db:restore
-* ec2onrails:db:create
-* ec2onrails:db:drop
-* ec2onrails:db:recreate
-* ec2onrails:db:set_root_password
-
-* ec2onrails:ami_ids
+* <code>cap ec2onrails:db:archive</code>
+* <code>cap ec2onrails:db:restore</code>
+* <code>cap ec2onrails:db:create</code>
+* <code>cap ec2onrails:db:drop</code>
+* <code>cap ec2onrails:db:recreate</code>
+* <code>cap ec2onrails:db:set_root_password</code>
+
+* <code>cap ec2onrails:ami_ids</code>
 - Shows the AMI id's of the images that match the current version of the gem.
 
-* ec2onrails:setup
+* <code>cap ec2onrails:setup</code>
 - This is a convenience task to get a new instance completely set up in one
 step, everything except deploying the app.
 
-* ec2onrails:restore_db_and_deploy
+* <code>cap ec2onrails:restore_db_and_deploy</code>
 - Another convenience task to recreate the db, restore data to it from an s3
 bucket and deploy the app, useful to set up a staging server.
 
@@ -215,11 +226,18 @@ See the "change log":http://ec2onrails.rubyforge.org/svn/trunk/gem/History.txt.
 
 h2. How to submit patches
 
-Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/ and for section "8b: Submit patch to Google Groups":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups, use the Google Group above.
-
-The trunk repository is <code>svn://rubyforge.org/var/svn/ec2onrails/trunk</code> for anonymous access.
+Pleae read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/.
+The source code can be checked out anonymously using: 
+<pre>
+svn checkout http://ec2onrails.rubyforge.org/svn/trunk ec2onrails
+</pre>
 
+Patches can be submitted to the "RubyForge Tracker":http://rubyforge.org/tracker/?atid=17560&group_id=4552&func=browse 
+or "emailed directly to me":http://pauldowman.com/contact/ .
 
 h2. License
 
 This code is free to use under the terms of the GPL v2. 
+
+If you find EC2 on Rails useful please "recommend Paul Dowman":http://www.workingwithrails.com/person/10131-paul-dowman
+at Working With Rails.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ec2onrails
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Paul Dowman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-03 00:00:00 -05:00
+date: 2008-05-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: 2.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: archive-tar-minitar
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ec2onrails
-rubygems_version: 1.0.1
+rubygems_version: 1.1.0
 signing_key: 
 specification_version: 2
 summary: Client-side libraries (Capistrano tasks) for managing and deploying to EC2 on Rails servers.