pauldowman-ec2onrails 0.9.10.0 → 0.9.10.1

data/Manifest

@@ -23,6 +23,8 @@ 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/default/varnish
+server/files/etc/default/varnishncsa
 server/files/etc/denyhosts.conf
 server/files/etc/dpkg/dpkg.cfg
 server/files/etc/ec2onrails/rails_env
@@ -35,6 +37,7 @@ 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/proxy.god
 server/files/etc/god/system.god
 server/files/etc/god/web.god
 server/files/etc/init.d/ec2-every-startup
@@ -45,18 +48,20 @@ server/files/etc/logrotate.d/nginx
 server/files/etc/memcached.conf
 server/files/etc/motd.tail
 server/files/etc/mysql/my.cnf
-server/files/etc/nginx/custom.conf
+server/files/etc/nginx/conf.d/custom.conf
 server/files/etc/nginx/nginx.conf.erb
 server/files/etc/postfix/main.cf
 server/files/etc/README
 server/files/etc/ssh/sshd_config
 server/files/etc/sudoers
 server/files/etc/syslog.conf
+server/files/etc/varnish/default.vcl.erb
 server/files/usr/local/ec2onrails/bin/archive_file
 server/files/usr/local/ec2onrails/bin/backup_app_db
 server/files/usr/local/ec2onrails/bin/backup_dir
 server/files/usr/local/ec2onrails/bin/ec2_meta_data
 server/files/usr/local/ec2onrails/bin/exec_runner
+server/files/usr/local/ec2onrails/bin/in_role
 server/files/usr/local/ec2onrails/bin/init_services
 server/files/usr/local/ec2onrails/bin/install_system_files
 server/files/usr/local/ec2onrails/bin/optimize_mysql

data/Rakefile

@@ -10,7 +10,12 @@ end
 require "./echoe_config"
 
 desc "Run all gem-related tasks"
-task :ec2onrails_gem => [:manifest, :package, :update_github_gemspec]
+task :ec2onrails_gem => [:delete_ignored_files, :manifest, :package, :update_github_gemspec]
+
+desc "Delete files that are in .gitignore so they don't get added to the manifest"
+task :delete_ignored_files do
+  File.read(".gitignore").each { |line| FileUtils.rm_f Dir.glob(line.strip) }
+end
 
 desc "Update the GitHub gemspec file (/ec2onrails.gemspec)"
 task :update_github_gemspec => [:manifest, :package] do

data/ec2onrails.gemspec

@@ -5,21 +5,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ec2onrails}
-  s.version = "0.9.10.0"
+  s.version = "0.9.10.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Dowman, Adam Greene"]
-  s.date = %q{2009-06-29}
+  s.date = %q{2009-07-07}
   s.description = %q{Client-side libraries (Capistrano tasks) for managing and  deploying to EC2 on Rails servers.}
   s.email = %q{paul@pauldowman.com}
   s.extra_rdoc_files = ["CHANGELOG", "lib/ec2onrails/capistrano_utils.rb", "lib/ec2onrails/recipes/db.rb", "lib/ec2onrails/recipes/deploy.rb", "lib/ec2onrails/recipes/server.rb", "lib/ec2onrails/recipes.rb", "lib/ec2onrails/version.rb", "lib/ec2onrails.rb", "README.textile"]
