skippy-ec2onrails 0.9.10 → 0.9.11

data/CHANGELOG

@@ -1,3 +1,24 @@
+== 0.9.10 2009-??-??
+
+* ami-?? (32-bit) and ami-?? (64-bit)
+* This is the first release that includes Adam Greene's huge changes
+* Also includes work by: Barry Paul, Ben Woosley, Mark Lane, Robert J. Berger, Sebastian Johnsson. Thanks!
+
+
+== 0.9.9.1 2009-??-??
+
+* ami-?? (32-bit) and ami-?? (64-bit)
+* This is just a bug fix release for 0.9.9, it doesn't include the (huge) changes from the github master branch (EBS, etc.)
+* Built with ec2ubuntu build script version 122 (http://alestic.com)
+* Updated to Rubygems 1.3.1
+* Added github to gem sources
+* Changed mysql server character set and collation to utf8
+* Updated rails gems (2.2.2, 2.1.2, 2.0.5, 1.2.6)
+* Updated build script to work with git repo instead of svn repo
+* fixed server:install_packages capistrano task (now updates package list)
+* Removed PHP packages
+
+
 == 0.9.9 2008-07-01
 
 * ami-c9bc58a0 (32-bit) and ami-cbbc58a2 (64-bit)

data/Manifest

@@ -5,6 +5,9 @@ examples/Capfile
 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
@@ -22,7 +25,7 @@ server/files/etc/apache2/sites-available/app.common
 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
@@ -36,6 +39,7 @@ server/files/etc/ec2onrails/roles.yml
 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
@@ -67,6 +71,7 @@ server/files/etc/syslog.conf
 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
@@ -77,6 +82,7 @@ server/files/usr/local/ec2onrails/bin/restore_app_db.rb
 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

data/README.textile

@@ -2,9 +2,9 @@ h1. EC2 on Rails
 
 h2. Deploy a Ruby on Rails app on EC2 in five minutes
 
-Main Page: "https://ec2onrails.rubyforge.org":https://ec2onrails.rubyforge.org
+Main Page: "http://ec2onrails.rubyforge.org":http://ec2onrails.rubyforge.org
 
-Code on Github: "https://github.com/pauldowman/ec2onrails":https://github.com/pauldowman/ec2onrails
+Code on Github: "http://github.com/pauldowman/ec2onrails":http://github.com/pauldowman/ec2onrails
 
 EC2 on Rails is an Ubuntu Linux server image for "Amazon's EC2 hosting service":http://www.amazon.com/b/ref=sc_fe_l_2/102-6342260-7987311?ie=UTF8&node=201590011&no=3435361 that's ready to run a standard Ruby on Rails application with little or no customization. It's a Ruby on Rails "virtual appliance":http://en.wikipedia.org/wiki/Virtual_appliance.
 
@@ -26,7 +26,7 @@ Features of the EC2 image:
 * Ruby 1.8.6
 * MySQL 5
 * "memcached":http://www.danga.com/memcached/
-* "monit":http://www.tildeslash.com/monit/ configured to monitor apache, mongrel, mysql, memcached, drive space and system load
+* "god":http://god.rubyforge.org/ configured to monitor apache or nginx, mongrel, mysql, memcached, drive space and system load
 * Ubuntu 8.04 LTS "Hardy" base image built using "Eric Hammond's EC2 Ubuntu script":http://alestic.com/
 * SSL support
 * Amazon AMI tools installed
@@ -57,19 +57,19 @@ h4. 1. Install the gem
 
 h4. 2. Add the config files to your Rails app
 
-You will need to place "Capfile":http://github.com/pauldowman/ec2onrails/tree/master/examples/Capfile?raw=true in the root of your rails folder, and put "deploy.rb":http://github.com/pauldowman/ec2onrails/tree/master/examples/deploy.rb?raw=true  and "s3.yml":http://github.com/pauldowman/ec2onrails/tree/master/examples/s3.yml?raw=true in the config folder.
+You will need to place "Capfile":http://github.com/pauldowman/ec2onrails/raw/master/examples/Capfile in the root of your rails folder, and put "deploy.rb":http://github.com/pauldowman/ec2onrails/raw/master/examples/deploy.rb  and "s3.yml":http://github.com/pauldowman/ec2onrails/raw/master/examples/s3.yml in the config folder.
 
 Within your rails directory, run
-<code>
-  wget -q -O Capfile http://github.com/pauldowman/ec2onrails/tree/master/examples/Capfile?raw=true
-  wget -q -O config/deploy.rb http://github.com/pauldowman/ec2onrails/tree/master/examples/deploy.rb?raw=true
-  wget -q -O config/s3.yml http://github.com/pauldowman/ec2onrails/tree/master/examples/s3.yml?raw=true
-</code>
+<pre>
+  wget -q -O Capfile http://github.com/pauldowman/ec2onrails/raw/master/examples/Capfile
+  wget -q -O config/deploy.rb http://github.com/pauldowman/ec2onrails/raw/master/examples/deploy.rb
+  wget -q -O config/s3.yml http://github.com/pauldowman/ec2onrails/raw/master/examples/s3.yml
+</pre>
 
 
 _Be sure to customize those files and read the comments._
 
-Also, use the hostname "db_primary" in your database.yml file. After running "cap ec2onrails:server:set_roles" it will resolve to the instance defined in your Capistrano "db" role.
+In your database.yml file, add <code>host: db_primary</code> to the host of other database configuration options. After running "cap ec2onrails:server:set_roles" it will resolve to the instance defined in your Capistrano "db" role.
 
 h4. 3. Start up one or more instances of the image.
 
@@ -106,7 +106,6 @@ h4. 5. Deploy the app with Capistrano
 Now that the gem is installed, your deploy.rb is configured and you can start and stop EC2 instances, this is the only thing you'll need to do from now on.
 
 <pre>
-cap ec2onrails:setup
 cap deploy:cold
 </pre>
 
@@ -127,8 +126,6 @@ You'll mostly need just the following Capistrano tasks:
 
 * <code>cap ec2onrails:ami_ids</code> Shows the AMI id's of the images that match the current version of the gem.
 
-* <code>cap ec2onrails:setup</code> This task configures a newly-launched instance. This is the first thing you should do after starting a new instance. It can be run more than once without ill effect. After running  "cap ec2onrails:setup" the next thing to do is run "cap deploy:cold"
-
 * <code>cap ec2onrails:db:enable_ebs</code> This task will move the _primary_ mysql database onto an Amazon Elastic Storage Block (EBS) volume. You can call this task with the optional SIZE parameter defined (defaults to 10 gigs) like <pre>cap ec2onrails:db:enable_ebs SIZE=10</pre>
 
 You should then specify your own volume (or the one created by this task) in your capistrano deploy.rb file like so: <pre>role :db, "ec2-xx-xxx-xx-xxx.compute-1.amazonaws.com", :primary => true, :ebs_vol_id => 'vol-12345abc'</pre>

data/Rakefile

@@ -27,10 +27,11 @@ Echoe.new('ec2onrails', version) do |p|
   p.rdoc_pattern     = /^(lib|README.textile|CHANGELOG)/
  
   p.dependencies     = [
-                        'capistrano          >= 2.4.3', 
-                        'archive-tar-minitar >= 0.5.2', 
-                        'optiflag            >= 0.6.5']
+                        'capistrano           >=2.4.3', 
+                        'archive-tar-minitar  >=0.5.2', 
+                        'optiflag             >=0.6.5']
                         
   p.development_dependencies = ['rake >=0.7.1']
   
+  
 end

data/TODO

@@ -1,6 +1,8 @@
 here are a list of upcoming changes or ones I'm thinking about
 
 FUTURE CHANGES
+[ ] when hardening server, change the SSH port
+
 [ ] do not change the Capify file.  This is an issue if you want to use ec2 for staging but something else (engineyard) for production.  The issue is that require 'ec2onrails/recipes' cannot be called until after the deploy file has been run because of some loading dependencies.  SO, is it possible to not have this behavior, or is this making a mnt out of a mole-hill?
 
 [ ] be able to save an ami file after cap ec2onrails:setup is run... this way you can just launch more instances of that specific ami file (can we automate this? )
@@ -33,17 +35,9 @@ FUTURE CHANGES
     http://pauldowman.com/2008/02/17/smtp-mail-from-ec2-web-server-setup/
     also see this file for updates:
     http://www.babbleon.co.uk/2008/05/email-with-ec2/ 
-    
-[ ] preload mysql timezone information (UPDATE: not sure if this is needed...)
-
-[ ] mysql optimizations are not calculating the num of cores avail correctly
-
-[ ] right now cron has a task called 'app' in cron.daily, cron.hourly, cron.monthly, and cron.weekly.  BUT, these are run on every server.  we should probably provide some sort of mechanism so a user can specify particular jobs for particular roles
 
 [ ] consolidate all logs to /mnt/log, including /mnt/app/current... it makes it easier to rotate and shuffle them off to s3
 
-[ ] get all user-data and meta-data variables from the amazon image in a similar way to rightscale?  Makes it dead simple to use/manipulate that information.  UPDATE: rightscale gave us permission to use their open-sourced files, as long as we credit them
-
 [ ] hook in encryption of backup archives
 
 [ ] hook in backup of server... or should we wait for persistent storage snapshots?  http://www.webmonkey.com/tutorial/Back_Up_a_Web_Server
@@ -72,6 +66,14 @@ QUESTIONS
 
 
 COMPLETED
+[X] preload mysql timezone information (UPDATE: not sure if this is needed...NOTE: it is not)
+
+[X] mysql optimizations are not calculating the num of cores avail correctly
+
+[X] right now cron has a task called 'app' in cron.daily, cron.hourly, cron.monthly, and cron.weekly.  BUT, these are run on every server.  we should probably provide some sort of mechanism so a user can specify particular jobs for particular roles  NOTE: paul already thought of this with the exec_runner script that we can run from within cron
+
+[X] get all user-data and meta-data variables from the amazon image in a similar way to rightscale?  Makes it dead simple to use/manipulate that information.  UPDATE: rightscale gave us permission to use their open-sourced files, as long as we credit them
+
 [X] Move to Echoe?  It just seems a LOT easier to setup and handle than hoe.  It can remove a lot of cruft, probably including ./config, ./script, ./tasks (or most of them), and ./website (move that to the README file?... looks like would need to be moved to ./docs  ).  A few folks have branched ec2onrails into github before and they've all done this...
 
 [X] set -y flag when installing/updating gems UPDATE: not needed... does it automatically for the other non-interactive flags we are using

data/ec2onrails.gemspec

@@ -1,20 +1,22 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{ec2onrails}
-  s.version = "0.9.10"
+  s.version = "0.9.11"
 
   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{2008-12-19}
+  s.date = %q{2009-05-24}
   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.rb", "lib/ec2onrails/version.rb", "lib/ec2onrails.rb", "README.textile"]