-  s.files = ["CHANGELOG", "COPYING", "ec2onrails.gemspec", "echoe_config.rb", "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", "server/files/etc/aliases", "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/rails_env", "server/files/etc/ec2onrails/roles.yml", "server/files/etc/environment", "server/files/etc/event.d/god", "server/files/etc/god/db_primary.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/nginx", "server/files/etc/logrotate.d/mongrel", "server/files/etc/logrotate.d/nginx", "server/files/etc/memcached.conf", "server/files/etc/motd.tail", "server/files/etc/mysql/my.cnf", "server/files/etc/nginx/custom.conf", "server/files/etc/nginx/nginx.conf.erb", "server/files/etc/postfix/main.cf", "server/files/etc/README", "server/files/etc/ssh/sshd_config", "server/files/etc/sudoers", "server/files/etc/syslog.conf", "server/files/usr/local/ec2onrails/bin/archive_file", "server/files/usr/local/ec2onrails/bin/backup_app_db", "server/files/usr/local/ec2onrails/bin/backup_dir", "server/files/usr/local/ec2onrails/bin/ec2_meta_data", "server/files/usr/local/ec2onrails/bin/exec_runner", "server/files/usr/local/ec2onrails/bin/init_services", "server/files/usr/local/ec2onrails/bin/install_system_files", "server/files/usr/local/ec2onrails/bin/optimize_mysql", "server/files/usr/local/ec2onrails/bin/public-hostname", "server/files/usr/local/ec2onrails/bin/rails_env", "server/files/usr/local/ec2onrails/bin/rebundle", "server/files/usr/local/ec2onrails/bin/restore_app_db", "server/files/usr/local/ec2onrails/bin/set_rails_env", "server/files/usr/local/ec2onrails/bin/set_roles", "server/files/usr/local/ec2onrails/bin/uninstall_system_files", "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/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/system_files_helper.rb", "server/files/usr/local/ec2onrails/lib/system_files_manifest.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/create-mysqld-pid-dir", "server/files/usr/local/ec2onrails/startup-scripts/every-startup/README", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/create-dirs", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/generate-default-web-cert-and-key", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/get-hostname", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/misc", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/prepare-mysql-data-dir", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/README", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/setup-credentials", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/setup-file-permissions", "server/rakefile-wrapper", "server/rakefile.rb", "test/autobench.conf", "test/spec/lib/s3_helper_spec.rb", "test/spec/lib/s3_old.yml", "test/spec/lib/system_files_manifest_spec.rb", "test/spec/test_files/system_files1/_manifest", "test/spec/test_files/system_files1/test1", "test/spec/test_files/system_files1/test2", "test/spec/test_files/system_files1/testfolder/test3", "test/spec/test_files/system_files2/_manifest", "test/spec/test_files/system_files2/test1", "test/spec/test_files/system_files2/test2", "test/spec/test_files/system_files2/testfolder/test3", "test/spec/test_files/test2", "test/test_app/app/controllers/application_controller.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/Capfile", "test/test_app/config/boot.rb", "test/test_app/config/database.yml", "test/test_app/config/deploy.rb", "test/test_app/config/ec2onrails/config.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/initializers/backtrace_silencers.rb", "test/test_app/config/initializers/inflections.rb", "test/test_app/config/initializers/mime_types.rb", "test/test_app/config/initializers/new_rails_defaults.rb", "test/test_app/config/initializers/session_store.rb", "test/test_app/config/locales/en.yml", "test/test_app/config/routes.rb", "test/test_app/doc/README_FOR_APP", "test/test_app/public/404.html", "test/test_app/public/422.html", "test/test_app/public/500.html", "test/test_app/public/favicon.ico", "test/test_app/public/images/rails.png", "test/test_app/public/index.html", "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/console", "test/test_app/script/dbconsole", "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/plugin", "test/test_app/script/runner", "test/test_app/script/server", "test/test_app/test/performance/browsing_test.rb", "test/test_app/test/test_helper.rb", "TODO"]
-  s.has_rdoc = true
+  s.files = ["CHANGELOG", "COPYING", "echoe_config.rb", "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", "server/files/etc/aliases", "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/default/varnish", "server/files/etc/default/varnishncsa", "server/files/etc/denyhosts.conf", "server/files/etc/dpkg/dpkg.cfg", "server/files/etc/ec2onrails/rails_env", "server/files/etc/ec2onrails/roles.yml", "server/files/etc/environment", "server/files/etc/event.d/god", "server/files/etc/god/db_primary.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/proxy.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/nginx", "server/files/etc/logrotate.d/mongrel", "server/files/etc/logrotate.d/nginx", "server/files/etc/memcached.conf", "server/files/etc/motd.tail", "server/files/etc/mysql/my.cnf", "server/files/etc/nginx/conf.d/custom.conf", "server/files/etc/nginx/nginx.conf.erb", "server/files/etc/postfix/main.cf", "server/files/etc/README", "server/files/etc/ssh/sshd_config", "server/files/etc/sudoers", "server/files/etc/syslog.conf", "server/files/etc/varnish/default.vcl.erb", "server/files/usr/local/ec2onrails/bin/archive_file", "server/files/usr/local/ec2onrails/bin/backup_app_db", "server/files/usr/local/ec2onrails/bin/backup_dir", "server/files/usr/local/ec2onrails/bin/ec2_meta_data", "server/files/usr/local/ec2onrails/bin/exec_runner", "server/files/usr/local/ec2onrails/bin/in_role", "server/files/usr/local/ec2onrails/bin/init_services", "server/files/usr/local/ec2onrails/bin/install_system_files", "server/files/usr/local/ec2onrails/bin/optimize_mysql", "server/files/usr/local/ec2onrails/bin/public-hostname", "server/files/usr/local/ec2onrails/bin/rails_env", "server/files/usr/local/ec2onrails/bin/rebundle", "server/files/usr/local/ec2onrails/bin/restore_app_db", "server/files/usr/local/ec2onrails/bin/set_rails_env", "server/files/usr/local/ec2onrails/bin/set_roles", "server/files/usr/local/ec2onrails/bin/uninstall_system_files", "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/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/system_files_helper.rb", "server/files/usr/local/ec2onrails/lib/system_files_manifest.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/create-mysqld-pid-dir", "server/files/usr/local/ec2onrails/startup-scripts/every-startup/README", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/create-dirs", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/generate-default-web-cert-and-key", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/get-hostname", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/misc", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/prepare-mysql-data-dir", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/README", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/setup-credentials", "server/files/usr/local/ec2onrails/startup-scripts/first-startup/setup-file-permissions", "server/rakefile-wrapper", "server/rakefile.rb", "test/autobench.conf", "test/spec/lib/s3_helper_spec.rb", "test/spec/lib/s3_old.yml", "test/spec/lib/system_files_manifest_spec.rb", "test/spec/test_files/system_files1/_manifest", "test/spec/test_files/system_files1/test1", "test/spec/test_files/system_files1/test2", "test/spec/test_files/system_files1/testfolder/test3", "test/spec/test_files/system_files2/_manifest", "test/spec/test_files/system_files2/test1", "test/spec/test_files/system_files2/test2", "test/spec/test_files/system_files2/testfolder/test3", "test/spec/test_files/test2", "test/test_app/app/controllers/application_controller.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/Capfile", "test/test_app/config/boot.rb", "test/test_app/config/database.yml", "test/test_app/config/deploy.rb", "test/test_app/config/ec2onrails/config.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/initializers/backtrace_silencers.rb", "test/test_app/config/initializers/inflections.rb", "test/test_app/config/initializers/mime_types.rb", "test/test_app/config/initializers/new_rails_defaults.rb", "test/test_app/config/initializers/session_store.rb", "test/test_app/config/locales/en.yml", "test/test_app/config/routes.rb", "test/test_app/doc/README_FOR_APP", "test/test_app/public/404.html", "test/test_app/public/422.html", "test/test_app/public/500.html", "test/test_app/public/favicon.ico", "test/test_app/public/images/rails.png", "test/test_app/public/index.html", "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/console", "test/test_app/script/dbconsole", "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/plugin", "test/test_app/script/runner", "test/test_app/script/server", "test/test_app/test/performance/browsing_test.rb", "test/test_app/test/test_helper.rb", "TODO", "ec2onrails.gemspec"]
   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.3.2}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{Client-side libraries (Capistrano tasks) for managing and  deploying to EC2 on Rails servers.}
   s.test_files = ["test/test_app/test/performance/browsing_test.rb", "test/test_app/test/test_helper.rb"]
 

data/lib/ec2onrails/recipes.rb

@@ -88,8 +88,8 @@ Capistrano::Configuration.instance.load do
       command because Net::SSH, which is used by Capistrano, needs it.
       This will only work if you have an ssh command in the path.
       If Capistrano can successfully connect to your EC2 instance you
-      don't need to do this. It will copy from the first server in the
-      :app role, this can be overridden by specifying the HOST 
+      don't need to do this. It will copy from one of the servers
+      at random, this can be overridden by specifying the HOST 
       environment variable
     DESC
     task :get_public_key_from_server do

data/lib/ec2onrails/recipes/db.rb

@@ -52,7 +52,8 @@ Capistrano::Configuration.instance.load do
         on_rollback { drop }
         load_config
         start
-        sleep(15) # make sure the db has some time to start up!
+        puts "  * Pausing to give MySQL some time to start up..."
+        sleep 20
         
         run %{mysql -u root -e "drop database if exists test; flush privileges;"}
         # removing anonymous mysql accounts

data/lib/ec2onrails/recipes/deploy.rb

@@ -1,5 +1,4 @@
 Capistrano::Configuration.instance(:must_exist).load do
-  cfg = ec2onrails_config
 
   # Override default start/stop/restart tasks for Passenger
   namespace :deploy do
@@ -24,4 +23,4 @@ Capistrano::Configuration.instance(:must_exist).load do
       run "touch #{current_release}/tmp/restart.txt"
     end
   end
-end
+end

data/server/files/etc/default/varnish