-  s.files = ["CHANGELOG", "COPYING", "ec2onrails.gemspec", "examples/Capfile", "examples/deploy.rb", "examples/s3.yml", "lib/ec2onrails/capistrano_utils.rb", "lib/ec2onrails/recipes.rb", "lib/ec2onrails/version.rb", "lib/ec2onrails.rb", "Manifest", "Rakefile", "README.textile", "server/build-ec2onrails.sh", "server/files/etc/aliases", "server/files/etc/aliases.db", "server/files/etc/apache2/apache2.conf", "server/files/etc/apache2/conf.d/app.proxy_cluster.conf", "server/files/etc/apache2/conf.d/app.proxy_frontend.conf", "server/files/etc/apache2/mods-available/proxy.conf", "server/files/etc/apache2/sites-available/app.common", "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.daily/app", "server/files/etc/cron.daily/logrotate_post", "server/files/etc/cron.hourly/app", "server/files/etc/cron.monthly/app", "server/files/etc/cron.weekly/app", "server/files/etc/denyhosts.conf", "server/files/etc/dpkg/dpkg.cfg", "server/files/etc/ec2onrails/balancer_members", "server/files/etc/ec2onrails/README", "server/files/etc/ec2onrails/roles.yml", "server/files/etc/environment", "server/files/etc/god/app.god", "server/files/etc/god/db.god", "server/files/etc/god/examples/have_god_daemonize.god", "server/files/etc/god/master.conf", "server/files/etc/god/memcache.god", "server/files/etc/god/notifications.god", "server/files/etc/god/system.god", "server/files/etc/god/web.god", "server/files/etc/init.d/ec2-every-startup", "server/files/etc/init.d/ec2-first-startup", "server/files/etc/init.d/god", "server/files/etc/init.d/nginx", "server/files/etc/init.d/set_roles", "server/files/etc/logrotate.d/apache2", "server/files/etc/logrotate.d/mongrel", "server/files/etc/logrotate.d/nginx", "server/files/etc/memcached.conf", "server/files/etc/mongrel_cluster/app.yml", "server/files/etc/motd.tail", "server/files/etc/mysql/my.cnf", "server/files/etc/nginx/nginx.conf", "server/files/etc/postfix/main.cf", "server/files/etc/rcS.d/S91ec2-first-startup", "server/files/etc/rcS.d/S92ec2-every-startup", "server/files/etc/rcS.d/S99set_roles", "server/files/etc/ssh/sshd_config", "server/files/etc/sudoers", "server/files/etc/sudoers.full_access", "server/files/etc/sudoers.restricted_access", "server/files/etc/syslog.conf", "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/ec2_meta_data.rb", "server/files/usr/local/ec2onrails/bin/exec_runner", "server/files/usr/local/ec2onrails/bin/init_services.rb", "server/files/usr/local/ec2onrails/bin/optimize_mysql.rb", "server/files/usr/local/ec2onrails/bin/rails_env", "server/files/usr/local/ec2onrails/bin/rebundle.sh", "server/files/usr/local/ec2onrails/bin/restore_app_db.rb", "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/config", "server/files/usr/local/ec2onrails/COPYING", "server/files/usr/local/ec2onrails/lib/aws_helper.rb", "server/files/usr/local/ec2onrails/lib/god_helper.rb", "server/files/usr/local/ec2onrails/lib/god_patch.rb", "server/files/usr/local/ec2onrails/lib/mysql_helper.rb", "server/files/usr/local/ec2onrails/lib/roles_helper.rb", "server/files/usr/local/ec2onrails/lib/s3_helper.rb", "server/files/usr/local/ec2onrails/lib/utils.rb", "server/files/usr/local/ec2onrails/lib/vendor/ini.rb", "server/files/usr/local/ec2onrails/startup-scripts/every-startup/get-hostname.sh", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/create-dirs.sh", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/generate-default-web-cert-and-key.sh", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/misc.sh", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/prepare-mysql-data-dir.sh", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/README", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/setup-credentials.sh", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/setup-file-permissions.sh", "server/rakefile.rb", "setup.rb", "test/autobench.conf", "test/spec/lib/s3_helper_spec.rb", "test/spec/lib/s3_old.yml", "test/spec/test_files/test1", "test/spec/test_files/test2", "test/test_app/app/controllers/application.rb", "test/test_app/app/controllers/db_fast_controller.rb", "test/test_app/app/controllers/fast_controller.rb", "test/test_app/app/controllers/slow_controller.rb", "test/test_app/app/controllers/very_slow_controller.rb", "test/test_app/app/helpers/application_helper.rb", "test/test_app/app/helpers/db_fast_helper.rb", "test/test_app/app/helpers/fast_helper.rb", "test/test_app/app/helpers/slow_helper.rb", "test/test_app/app/helpers/very_slow_helper.rb", "test/test_app/Capfile", "test/test_app/config/boot.rb", "test/test_app/config/database.yml", "test/test_app/config/deploy.rb", "test/test_app/config/environment.rb", "test/test_app/config/environments/development.rb", "test/test_app/config/environments/production.rb", "test/test_app/config/environments/test.rb", "test/test_app/config/routes.rb", "test/test_app/db/schema.rb", "test/test_app/doc/README_FOR_APP", "test/test_app/public/404.html", "test/test_app/public/500.html", "test/test_app/public/dispatch.cgi", "test/test_app/public/dispatch.fcgi", "test/test_app/public/dispatch.rb", "test/test_app/public/favicon.ico", "test/test_app/public/images/rails.png", "test/test_app/public/javascripts/application.js", "test/test_app/public/javascripts/controls.js", "test/test_app/public/javascripts/dragdrop.js", "test/test_app/public/javascripts/effects.js", "test/test_app/public/javascripts/prototype.js", "test/test_app/public/robots.txt", "test/test_app/Rakefile", "test/test_app/README", "test/test_app/script/about", "test/test_app/script/breakpointer", "test/test_app/script/console", "test/test_app/script/destroy", "test/test_app/script/generate", "test/test_app/script/performance/benchmarker", "test/test_app/script/performance/profiler", "test/test_app/script/performance/request", "test/test_app/script/plugin", "test/test_app/script/process/inspector", "test/test_app/script/process/reaper", "test/test_app/script/process/spawner", "test/test_app/script/runner", "test/test_app/script/server", "test/test_app/test/functional/db_fast_controller_test.rb", "test/test_app/test/functional/fast_controller_test.rb", "test/test_app/test/functional/slow_controller_test.rb", "test/test_app/test/functional/very_slow_controller_test.rb", "test/test_app/test/test_helper.rb", "test/test_ec2onrails.rb", "test/test_helper.rb", "TODO"]
+  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"]
+  s.files = ["CHANGELOG", "COPYING", "ec2onrails.gemspec", "examples/Capfile", "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", "Manifest", "Rakefile", "README.textile", "server/build-ec2onrails.sh", "server/files/etc/aliases", "server/files/etc/aliases.db", "server/files/etc/apache2/apache2.conf", "server/files/etc/apache2/conf.d/app.proxy_cluster.conf", "server/files/etc/apache2/conf.d/app.proxy_frontend.conf", "server/files/etc/apache2/mods-available/proxy.conf", "server/files/etc/apache2/sites-available/app.common", "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/ec2onrails", "server/files/etc/cron.daily/app", "server/files/etc/cron.daily/logrotate_post", "server/files/etc/cron.hourly/app", "server/files/etc/cron.monthly/app", "server/files/etc/cron.weekly/app", "server/files/etc/denyhosts.conf", "server/files/etc/dpkg/dpkg.cfg", "server/files/etc/ec2onrails/balancer_members", "server/files/etc/ec2onrails/README", "server/files/etc/ec2onrails/roles.yml", "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", "server/files/etc/god/notifications.god", "server/files/etc/god/system.god", "server/files/etc/god/web.god", "server/files/etc/init.d/ec2-every-startup", "server/files/etc/init.d/ec2-first-startup", "server/files/etc/init.d/god", "server/files/etc/init.d/nginx", "server/files/etc/init.d/set_roles", "server/files/etc/logrotate.d/apache2", "server/files/etc/logrotate.d/mongrel", "server/files/etc/logrotate.d/nginx", "server/files/etc/memcached.conf", "server/files/etc/mongrel_cluster/app.yml", "server/files/etc/motd.tail", "server/files/etc/mysql/my.cnf", "server/files/etc/nginx/nginx.conf", "server/files/etc/postfix/main.cf", "server/files/etc/rcS.d/S91ec2-first-startup", "server/files/etc/rcS.d/S92ec2-every-startup", "server/files/etc/rcS.d/S99set_roles", "server/files/etc/ssh/sshd_config", "server/files/etc/sudoers", "server/files/etc/sudoers.full_access", "server/files/etc/sudoers.restricted_access", "server/files/etc/syslog.conf", "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", "server/files/usr/local/ec2onrails/bin/optimize_mysql.rb", "server/files/usr/local/ec2onrails/bin/rails_env", "server/files/usr/local/ec2onrails/bin/rebundle.sh", "server/files/usr/local/ec2onrails/bin/restore_app_db.rb", "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", "server/files/usr/local/ec2onrails/lib/god_helper.rb", "server/files/usr/local/ec2onrails/lib/god_patch.rb", "server/files/usr/local/ec2onrails/lib/mysql_helper.rb", "server/files/usr/local/ec2onrails/lib/roles_helper.rb", "server/files/usr/local/ec2onrails/lib/s3_helper.rb", "server/files/usr/local/ec2onrails/lib/utils.rb", "server/files/usr/local/ec2onrails/lib/vendor/ini.rb", "server/files/usr/local/ec2onrails/startup-scripts/every-startup/get-hostname.sh", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/create-dirs.sh", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/generate-default-web-cert-and-key.sh", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/misc.sh", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/prepare-mysql-data-dir.sh", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/README", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/setup-credentials.sh", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/setup-file-permissions.sh", "server/rakefile.rb", "setup.rb", "test/autobench.conf", "test/spec/lib/s3_helper_spec.rb", "test/spec/lib/s3_old.yml", "test/spec/test_files/test1", "test/spec/test_files/test2", "test/test_app/app/controllers/application.rb", "test/test_app/app/controllers/db_fast_controller.rb", "test/test_app/app/controllers/fast_controller.rb", "test/test_app/app/controllers/slow_controller.rb", "test/test_app/app/controllers/very_slow_controller.rb", "test/test_app/app/helpers/application_helper.rb", "test/test_app/app/helpers/db_fast_helper.rb", "test/test_app/app/helpers/fast_helper.rb", "test/test_app/app/helpers/slow_helper.rb", "test/test_app/app/helpers/very_slow_helper.rb", "test/test_app/Capfile", "test/test_app/config/boot.rb", "test/test_app/config/database.yml", "test/test_app/config/deploy.rb", "test/test_app/config/environment.rb", "test/test_app/config/environments/development.rb", "test/test_app/config/environments/production.rb", "test/test_app/config/environments/test.rb", "test/test_app/config/routes.rb", "test/test_app/db/schema.rb", "test/test_app/doc/README_FOR_APP", "test/test_app/public/404.html", "test/test_app/public/500.html", "test/test_app/public/dispatch.cgi", "test/test_app/public/dispatch.fcgi", "test/test_app/public/dispatch.rb", "test/test_app/public/favicon.ico", "test/test_app/public/images/rails.png", "test/test_app/public/javascripts/application.js", "test/test_app/public/javascripts/controls.js", "test/test_app/public/javascripts/dragdrop.js", "test/test_app/public/javascripts/effects.js", "test/test_app/public/javascripts/prototype.js", "test/test_app/public/robots.txt", "test/test_app/Rakefile", "test/test_app/README", "test/test_app/script/about", "test/test_app/script/breakpointer", "test/test_app/script/console", "test/test_app/script/destroy", "test/test_app/script/generate", "test/test_app/script/performance/benchmarker", "test/test_app/script/performance/profiler", "test/test_app/script/performance/request", "test/test_app/script/plugin", "test/test_app/script/process/inspector", "test/test_app/script/process/reaper", "test/test_app/script/process/spawner", "test/test_app/script/runner", "test/test_app/script/server", "test/test_app/test/functional/db_fast_controller_test.rb", "test/test_app/test/functional/fast_controller_test.rb", "test/test_app/test/functional/slow_controller_test.rb", "test/test_app/test/functional/very_slow_controller_test.rb", "test/test_app/test/test_helper.rb", "test/test_ec2onrails.rb", "test/test_helper.rb", "TODO"]
   s.has_rdoc = true
   s.homepage = %q{http://ec2onrails.rubyforge.org}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Ec2onrails", "--main", "README.textile"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{ec2onrails}
-  s.rubygems_version = %q{1.2.0}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{Client-side libraries (Capistrano tasks) for managing and  deploying to EC2 on Rails servers.}
   s.test_files = ["test/test_app/test/functional/db_fast_controller_test.rb", "test/test_app/test/functional/fast_controller_test.rb", "test/test_app/test/functional/slow_controller_test.rb", "test/test_app/test/functional/very_slow_controller_test.rb", "test/test_app/test/test_helper.rb", "test/test_ec2onrails.rb", "test/test_helper.rb"]
 
@@ -22,21 +24,21 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if current_version >= 3 then
-      s.add_runtime_dependency(%q<capistrano>, [">= 0", "= 2.4.3"])
-      s.add_runtime_dependency(%q<archive-tar-minitar>, [">= 0", "= 0.5.2"])
-      s.add_runtime_dependency(%q<optiflag>, [">= 0", "= 0.6.5"])
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<capistrano>, [">= 2.4.3"])
+      s.add_runtime_dependency(%q<archive-tar-minitar>, [">= 0.5.2"])
+      s.add_runtime_dependency(%q<optiflag>, [">= 0.6.5"])
       s.add_development_dependency(%q<rake>, [">= 0.7.1"])
     else
-      s.add_dependency(%q<capistrano>, [">= 0", "= 2.4.3"])
-      s.add_dependency(%q<archive-tar-minitar>, [">= 0", "= 0.5.2"])
-      s.add_dependency(%q<optiflag>, [">= 0", "= 0.6.5"])
+      s.add_dependency(%q<capistrano>, [">= 2.4.3"])
+      s.add_dependency(%q<archive-tar-minitar>, [">= 0.5.2"])
+      s.add_dependency(%q<optiflag>, [">= 0.6.5"])
       s.add_dependency(%q<rake>, [">= 0.7.1"])
     end
   else
-    s.add_dependency(%q<capistrano>, [">= 0", "= 2.4.3"])
-    s.add_dependency(%q<archive-tar-minitar>, [">= 0", "= 0.5.2"])
-    s.add_dependency(%q<optiflag>, [">= 0", "= 0.6.5"])
+    s.add_dependency(%q<capistrano>, [">= 2.4.3"])
+    s.add_dependency(%q<archive-tar-minitar>, [">= 0.5.2"])
+    s.add_dependency(%q<optiflag>, [">= 0.6.5"])
     s.add_dependency(%q<rake>, [">= 0.7.1"])
   end
 end

data/examples/deploy.rb

@@ -70,6 +70,12 @@ set :ec2onrails_config, {
   # server after 3 attempts for upto 3 months.  
   :harden_server => false,
   
+  #if you want to harden the server, or setup email signing, you will need to set the domain
+  #if you use Capistrano's multistage extension (recommended!), you can add a line like this to your
+  #environment specific file:
+  #      ec2onrails_config[:service_domain] = 'staging.mydomain.com'
+  :service_domain => nil,
+  
   # Set the server timezone. run "cap -e ec2onrails:server:set_timezone" for 
   # details
   :timezone => "UTC",
@@ -81,7 +87,7 @@ set :ec2onrails_config, {
   # server's filesystem. 
   # If you don't need to deploy customized config files to the server then
   # remove this.
-  :server_config_files_root => "../server_config",
+  :server_config_files_root => "../server_configs",
   
   # If config files are deployed, some services might need to be restarted.
   # If you don't need to deploy customized config files to the server then

data/lib/ec2onrails/recipes.rb

@@ -28,6 +28,13 @@ require 'ec2onrails/version'
 require 'ec2onrails/capistrano_utils'
 include Ec2onrails::CapistranoUtils
 
+
+
+Dir[File.join(File.dirname(__FILE__), "recipes/*")].find_all{|x| File.file? x}.each do |recipe|
+  require recipe 
+end
+
+
 Capistrano::Configuration.instance.load do
 
   unless ec2onrails_config
@@ -47,7 +54,8 @@ Capistrano::Configuration.instance.load do
   set :user, "app"
 
   #in case any changes were made to the configs, like changing the number of mongrels
-  before "deploy:cold", "ec2onrails:server:grant_sudo_access"
+  before "deploy:cold", "ec2onrails:setup"
+  
   after "deploy:symlink", "ec2onrails:server:set_roles", "ec2onrails:server:init_services"
   after "deploy:cold", "ec2onrails:db:init_backup", "ec2onrails:db:optimize", "ec2onrails:server:restrict_sudo_access"
   after "ec2onrails:server:install_gems", "ec2onrails:server:add_gem_sources"
@@ -66,35 +74,6 @@ Capistrano::Configuration.instance.load do
   end  
 
   
-  # override default start/stop/restart tasks
-  namespace :deploy do
-    desc <<-DESC
-      Overrides the default Capistrano deploy:start, uses \
-      'god start app'
-    DESC
-    task :start, :roles => :app do
-      sudo "god start app"
-      # sudo "god monitor app"
-    end
-    
-    desc <<-DESC
-      Overrides the default Capistrano deploy:stop, uses \
-      'god stop app'
-    DESC
-    task :stop, :roles => :app do
-      # sudo "god unmonitor app"
-      sudo "god stop app"
-    end
-    
-    desc <<-DESC
-      Overrides the default Capistrano deploy:restart, uses \
-      'god restart app'
-    DESC
-    task :restart, :roles => :app do
-      sudo "god restart app"
-    end
-  end
-  
   namespace :ec2onrails do
     desc <<-DESC
       Show the AMI id's of the current images for this version of \
@@ -152,693 +131,11 @@ Capistrano::Configuration.instance.load do
         db.create
         server.harden_server
         db.enable_ebs
+        db.set_root_password
       end
     end
-    
-    desc <<-DESC
-      Deploy and restore database from S3
-    DESC
-    task :restore_db_and_deploy do
-      db.recreate
-      deploy.update_code
-      deploy.symlink
-      db.restore
-      deploy.migrations
-    end
-    
-    namespace :ec2 do
-      desc <<-DESC
-      DESC
-      task :configure_firewall do
-        # TODO
-      end
-    end
-    
-    namespace :db do
-      desc <<-DESC
-        [internal] Load configuration info for the database from 
-        config/database.yml, and start mysql (it must be running
-        in order to interact with it).
-      DESC
-      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'] || db_config['user'] 
-          cfg[:db_password] ||= db_config['password']
-          cfg[:db_host]     ||= db_config['host']
-          cfg[:db_port]     ||= db_config['port']
-          cfg[:db_socket]   ||= db_config['socket']
-        
-          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."
-            end
-          end
-        end
-      end
-      
-      desc <<-DESC
-        Create the MySQL database. Assumes there is no MySQL root \
-        password. To create a MySQL root password create a task that's run \
-        after this task using an after hook.
-      DESC
-      task :create, :roles => :db do
-        on_rollback { drop }
-        load_config
-        start
-        sleep(5) #make sure the db has some time to start up!
-        
-        
-        # remove the default test database, though sometimes it doesn't exist (perhaps it isn't there anymore?)
-        run %{mysql -u root -e "drop database if exists test; flush privileges;"}
-        
-        # removing anonymous mysql accounts
-        run %{mysql -u root -D mysql -e "delete from db where User = ''; flush privileges;"}
-        run %{mysql -u root -D mysql -e "delete from user where User = ''; flush privileges;"}
-        
-        # qoting of database names allows special characters eg (the-database-name)
-        # the quotes need to be double escaped. Once for capistrano and once for the host shell
-        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
-        Move the MySQL database to Amazon's Elastic Block Store (EBS), \
-        which is a persistant data store for the cloud.
-        OPTIONAL PARAMETERS:
-          * SIZE: Pass in num in gigs, like 10, to set the size, otherwise it will \
-        default to 10 gigs.
-          * VOLUME_ID: The volume_id to use for the mysql database    
-        NOTE: keep track of the volume ID, as you'll want to keep this for your \
-        records and probably add it to the :db role in your deploy.rb file \
-        (see the ec2onrails sample deploy.rb file for additional information)
-      DESC
-      task :enable_ebs, :roles => :db, :only => { :primary => true } do        
-        # based off of Eric's work:
-        # http://developer.amazonwebservices.com/connect/entry.jspa?externalID=1663&categoryID=100
-        #
-        # EXPLAINATION:
-        # There is a lot going on here!  At the end, the setup should be:
-        #   * create EBS volume if run outside of the ec2onrails:setup and 
-        #     VOLUME_ID is not passed in when the cap task is called
-        #   * EBS volume attached to /dev/sdh
-        #   * format to xfs if new or do a xfs_check if previously existed
-        #   * mounted on /var/local and update /etc/fstab
-        #   * move /mnt/mysql_data -> /var/local/mysql_data
-        #   * move /mnt/log/mysql  -> /var/local/log/mysql
-        #   * change mysql configs by writing /etc/mysql/conf.d/mysql-ec2-ebs.cnf 
-        #   * keep a copy of the mysql configs with the EBS volume, and if that volume is hooked into
-        #     another instance, make sure the mysql configs that go with that volume are symlinked to /etc/mysql
-        #   * update the file locations of the mysql binary logs in /mnt/log/mysql/mysql-bin.index
-        #   * symlink the moved folders to their old position... makes the move to EBS transparent
-        #   * Amazon doesn't contain EBS information in the meta-data API (yet).  So write
-        #     /etc/ec2onrails/ebs_info.yml
-        #     to contain the meta-data information that we need
-        #
-        # DESIGN CONSIDERATIONS
-        #   * only moving mysql data to EBS.  seems the most obvious, and if we move over other components
-        #     we will have to share that bandwidth (1 Gbps pipe to SAN).  So limiting to what we really need
-        #   * not moving all mysql logic over (tmp scratch space stays local).  Again, this is to limit
-        #     unnecessary bandwidth usage, PLUS, we are charged per million IO to EBS
-        #
-        # TODO:
-        #  * make sure if we have a predefined ebs_vol_id, that we error out with a nice msg IF the zones do not match
-        #  * can we move more of the mysql cache files back to the local disk and off of EBS, like the innodb table caches?
-        #  * right now we force this task to only be run on one server; that works for db :primary => true
-        #    But what is the best way to make this work if it needs to setup multiple servers (like db slaves)?
-        #    I need to figure out how to do a direct mapping from a server definition to a ebs_vol_id
-        #  * when we enable slaves and we setup ebs volumes on them, make it transparent to the user.  
-        #    have the slave create a snapshot of the db.master volume, and then use that to mount from
-        #  * need to do a rollback that if the volume is created but something fails, lets uncreate it?
-        #    carefull though!  If it fails towards the end when information is copied over, it could cause information
-        #    to be lost!
-        #
-        
-        mysql_dir_root = '/var/local'
-        block_mnt      = '/dev/sdh'
-        servers = find_servers_for_task(current_task)
-        
-        if servers.empty?
-          raise Capistrano::NoMatchingServersError, "`#{task.fully_qualified_name}' is only run for servers matching #{task.options.inspect}, but no servers matched"
-        elsif servers.size > 1
-          raise Capistrano::Error, "`#{task.fully_qualified_name}' is can only be run on one server, not #{server.size}"
-        end
-        
-        vol_id = ENV['VOLUME_ID'] || servers.first.options[:ebs_vol_id]
-
-        #HACK!  capistrano doesn't allow arguments to be passed in if we call this task as a method, like 'db.enable_ebs'
-        #       the places where we do call it like that, we don't want to force a move to ebs, so....
-        #       if the call frame is > 1 (ie, another task called it), do NOT force the ebs move
-        no_force = task_call_frames.size > 1
-        prev_created = !(vol_id.nil? || vol_id.empty?)
-        #no vol_id was passed in, but perhaps it is already mounted...?
-        prev_created = true if !quiet_capture("mount | grep -inr '#{mysql_dir_root}' || echo ''").empty?
-
-        unless no_force && (vol_id.nil? || vol_id.empty?)
-          zone = quiet_capture("/usr/local/ec2onrails/bin/ec2_meta_data.rb -key 'placement/availability-zone'")
-          instance_id = quiet_capture("/usr/local/ec2onrails/bin/ec2_meta_data.rb -key 'instance-id'")
-
-          unless prev_created
-            puts "creating new ebs volume...."
-            size = ENV["SIZE"] || "10"
-            cmd = "ec2-create-volume -s #{size} -z #{zone} 2>&1"
-            puts "running: #{cmd}"
-            output = `#{cmd}`
-            puts output
-            vol_id = (output =~ /^VOLUME\t(.+?)\t/ && $1)
-            puts "NOTE: remember that vol_id"
-            sleep(2)          
-          end
-          vol_id.strip! if vol_id
-          if quiet_capture("mount | grep -inr '#{block_mnt}' || echo ''").empty?
-            cmd = "ec2-attach-volume -d #{block_mnt} -i #{instance_id} #{vol_id} 2>&1"
-            puts "running: #{cmd}"
-            output = `#{cmd}`
-            puts output
-            if output =~ /Client.InvalidVolume.ZoneMismatch/i              
-              raise Exception, "The volume you are trying to attach does not reside in the zone of your instance.  Stopping!"
-            end
-            
-            
-            sleep(10)
-          end
-          
-          ec2onrails.server.allow_sudo do
-            # try to format the volume... if it is already formatted, lets run a check on
-            # it to make sure it is ok, and then continue on
-            # if errors, the device is busy...something else is going on here and it is already mounted... skip!
-            if prev_created
-              # Stop the db (mysql server) for cases where this is being run after the original run
-              # If EBS partiion is already mounted and being used by mysql, it will fail when umount is run
-              god_status = quiet_capture("sudo god status")
-              god_status = god_status.empty? ? {} : YAML::load(god_status)
-              start_stop_db = false
-              start_stop_db = god_status['db']['mysql'] == 'up'
-              if start_stop_db
-                stop
-                puts "Waiting for mysql to stop"
-                sleep(10)
-              end
-              quiet_capture("sudo umount #{mysql_dir_root}") #unmount if need to
-              sudo "xfs_check #{block_mnt}"
-              # Restart the db if it 
-              start if start_stop_db
-            else
-              sudo "mkfs.xfs #{block_mnt}"  
-            end
-            
-            # if not added to /etc/fstab, lets do so
-            sudo "sh -c \"grep -iqn '#{mysql_dir_root}' /etc/fstab || echo '#{block_mnt} #{mysql_dir_root} xfs noatime 0 0' >> /etc/fstab\""
-            sudo "mkdir -p #{mysql_dir_root}"
-            #if not already mounted, lets mount it
-            sudo "sh -c \"mount | grep -iqn '#{mysql_dir_root}' || mount '#{mysql_dir_root}'\""
-
-            #ok, now lets move the mysql stuff off of /mnt -> mysql_dir_root
-            stop rescue nil #already stopped
-            sudo "mkdir -p #{mysql_dir_root}/log"
-            #move the data over, but keep a symlink to the new location for backwards compatibility
-            #and do not do it if /mnt/mysql_data has already been moved
-            quiet_capture("sudo sh -c 'test ! -d #{mysql_dir_root}/mysql_data && mv /mnt/mysql_data #{mysql_dir_root}/'")
-            sudo "mv /mnt/mysql_data /mnt/mysql_data_old 2>/dev/null || echo"
-            sudo "ln -fs #{mysql_dir_root}/mysql_data /mnt/mysql_data"
-
-            #but keep the tmpdir on mnt
-            sudo "sh -c 'mkdir -p /mnt/tmp/mysql && chown mysql:mysql /mnt/tmp/mysql'"
-            #move the logs over, but keep a symlink to the new location for backwards compatibility
-            #and do not do it if the logs have already been moved
-            quiet_capture("sudo sh -c 'test ! -d #{mysql_dir_root}/log/mysql_data && mv /mnt/log/mysql #{mysql_dir_root}/log/'")
-            sudo "ln -fs #{mysql_dir_root}/log/mysql /mnt/log/mysql"
-            quiet_capture("sudo sh -c \"test -f #{mysql_dir_root}/log/mysql/mysql-bin.index && \
-                  perl -pi -e 's%/mnt/log/%#{mysql_dir_root}/log/%' #{mysql_dir_root}/log/mysql/mysql-bin.index\"") rescue false
-            
-            if quiet_capture("test -d /var/local/etc/mysql && echo 'yes'").empty?
-              txt = <<-FILE
-[mysqld]
-  datadir          = #{mysql_dir_root}/mysql_data
-  tmpdir           = /mnt/tmp/mysql
-  log_bin          = #{mysql_dir_root}/log/mysql/mysql-bin.log
-  log_slow_queries = #{mysql_dir_root}/log/mysql/mysql-slow.log
-FILE
-              put txt, '/tmp/mysql-ec2-ebs.cnf'
-              sudo 'mv /tmp/mysql-ec2-ebs.cnf /etc/mysql/conf.d/mysql-ec2-ebs.cnf'
-
-              #keep a copy 
-              sudo "rsync -aR /etc/mysql #{mysql_dir_root}/"
-            end
-            # lets use the mysql configs on the EBS volume
-            sudo "mv /etc/mysql /etc/mysql.orig 2>/dev/null"
-            sudo "ln -sf #{mysql_dir_root}/etc/mysql /etc/mysql"
-
-            #just put a README on the drive so we know what this volume is for!
-            txt = <<-FILE
-This volume is setup to be used by Ec2onRails in conjunction with Amazon's EBS, for primary MySql database persistence.
-RAILS_ENV: #{fetch(:rails_env, 'undefined')}
-DOMAIN:    #{fetch(:domain, 'undefined')}
-
-Modify this volume at your own risk
-FILE
-      
-            put txt, "/tmp/VOLUME-README"
-            sudo "mv /tmp/VOLUME-README #{mysql_dir_root}/VOLUME-README"
-            #update the list of ebs volumes
-            #TODO: abstract this away into a helper method!!
-            #TODO: this first touch should *not* be needed... quiet_capture should return an empty string
-            #      if the cat on a non-existant file fails (as it should).  this isn't causing issues
-            #      for me, but a few users have complained.... bad gemspec or something?
-            #      COMMENTING OUT for now to see if the recent gemspec update improved things...
-            # ebs_info = quiet_capture("touch /etc/ec2onrails/ebs_info.yml")
-            ebs_info = quiet_capture("cat /etc/ec2onrails/ebs_info.yml")
-            ebs_info = ebs_info.empty? ? {} : YAML::load(ebs_info)
-            ebs_info[mysql_dir_root] = {'block_loc' => block_mnt, 'volume_id' => vol_id} 
-            put(ebs_info.to_yaml, "/tmp/ebs_info.yml")
-            sudo "mv /tmp/ebs_info.yml /etc/ec2onrails/ebs_info.yml"
-            #lets start it back up
-            start  
-          end #end of sudo
-        end
-      end
-      
-      
-      desc <<-DESC
-        [internal] 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 do
-        sudo "god start db"
-        # sudo "god monitor db"
-      end
 
-      task :stop, :roles => :db do
-        # sudo "god unmonitor db"
-        sudo "god stop db"
-      end
-      
-      
-      desc <<-DESC
-        Drop the MySQL database. Assumes there is no MySQL root \
-        password. If there is a MySQL root password, create a task that removes \
-        it and run that task before this one using a before hook.
-      DESC
-      task :drop, :roles => :db do
-        load_config
-        run %{mysql -u root -e "drop database if exists \\`#{cfg[:db_name]}\\`;"}
-      end
-      
-      desc <<-DESC
-        db:drop and db:create.
-      DESC
-      task :recreate, :roles => :db do
-        drop
-        create
-      end
-      
-      desc <<-DESC
-        Set a root password for MySQL, using the variable mysql_root_password \
-        if it is set. If this is done db:drop won't work.
-      DESC
-      task :set_root_password, :roles => :db do
-        if cfg[:mysql_root_password]
-          run %{mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('#{cfg[:mysql_root_password]}') WHERE User='root'; FLUSH PRIVILEGES;"}
-        end
-      end
-      
-      desc <<-DESC
-        Dump the MySQL database to the S3 bucket specified by \
-        ec2onrails_config[:archive_to_bucket]. The filename will be \
-        "database-archive/<timestamp>/dump.sql.gz".
-      DESC
-      task :archive, :roles => :db do
-        run "/usr/local/ec2onrails/bin/backup_app_db.rb --bucket #{cfg[:archive_to_bucket]} --dir #{cfg[:archive_to_bucket_subdir]}"
-      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, "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 :init_backup, :roles => :db do
-        server.allow_sudo do
-          sudo "/usr/local/ec2onrails/bin/backup_app_db.rb --reset"
-        end
-      end
-      
-      # do NOT run if the flag does not exist.  This is placed by a startup script
-      # and it is only run on the first-startup.  This means after the db has been
-      # optimized, this task will not work again.  
-      #
-      # Of course you can overload it or call the file directly
-      task :optimize, :roles => :db do
-        if !quiet_capture("test -e /tmp/optimize_db_flag && echo 'file exists'").empty?
-          begin
-            sudo "/usr/local/ec2onrails/bin/optimize_mysql.rb"
-          ensure
-            sudo "rm -rf /tmp/optimize_db_flag" #remove so we cannot run again
-          end
-        else
-          puts "skipping as it looks like this task has already been run"
-        end
-      end
-      
-    end
-    
-    namespace :server do
-      desc <<-DESC
-        Tell the servers what roles they are in. This configures them with \
-        the appropriate settings for each role, and starts and/or stops the \
-        relevant services.
-      DESC
-      task :set_roles do
-        # TODO generate this based on the roles that actually exist so arbitrary new ones can be added
-        roles = {
-          :web        => hostnames_for_role(:web),
-          :app        => hostnames_for_role(:app),
-          :db_primary => hostnames_for_role(:db, :primary => true),
-          # doing th ebelow can cause errors elsewhere unless :db is populated.
-          # :db         => hostnames_for_role(:db),
-          :memcache   => hostnames_for_role(:memcache)
-        }
-        roles_yml = YAML::dump(roles)
-        put roles_yml, "/tmp/roles.yml"
-        server.allow_sudo do
-          sudo "cp /tmp/roles.yml /etc/ec2onrails"
-          #we want everyone to be able to read to it
-          sudo "chmod a+r /etc/ec2onrails/roles.yml"
-          sudo "/usr/local/ec2onrails/bin/set_roles.rb"
-        end
-      end
-      
-      task :init_services do
-        server.allow_sudo do
-          sudo "/usr/local/ec2onrails/bin/init_services.rb"
-        end
-      end
-      
-      task :setup_web_proxy, :roles => :web do
-        sudo "/usr/local/ec2onrails/bin/setup_web_proxy.rb --mode #{cfg[:web_proxy_server].to_s}"
-      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.
-        Be sure to do deploy:restart after this.
-      DESC
-      task :set_rails_env do
-        rails_env = fetch(:rails_env, "production")
-        sudo "/usr/local/ec2onrails/bin/set_rails_env #{rails_env}"
-      end
-      
-      desc <<-DESC
-        Upgrade to the newest versions of all Ubuntu packages.
-      DESC
-      task :upgrade_packages do
-        sudo "aptitude -q update"
-        sudo "sh -c 'export DEBIAN_FRONTEND=noninteractive; aptitude -q -y safe-upgrade'"
-      end
-      
-      desc <<-DESC
-        Upgrade to the newest versions of all rubygems.
-      DESC
-      task :upgrade_gems do
-        sudo "gem update --system --no-rdoc --no-ri"
-        sudo "gem update --no-rdoc --no-ri" do |ch, str, data|
-          ch[:data] ||= ""
-          ch[:data] << data
-          if data =~ />\s*$/
-            puts data
-            choice = Capistrano::CLI.ui.ask("The gem command is asking for a number:")
-            ch.send_data("#{choice}\n")
-          else
-            puts data
-          end
-        end
-      end
-      
-      desc <<-DESC
-        Install extra Ubuntu packages. Set ec2onrails_config[:packages], it \
-        should be an array of strings.
-        NOTE: the package installation will be non-interactive, if the packages \
-        require configuration either set ec2onrails_config[:interactive_packages] \
-        like you would for ec2onrails_config[:packages] (we'll flood the server \
-        with 'Y' inputs), or log in as 'root' and run \
-        'dpkg-reconfigure packagename' or replace the package's config files \
-        using the 'ec2onrails:server:deploy_files' task.
-      DESC
-      task :install_packages do
-        sudo "aptitude -q update"
-        if cfg[:packages] && cfg[:packages].any?
-          sudo "sh -c 'export DEBIAN_FRONTEND=noninteractive; aptitude -q -y install #{cfg[:packages].join(' ')}'"
-        end
-        if cfg[:interactive_packages] && cfg[:interactive_packages].any?
-          # sudo "aptitude install #{cfg[:interactive_packages].join(' ')}", {:env => {'DEBIAN_FRONTEND' => 'readline'} }
-          #trying to pick WHEN to send a Y is a bit tricky...it totally depends on the 
-          #interactive package you want to install.  FLOODING it with 'Y'... but not sure how
-          #'correct' or robust this is
-          cmd = "sudo sh -c 'export DEBIAN_FRONTEND=readline; aptitude -y -q install #{cfg[:interactive_packages].join(' ')}'"
-          run(cmd) do |channel, stream, data|
-              channel.send_data "Y\n"
-          end
-        end
-      end
-
-      desc <<-DESC
-        Provide extra security measures.  Set ec2onrails_config[:harden_server] = true \
-        to allow the hardening of the server.
-        These security measures are those which can make initial setup and playing around
-        with Ec2onRails tricky.  For example, you can be logged out of your server forever
-      DESC
-      task :harden_server do
-        #NOTES: for those security features that will get in the way of ease-of-use
-        #       hook them in here
-        if cfg[:harden_server]
-          #lets install some extra packages:
-          # denyhosts: sshd security tool.  config file is already installed... 
-          #
-          security_pkgs = %w{denyhosts}
-          sudo "sh -c 'export DEBIAN_FRONTEND=noninteractive; aptitude -q -y install #{security_pkgs.join(' ')}'"
-        end
-      end
-      
-      desc <<-DESC
-        Install extra rubygems. Set ec2onrails_config[:rubygems], it should \
-        be with an array of strings.
-      DESC
-      task :install_gems do
-        if cfg[:rubygems]
-          cfg[:rubygems].each do |gem|
-            sudo "gem install #{gem} --no-rdoc --no-ri" do |ch, str, data|
-              ch[:data] ||= ""
-              ch[:data] << data
-              if data =~ />\s*$/
-                puts data
-                choice = Capistrano::CLI.ui.ask("The gem command is asking for a number:")
-                ch.send_data("#{choice}\n")
-              else
-                puts data
-              end
-            end
-          end
-        end        
-      end
-      
-      task :run_rails_rake_gems_install do
-        #if running under Rails 2.1, lets trigger 'rake gems:install', but in such a way
-        #so it fails gracefully if running rails < 2.1
-        # ALSO, this might be the first time rake is run, and running it as sudo means that 
-        # if any plugins are loaded and create directories... like what image_science does for 
-        # ruby_inline, then the dirs will be created as root.  so trigger the rails loading
-        # very quickly before the sudo is called
-        # run "cd #{release_path} && rake RAILS_ENV=#{rails_env} -T 1>/dev/null && sudo rake RAILS_ENV=#{rails_env} gems:install"
-        ec2onrails.server.allow_sudo do
-          output = quiet_capture "cd #{release_path} && rake RAILS_ENV=#{rails_env} db:version 2>&1 1>/dev/null || sudo rake RAILS_ENV=#{rails_env} gems:install"
-          puts output
-        end
-      end
-      
-      desc <<-DESC
-        Add extra gem sources to rubygems (to able to fetch gems from for example gems.github.com).
-        Set ec2onrails_config[:rubygems_sources], it should be with an array of strings.
-      DESC
-      task :add_gem_sources do
-        if cfg[:rubygems_sources]
-          cfg[:rubygems_sources].each do |gem_source|
-            sudo "gem sources -a #{gem_source}"
-          end
-        end
-      end
-      
-      desc <<-DESC
-        A convenience task to upgrade existing packages and gems and install \
-        specified new ones.
-      DESC
-      task :upgrade_and_install_all do
-        upgrade_packages
-        upgrade_gems
-        install_packages
-        install_gems
-      end
-      
-      desc <<-DESC
-        Set the timezone using the value of the variable named timezone. \
-        Valid options for timezone can be determined by the contents of \
-        /usr/share/zoneinfo, which can be seen here: \
-        http://packages.ubuntu.com/cgi-bin/search_contents.pl?searchmode=filelist&word=tzdata&version=gutsy&arch=all&page=1&number=all \
-        Remove 'usr/share/zoneinfo/' from the filename, and use the last \
-        directory and file as the value. For example 'Africa/Abidjan' or \
-        'posix/GMT' or 'Canada/Eastern'.
-      DESC
-      task :set_timezone do
-        if cfg[:timezone]
-          ec2onrails.server.allow_sudo do
-            sudo "bash -c 'echo #{cfg[:timezone]} > /etc/timezone'"
-            sudo "cp /usr/share/zoneinfo/#{cfg[:timezone]} /etc/localtime"
-          end
-        end
-      end
-      
-      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. 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 do
-        if cfg[:server_config_files_root]
-          begin
-            filename = "config_files.tar"
-            local_file = "#{Dir.tmpdir}/#{filename}"
-            remote_file = "/tmp/#{filename}"
-            FileUtils.cd(cfg[:server_config_files_root]) do
-              File.open(local_file, 'wb') { |tar| Minitar.pack(".", tar) }
-            end
-            put File.read(local_file), remote_file
-            sudo "tar xvf #{remote_file} -o -C /"
-          ensure
-            rm_rf local_file
-            sudo "rm -f #{remote_file}"
-          end
-        end
-      end
-      
-      desc <<-DESC
-        Restart a set of services. Set ec2onrails_config[:services_to_restart] \
-        to an array of strings. It's assumed that each service has a script \
-        in /etc/init.d
-      DESC
-      task :restart_services do
-        if cfg[:services_to_restart] && cfg[:services_to_restart].any?
-          cfg[:services_to_restart].each do |service|
-            run_init_script(service, "restart")
-          end
-        end
-      end
-      
-      desc <<-DESC
-        Set the email address that mail to the app user forwards to.
-      DESC
-      task :set_mail_forward_address do
-        run "echo '#{cfg[:mail_forward_address]}' >> /home/app/.forward" if cfg[:mail_forward_address]
-        # put cfg[:admin_mail_forward_address], "/home/admin/.forward" if cfg[:admin_mail_forward_address]
-      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 :enable_ssl, :roles => :web do
-        #TODO: enable for nginx
-        sudo "a2enmod ssl"
-        sudo "a2enmod headers" # the headers module is necessary to forward a header so that rails can detect it is handling an SSL connection.  NPG 7/11/08
-        sudo "a2ensite default-ssl"
-        run_init_script("web_proxy", "restart")
-      end
-      
-      desc <<-DESC
-        Restrict the main user's sudo access.
-        Defaults the user to only be able to \
-        sudo to god
-      DESC
-      task :restrict_sudo_access do
-        old_user = fetch(:user)
-        begin
-          set :user, 'root'
-          sessions.clear #clear out sessions cache..... this way the ssh connections are reinitialized
-          sudo "cp -f /etc/sudoers.restricted_access /etc/sudoers"
-          # run "ln -sf /etc/sudoers.restricted_access /etc/sudoers"
-        ensure
-          set :user, old_user
-          sessions.clear
-        end
-      end
-
-      desc <<-DESC
-        Grant *FULL* sudo access to the main user.
-      DESC
-      task :grant_sudo_access do
-        allow_sudo
-      end
-
-      @within_sudo = 0
-      def allow_sudo
-        begin
-          @within_sudo += 1
-          old_user = fetch(:user)
-          if @within_sudo > 1
-            yield if block_given?
-            true
-          elsif capture("ls -l /etc/sudoers /etc/sudoers.full_access | awk '{print $5}'").split.uniq.size == 1
-            yield if block_given?
-            false
-          else
-            begin
-              # need to cheet and temporarily set the user to ROOT so we
-              # can (re)grant full sudo access.  
-              # we can do this because the root and app user have the same
-              # ssh login preferences....
-              #
-              # TODO:
-              #   do not escalate priv. to root...use another user like 'admin' that has full sudo access
-              set :user, 'root'
-              sessions.clear #clear out sessions cache..... this way the ssh connections are reinitialized
-              run "cp -f /etc/sudoers.full_access /etc/sudoers"
-              set :user, old_user
-              sessions.clear 
-              yield if block_given?
-            ensure
-              server.restrict_sudo_access if block_given?
-              set :user, old_user
-              sessions.clear
-              true
-            end
-          end
-        ensure
-          @within_sudo -= 1
-        end
-      end
-    end
-    
   end
 end
 
+