@@ -0,0 +1,33 @@
+# Configuration file for varnish
+#
+# /etc/init.d/varnish expects the variables $DAEMON_OPTS, $NFILES and $MEMLOCK
+# to be set from this shell script fragment.
+#
+
+# Maximum number of open files (for ulimit -n)
+NFILES=131072
+
+# Maximum locked memory size (for ulimit -l)
+# Used for locking the shared memory log in memory.  If you increase log size,
+# you need to increase this number as well
+MEMLOCK=82000
+
+# Default varnish instance name is the local nodename.  Can be overridden with
+# the -n switch, to have more instances on a single server.
+INSTANCE=$(uname -n)
+
+
+# Listen on port 80, administration on localhost:6082, and forward to
+# one content server selected by the vcl file, based on the request.  
+
+# Use a 256 MB fixed-size cache file. 
+# TODO figure out how to configure this so that the varnishd process 
+# doesn't grow so large because we have little or no swap (or add
+# more swap space)
+#
+# TODO pre-allocate the storage space using dd
+#
+DAEMON_OPTS="-a :80 \
+             -T localhost:6082 \
+             -f /etc/varnish/default.vcl \
+             -s file,/mnt/varnish/varnish_storage.bin,256M"

data/server/files/etc/default/varnishncsa

@@ -0,0 +1,11 @@
+# Configuration file for varnishncsa
+#
+# Uncomment this to enable logging for varnish.  Please make sure you have
+# enough disk space for significant amounts of log data.  To disable logging,
+# set the variable to "0", "no", or leave it unset.
+#
+# NCSA log format, to be used by HTTP log analyzers
+VARNISHNCSA_ENABLED=1
+
+LOGFILE=/mnt/log/varnish/varnishncsa.log
+

data/server/files/etc/ec2onrails/roles.yml

@@ -2,3 +2,4 @@
 :memcache: 
 :db_primary: 
 :web: 
+:proxy:

data/server/files/etc/god/master.conf

@@ -3,10 +3,12 @@
 applog(nil, :info, "loading /etc/god/master.conf")
 
 require '/usr/local/ec2onrails/lib/god_helper'
+require '/usr/local/ec2onrails/lib/roles_helper'
 require '/usr/local/ec2onrails/lib/utils'
 require "fileutils"
 
 include GodHelper
+include Ec2onrails::RolesHelper
 
 APP_ROOT = "/mnt/app/current"
 

data/server/files/etc/god/notifications.god

@@ -1,5 +1,5 @@
 God::Contacts::Email.message_settings = {
-  :from => 'app@localhost'
+  :from => 'root@localhost'
 }
 
 God::Contacts::Email.server_settings = {
@@ -9,6 +9,6 @@ God::Contacts::Email.server_settings = {
 
 God.contact(:email) do |c|
   c.name = 'app'
-  c.email = 'app@localhost'
+  c.email = 'root@localhost'
   c.group = 'default'
 end

data/server/files/etc/god/proxy.god

@@ -0,0 +1,26 @@
+God.watch do |w|
+  w.name  = "varnish"
+  w.group = "proxy"
+  w.autostart = false
+
+  w.start     = "/etc/init.d/varnish start"
+  w.stop      = "/etc/init.d/varnish stop"
+  w.restart   = "/etc/init.d/varnish restart"
+  w.pid_file  = "/var/run/varnishd.pid"
+  w.grace     = 10.seconds
+ 
+  default_configurations(w)
+  
+  # I'm not sure if it's very useful to monitor the varnishd memory usage,
+  # because it writes the pid of the varnishd parent process in it's pid file,
+  # so I assume that's what god is monitoring, and the varnishd parent starts
+  # a child process to do the real work.
+  # Also, the child process allocates all cache storage with malloc, so the
+  # VSS size can get very large and depends on the amount of storage 
+  # configured. It relies on the OS to page unused portions to disk, but at
+  # the moment we don't have much swap configured (just using the defaults
+  # from Eric Hammond's base image).
+  restart_if_resource_hog(w, :memory_usage => 100.megabytes, :cpu_usage => 50.percent)
+  
+  monitor_lifecycle(w)
+end

data/server/files/etc/god/web.god

@@ -1,12 +1,11 @@
 God.watch do |w|
-  server_status_path = '/'
   w.name = "nginx"
+  w.group = 'web'
+
   w.start = "/etc/init.d/nginx start"
   w.stop = "/etc/init.d/nginx stop"
   w.restart = "/etc/init.d/nginx restart"
   w.pid_file = "/var/run/nginx.pid"  
-  server_status_path = '/nginx_status'
-  w.group = 'web'
   w.autostart = false
 
   default_configurations(w)
@@ -14,8 +13,8 @@ God.watch do |w|
   restart_if_resource_hog(w, :memory_usage => 250.megabytes) do |restart|
     restart.condition(:http_response_code) do |c|
       c.host = '127.0.0.1'
-      c.port = 80
-      c.path = server_status_path
+      c.port = in_role?(:proxy) ? 81 : 80
+      c.path = '/nginx_status'
       c.code_is_not = 200
       c.timeout = 5.seconds
       c.times = [3, 5] # 3 out of 5 intervals
@@ -23,4 +22,4 @@ God.watch do |w|
   end
   
   monitor_lifecycle(w)
-end
+end

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

@@ -56,7 +56,7 @@ http {
   gzip_disable “MSIE [1-6].(?!.*SV1)”;
   
   server {
-    listen 80;
+    listen <%= roles[:proxy] && roles[:proxy].include?("127.0.0.1")  ? 81 : 80 %>;
     server_name _;
     
     # server-specific passenger settings
@@ -110,8 +110,7 @@ http {
     # page if it exists in the doc root. This is for capistrano's
     # disable web task
     if (-f $document_root/system/maintenance.html) {
-      rewrite  ^(.*)$  /system/maintenance.html last;
-      break;
+      rewrite  ^(.*)$  /system/maintenance.html break;
     }
     
     # see http://wiki.codemongers.com/NginxHttpStubStatusModule
@@ -125,7 +124,7 @@ http {
         deny all;
     }
     
-    include /etc/nginx/custom.conf;
+    include /etc/nginx/conf.d/*.conf;
   }
   
   # This server is setup for ssl. Uncomment if 

data/server/files/etc/varnish/default.vcl.erb

@@ -0,0 +1,140 @@
+#This is the VCL configuration file for varnish.  See the vcl(7)
+#man page for details on VCL syntax and semantics.
+
+# One backend for each instance in the "web" role. If that instance is also in
+# the "proxy" role then it's listening on port 81, otherwise it's on port 80
+<% roles[:web].each_with_index do |address, i| %>
+backend web_<%= i %> {
+.host = "<%= address %>";
+.port = "<%= roles[:proxy] && roles[:proxy].include?(address) ? 81 : 80  %>";
+}
+<% end %>
+
+<% unless config[:proxy] && config[:proxy][:caching_enabled] %>
+# redefine the vcl_recv function to disable caching if 
+# config[:proxy][:caching_enabled] is not true for this instance.
+sub vcl_recv {
+   if (req.request != "GET" &&
+     req.request != "HEAD" &&
+     req.request != "PUT" &&
+     req.request != "POST" &&
+     req.request != "TRACE" &&
+     req.request != "OPTIONS" &&
+     req.request != "DELETE") {
+       /* Non-RFC2616 or CONNECT which is weird. */
+       return (pipe);
+   }
+  return (pass);
+}
+<% end %>
+
+
+#
+#Below is a commented-out copy of the default VCL logic.  If you
+#redefine any of these subroutines, the built-in logic will be
+#appended to your code.
+#
+#sub vcl_recv {
+#    if (req.request != "GET" &&
+#      req.request != "HEAD" &&
+#      req.request != "PUT" &&
+#      req.request != "POST" &&
+#      req.request != "TRACE" &&
+#      req.request != "OPTIONS" &&
+#      req.request != "DELETE") {
+#        /* Non-RFC2616 or CONNECT which is weird. */
+#        return (pipe);
+#    }
+#    if (req.request != "GET" && req.request != "HEAD") {
+#        /* We only deal with GET and HEAD by default */
+#        return (pass);
+#    }
+#    if (req.http.Authorization || req.http.Cookie) {
+#        /* Not cacheable by default */
+#        return (pass);
+#    }
+#    return (lookup);
+#}
+#
+#sub vcl_pipe {
+#    return (pipe);
+#}
+#
+#sub vcl_pass {
+#    return (pass);
+#}
+#
+#sub vcl_hash {
+#    set req.hash += req.url;
+#    if (req.http.host) {
+#        set req.hash += req.http.host;
+#    } else {
+#        set req.hash += server.ip;
+#    }
+#    return (hash);
+#}
+#
+#sub vcl_hit {
+#    if (!obj.cacheable) {
+#        return (pass);
+#    }
+#    return (deliver);
+#}
+#
+#sub vcl_miss {
+#    return (fetch);
+#}
+#
+#sub vcl_fetch {
+#    if (!obj.cacheable) {
+#        return (pass);
+#    }
+#    if (obj.http.Set-Cookie) {
+#        return (pass);
+#    }
+#    set obj.prefetch =  -30s;
+#    return (deliver);
+#}
+#
+#sub vcl_deliver {
+#    return (deliver);
+#}
+#
+#sub vcl_discard {
+#    /* XXX: Do not redefine vcl_discard{}, it is not yet supported */
+#    return (discard);
+#}
+#
+#sub vcl_prefetch {
+#    /* XXX: Do not redefine vcl_prefetch{}, it is not yet supported */
+#    return (fetch);
+#}
+#
+#sub vcl_timeout {
+#    /* XXX: Do not redefine vcl_timeout{}, it is not yet supported */
+#    return (discard);
+#}
+#
+#sub vcl_error {
+#    set obj.http.Content-Type = "text/html; charset=utf-8";
+#    synthetic {"
+#<?xml version="1.0" encoding="utf-8"?>
+#<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+# "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+#<html>
+#  <head>
+#    <title>"} obj.status " " obj.response {"</title>
+#  </head>
+#  <body>
+#    <h1>Error "} obj.status " " obj.response {"</h1>
+#    <p>"} obj.response {"</p>
+#    <h3>Guru Meditation:</h3>
+#    <p>XID: "} req.xid {"</p>
+#    <address>
+#       <a href="http://www.varnish-cache.org/">Varnish</a>
+#    </address>
+#  </body>
+#</html>
+#"};
+#    return (deliver);
+#}

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

@@ -23,7 +23,7 @@
 #    ex.
 #      * exec_runner -role :db -exec 'echo "hello world"'
 #        # will only run if the server is in the db role
-#      * exec_runner -role :app -exec /some/app/specific/script/to/call
+#      * exec_runner -role :web -exec /some/app/specific/script/to/call
 #
 
 require "rubygems"
@@ -55,7 +55,7 @@ module CommandLineArgs extend OptiFlagSet
   and_process!
 end
 
-#strip out the ':', in case the user enters ':db', or ':app'
+#strip out the ':', in case the user enters ':db', or ':web'
 if ARGV.flags.role && !in_role?(ARGV.flags.role.sub(/^:/, '').to_sym)
   puts "This script is not being run because the server is not running under the #{role} role" if ARGV.flags.v
   exit

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

@@ -0,0 +1,33 @@
+#!/usr/bin/ruby
+
+#    This file is part of EC2 on Rails.
+#    http://rubyforge.org/projects/ec2onrails/
+#
+#    Copyright 2007 Paul Dowman, http://pauldowman.com/
+#
+#    EC2 on Rails is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    EC2 on Rails is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "#{File.dirname(__FILE__)}/../lib/roles_helper"
+include Ec2onrails::RolesHelper
+
+if ARGV[0].nil? || ARGV[0] == ""
+  puts "Missing rolename argument"
+  exit 2
+end
+
+if in_role?(ARGV[0].to_sym)
+  exit 0
+else
+  exit 1
+end

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

@@ -54,4 +54,3 @@ SYSTEM_FILES_SRC = "config/ec2onrails/system_files"
 app_dir = ARGV[0] || "/mnt/app/current"
 
 Ec2onrails::SystemFilesHelper.new.install_system_files(File.join(app_dir, SYSTEM_FILES_SRC))
-

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

@@ -49,16 +49,14 @@ FileUtils.copy(DEFAULT_CONFIG_LOC, "#{DEFAULT_CONFIG_LOC}.pre_optimized") unless
 num_cores = `cat /proc/cpuinfo`.find_all{|o| o =~ /^\s*processor\s+/}.size rescue 1
 #if also running app, just search for ruby because that will 
 #include mongrel but also daemons and other scripts
-num_ruby_instances = local_roles.include?(:app) ? `ps ax | grep ruby | grep -v 'grep ruby'`.split("\n").size : 0
+num_ruby_instances = local_roles.include?(:web) ? `ps ax | grep ruby | grep -v 'grep ruby'`.split("\n").size : 0
 avail_cores = num_cores - num_ruby_instances/4
 avail_cores = 0 if avail_cores.nil? || avail_cores < 0
 
 
 mem_opt = nil
-mem_opt ||= 0.15 if local_roles.include?(:app) && local_roles.include?(:web) && local_roles.include?(:memcache)
-mem_opt ||= 0.25 if local_roles.include?(:app) && local_roles.include?(:memcache)
-mem_opt ||= 0.35 if local_roles.include?(:app) || local_roles.include?(:memcache)
-mem_opt ||= 0.50 if local_roles.include?(:web)
+mem_opt ||= 0.15 if local_roles.include?(:web) && local_roles.include?(:memcache)
+mem_opt ||= 0.35 if local_roles.include?(:web) || local_roles.include?(:memcache)
 mem_opt ||= 0.70  #if only db, lets use a 70% ratio
 
 orig_free_mem  = (`free -m` =~ /buffers\/cache:\s+\d+\s+(\d+)/; $1).to_i rescue 1024 

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

@@ -17,14 +17,6 @@ module  GodHelper
       end
     end
 
-    # w.start_if do |start|
-    #   start.condition(:process_running) do |c|
-    #     c.interval = 5.seconds
-    #     c.running = false
-    #     c.notify = {:contacts => ['default'], :category => 'process exited...restarting'}
-    #   end
-    # end
-
     # determine when process has finished starting
     # w.transition([:start, :restart], :up) do |on|
     #   on.condition(:process_running) do |c|
@@ -70,7 +62,7 @@ module  GodHelper
 
     end
   end
-  
+
   def monitor_lifecycle(w)
     # w.transition(:up, :unmonitored) do |on|
     w.lifecycle do |on|
@@ -85,29 +77,6 @@ module  GodHelper
         c.retry_within = 2.hours
       end
     end
-    # w.lifecycle do |on|
-    #   on.condition(:flapping) do |c| 
-    #     c.notify = {:contacts => ['default'], :category => 'process flapping...restarting'}
-    #     c.to_state = [:start, :restart] 
-    #     c.times = 5 
-    #     c.within = 60.seconds 
-    #     c.retry_in = 10.minutes
-    #     c.retry_times = 5
-    #     c.retry_within = 2.hours
-    #   end 
-    # end
-    
-    # w.lifecycle do |on|
-    #   on.condition(:flapping) do |c|
-    #     c.to_state = [:start, :restart]
-    #     c.times = 5
-    #     c.within = 5.minutes
-    #     c.transition = :unmonitored
-    #     c.retry_in = 10.minutes
-    #     c.retry_times = 5
-    #     c.retry_within = 2.hours
-    #   end
-    # end
   end
   
   class Configs

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

@@ -112,6 +112,8 @@ module Ec2onrails
       hosts_file  = "/etc/hosts"
       FileUtils.cp "#{hosts_file}.original", hosts_file
       File.open(hosts_file, 'a') do |f| 
+        f << "\n"
+        f << "# The following is automatically added by the EC2 on Rail set_roles script:\n"
         roles.each do |rolename, addresses|
           addresses.each_with_index do |address, i|
             f << "#{address} #{rolename.to_s.gsub(/_/, "-")}-#{i+1}\n"
@@ -135,6 +137,7 @@ module Ec2onrails
       # Set any variables that will be needed inside the templates
       # We're processing ALL templates, even ones that won't be used in the current role.
       rails_env = Ec2onrails::Utils.rails_env
+      config = Ec2onrails::Utils.load_config
       roles = self.roles
 
       Dir["/etc/**/*.erb"].each do |template|

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

@@ -12,5 +12,15 @@ module Ec2onrails
     def self.hostname
       `hostname -s`.strip
     end
+    
+    def self.load_config
+      config = {}
+      begin
+        config = eval(File.read("/etc/ec2onrails/config.rb"))
+      rescue Exception => e
+        puts "ERROR:\n#{e.inspect}\n#{e.backtrace.join("\n")}"
+      end
+      return config
+    end
   end
-end
+end

data/server/files/usr/local/ec2onrails/startup-scripts/first-startup/create-dirs

@@ -35,8 +35,11 @@ make_dir /etc/ec2onrails/system_files  app:app
 make_dir /mnt/log
 make_dir /mnt/log/fsck
 make_dir /mnt/log/god
-make_dir /mnt/log/mysql   mysql:mysql
-make_dir /mnt/log/nginx   nginx:nginx
+make_dir /mnt/log/mysql     mysql:mysql
+make_dir /mnt/log/nginx     nginx:nginx
+make_dir /mnt/log/varnish
+
+make_dir /mnt/varnish/
 
 make_dir /mnt/tmp
 chmod 777 /mnt/tmp

data/server/rakefile.rb

@@ -49,6 +49,8 @@ require "#{File.dirname(__FILE__)}/../lib/ec2onrails/version"
   libmysql-ruby
   libpcre3-dev
   libssl-dev
+  libxml2-dev
+  libxslt1-dev
   libyaml-ruby
   libzlib-ruby
   logrotate
@@ -67,6 +69,7 @@ require "#{File.dirname(__FILE__)}/../lib/ec2onrails/version"
   subversion
   sysstat
   unzip
+  varnish
   vim
   wget
   xfsprogs
@@ -159,7 +162,6 @@ task :install_nginx => [:require_root, :install_packages, :install_gems] do |t|
     # Make sure the dir is created but empty...lets start afresh
     run_chroot "mkdir -p -m 755 #{src_dir}/ &&  rm -rf #{src_dir}/*" 
     run_chroot "sh -c 'cd #{src_dir} && wget -q #{nginx_img} && tar -xzf #{nginx_tar}'"
-
     run_chroot "sh -c 'cd #{src_dir}/#{nginx_version} && \
        ./configure \
          --sbin-path=/usr/sbin \
@@ -202,7 +204,7 @@ task :configure => [:require_root, :install_software] do |t|
     run_chroot "update-rc.d ec2-every-startup start 92 S ."
     
     # Disable the services that will be managed by god, depending on the roles
-    %w(nginx mysql memcached).each do |service|
+    %w(nginx mysql memcached varnish).each do |service|
       run_chroot "update-rc.d -f #{service} remove"
       run_chroot "update-rc.d #{service} stop 20 2 3 4 5 ."
     end
@@ -212,6 +214,8 @@ task :configure => [:require_root, :install_software] do |t|
     
     # Create the mail aliases db
     run_chroot "postalias /etc/aliases"
+    
+    run_chroot "chmod 0440 /etc/sudoers"
   end
 end
 

data/test/test_app/config/deploy.rb

@@ -1,6 +1,6 @@
 set :application, "test_app"
 
-ssh_options[:keys] = [ENV['KEY'], "#{ENV['HOME']}/.ssh/ec2-key"]
+ssh_options[:keys] = [ENV['KEY']]
 
 raise "please add HOST=ec2-xxx.xx... on the command line" unless ENV['HOST']
 set :host, ENV['HOST']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pauldowman-ec2onrails
 version: !ruby/object:Gem::Version 
-  version: 0.9.10.0
+  version: 0.9.10.1
 platform: ruby
 authors: 
 - Paul Dowman, Adam Greene
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-29 00:00:00 -07:00
+date: 2009-07-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,7 +71,6 @@ extra_rdoc_files:
 files: 
 - CHANGELOG
 - COPYING
-- ec2onrails.gemspec
 - echoe_config.rb
 - examples/Capfile
 - examples/deploy.rb
@@ -94,6 +93,8 @@ files:
 - server/files/etc/cron.hourly/app
 - server/files/etc/cron.monthly/app
 - server/files/etc/cron.weekly/app
+- server/files/etc/default/varnish
+- server/files/etc/default/varnishncsa
 - server/files/etc/denyhosts.conf
 - server/files/etc/dpkg/dpkg.cfg
 - server/files/etc/ec2onrails/rails_env
@@ -106,6 +107,7 @@ files:
 - server/files/etc/god/master.conf
 - server/files/etc/god/memcache.god
 - server/files/etc/god/notifications.god
+- server/files/etc/god/proxy.god
 - server/files/etc/god/system.god
 - server/files/etc/god/web.god
 - server/files/etc/init.d/ec2-every-startup
@@ -116,18 +118,20 @@ files:
 - server/files/etc/memcached.conf
 - server/files/etc/motd.tail
 - server/files/etc/mysql/my.cnf
-- server/files/etc/nginx/custom.conf
+- server/files/etc/nginx/conf.d/custom.conf
 - server/files/etc/nginx/nginx.conf.erb
 - server/files/etc/postfix/main.cf
 - server/files/etc/README
 - server/files/etc/ssh/sshd_config
 - server/files/etc/sudoers
 - server/files/etc/syslog.conf
+- server/files/etc/varnish/default.vcl.erb
 - server/files/usr/local/ec2onrails/bin/archive_file
 - server/files/usr/local/ec2onrails/bin/backup_app_db
 - server/files/usr/local/ec2onrails/bin/backup_dir
 - server/files/usr/local/ec2onrails/bin/ec2_meta_data
 - server/files/usr/local/ec2onrails/bin/exec_runner
+- server/files/usr/local/ec2onrails/bin/in_role
 - server/files/usr/local/ec2onrails/bin/init_services
 - server/files/usr/local/ec2onrails/bin/install_system_files
 - server/files/usr/local/ec2onrails/bin/optimize_mysql
@@ -224,7 +228,8 @@ files:
 - test/test_app/test/performance/browsing_test.rb
 - test/test_app/test/test_helper.rb
 - TODO
-has_rdoc: true
+- ec2onrails.gemspec
+has_rdoc: false
 homepage: http://ec2onrails.rubyforge.org
 post_install_message: 
 rdoc_options: