pauldowman-ec2onrails 0.9.10.1 → 0.9.10.2

data/Manifest

@@ -33,7 +33,6 @@ 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
@@ -43,8 +42,9 @@ 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/logrotate.d/rails
+server/files/etc/logrotate.d/varnish
 server/files/etc/memcached.conf
 server/files/etc/motd.tail
 server/files/etc/mysql/my.cnf

data/ec2onrails.gemspec

@@ -5,15 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ec2onrails}
-  s.version = "0.9.10.1"
+  s.version = "0.9.10.2"
 
   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-07-07}
+  s.date = %q{2009-08-06}
   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", "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.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/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/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/nginx", "server/files/etc/logrotate.d/rails", "server/files/etc/logrotate.d/varnish", "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"]
   s.homepage = %q{http://ec2onrails.rubyforge.org}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Ec2onrails", "--main", "README.textile"]
   s.require_paths = ["lib"]

data/lib/ec2onrails/recipes/server.rb

@@ -322,13 +322,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
       
       desc <<-DESC
-        DEPRECATED. To install files into the system create the directory
-        RAILS_ROOT/config/ec2onrails/system_files, it can contain files
-        that will be installed into the server relative to "/", and it
-        can contain a manifest file with metadata, this allows the files
-        to be chowned to any user on the system, and it allows the files
-        to be cleanly uninstalled from the system.
-        TODO pointer to full documentation
+        DEPRECATED. See install_system_files.
       DESC
       task :deploy_files do
         if cfg[:server_config_files_root]
@@ -352,12 +346,12 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
       
       desc <<-DESC
-        DEPRECATED. To install files into the system create the directory
-        RAILS_ROOT/config/ec2onrails/system_files, it can contain files
-        that will be installed into the server relative to "/", and it
-        can contain a manifest file with metadata, this allows the files
-        to be chowned to any user on the system, and it allows the files
-        to be cleanly uninstalled from the system.
+        Installs files into the system anywhere outside of the Rails app.
+        The directory RAILS_ROOT/config/ec2onrails/system_files can contain
+        files that will be installed into the server relative to "/", and it
+        can contain a manifest file with metadata to change the file owner
+        and permissions, and it allows the files to be cleanly uninstalled 
+        from the system.
         TODO pointer to full documentation
       DESC
       task :install_system_files do
@@ -434,6 +428,14 @@ Capistrano::Configuration.instance(:must_exist).load do
         end
       end
       
+      desc <<-DESC
+        Clear the varnish proxy cache (if caching is enabled, which it isn't
+        by default). Purges all documents from the cache.
+      DESC
+      task :purge_proxy_cache, :roles => :proxy do
+        run "varnishadm -T localhost:6082 'url.purge .*'"
+      end
+      
       desc <<-DESC
         Restrict the app user's sudo access.
         Defaults the user to only be able to \

data/lib/ec2onrails/version.rb

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

data/server/files/etc/cron.daily/logrotate_post

@@ -17,3 +17,9 @@ for f in `ls /mnt/log/nginx/*.log` ; do
     /usr/local/ec2onrails/bin/archive_file --file $logfile.gz --dir logs/nginx && rm $logfile.gz
   fi
 done
+
+logfile=/mnt/log/varnish/varnishncsa.log-`date +%Y%m%d`
+if [ -e $logfile ] ; then
+  gzip $logfile
+  /usr/local/ec2onrails/bin/archive_file --file $logfile.gz --dir logs/varnish && rm $logfile.gz
+fi

data/server/files/etc/god/db_primary.god

@@ -13,5 +13,4 @@ God.watch do |w|
   w.grace    = 60.seconds
 
   restart_if_resource_hog(w, :memory_usage => false)
-  monitor_lifecycle(w)
-end
+end

data/server/files/etc/god/dkim_filter.god

@@ -13,7 +13,5 @@ if File.exists?('/etc/init.d/dkim-filter')
 
     default_configurations(w)
     restart_if_resource_hog(w, :memory_usage => 20.megabytes, :cpu_usage => 10.percent)
-    monitor_lifecycle(w)
   end
 end
-

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

@@ -1,5 +1,8 @@
 # For TextMate users, change the language type (at bottom of window, next to line/column counter, to ruby)
 #
+
+# TODO move to event-based config
+
 applog(nil, :info, "loading /etc/god/master.conf")
 
 require '/usr/local/ec2onrails/lib/god_helper'
@@ -15,10 +18,11 @@ APP_ROOT = "/mnt/app/current"
 @configs = GodHelper::Configs.new
 
 God.pid_file_directory = "/var/run/god"
-God.load "/etc/god/*.god"
 
-applog(nil, :info, "about to load application specific configs at #{APP_ROOT}/config/god/*.god")
+applog(nil, :info, "About to load system configs at /etc/god/*.god")
+God.load "/etc/god/*.god"
 
+applog(nil, :info, "About to load application-specific configs at #{APP_ROOT}/config/god/*.god")
 God.load "#{APP_ROOT}/config/god/*.god"
 
 

data/server/files/etc/god/memcache.god

@@ -12,5 +12,4 @@ God.watch do |w|
   w.grace     = 10.seconds
  
   restart_if_resource_hog(w, :memory_usage => false)
-  monitor_lifecycle(w)
 end

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

@@ -2,13 +2,10 @@ God::Contacts::Email.message_settings = {
   :from => 'root@localhost'
 }
 
-God::Contacts::Email.server_settings = {
-   :address => 'localhost',
-   :port => 25
-}
+God::Contacts::Email.delivery_method = :sendmail
 
 God.contact(:email) do |c|
-  c.name = 'app'
+  c.name = 'root'
   c.email = 'root@localhost'
   c.group = 'default'
 end

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

@@ -21,6 +21,20 @@ God.watch do |w|
   # 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
+
+God.watch do |w|
+  w.name  = "varnishncsa"
+  w.group = "proxy"
+  w.autostart = false
+
+  w.start     = "/etc/init.d/varnishncsa start"
+  w.stop      = "/etc/init.d/varnishncsa stop"
+  w.restart   = "/etc/init.d/varnishncsa restart"
+  w.pid_file  = "/var/run/varnishncsa.pid"
+  w.grace     = 10.seconds
+ 
+  default_configurations(w)
+
+  restart_if_resource_hog(w, :memory_usage => 100.megabytes, :cpu_usage => 50.percent)
 end

data/server/files/etc/god/system.god

@@ -12,23 +12,26 @@ God.watch do |w|
     on.condition(:disk_usage) do |c| 
       c.mount_point = "/" 
       c.above = 75
+      c.notify = {:contacts => ['default'], :category => "RAILS_ENV=#{Ec2onrails::Utils.rails_env}"}
     end 
 
     on.condition(:disk_usage) do |c| 
       c.mount_point = "/mnt"
       c.above = 75
+      c.notify = {:contacts => ['default'], :category => "RAILS_ENV=#{Ec2onrails::Utils.rails_env}"}
     end 
     
-    # on.condition(:memory_usage) do |c|
-    #   c.above = 170.megabytes
-    #   c.times = [3, 5] # 3 out of 5 intervals
-    # end
+    on.condition(:memory_usage) do |c|
+      c.above = 80.percent
+      c.times = [3, 5] # 3 out of 5 intervals
+      c.notify = {:contacts => ['default'], :category => "RAILS_ENV=#{Ec2onrails::Utils.rails_env}"}
+    end
   
     on.condition(:cpu_usage) do |c|
       c.above = 90.percent
       c.times = [5, 8]
-    end
-        
+      c.notify = {:contacts => ['default'], :category => "RAILS_ENV=#{Ec2onrails::Utils.rails_env}"}
+    end        
   end
  
 end

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

@@ -20,6 +20,4 @@ God.watch do |w|
       c.times = [3, 5] # 3 out of 5 intervals
     end
   end
-  
-  monitor_lifecycle(w)
 end

data/server/files/etc/logrotate.d/nginx

@@ -1,11 +1,10 @@
 /mnt/log/nginx/*.log {
   daily
+  rotate 7
   missingok
   dateext
-  compress
-  create 640 root app
-  notifempty
   sharedscripts
-  extension gz
-  copytruncate
+  postrotate
+    test -f /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid`
+  endscript
 }

data/server/files/etc/logrotate.d/rails

@@ -0,0 +1,8 @@
+# Rotate Rails application logs
+/mnt/app/current/log/*.log {
+  daily
+  rotate 7
+  missingok
+  dateext
+  copytruncate
+}

data/server/files/etc/logrotate.d/varnish

@@ -0,0 +1,14 @@
+/mnt/log/varnish/varnish.log /mnt/log/varnish/varnishncsa.log {
+  daily
+  rotate 7
+  missingok
+  dateext
+  sharedscripts
+  postrotate
+    for service in varnishlog varnishncsa; do
+      if /usr/bin/pgrep -P 1 $service >/dev/null; then
+        /usr/sbin/invoke-rc.d $service reload > /dev/null
+      fi
+    done
+  endscript
+}

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

@@ -12,13 +12,17 @@ http {
   passenger_root <%= `/usr/bin/passenger-config --root`.strip %>;
   passenger_default_user app;
   passenger_pool_idle_time 0;
-  rails_spawn_method conservative;
   rails_framework_spawner_idle_time 0;
   rails_app_spawner_idle_time 0;
+
   # We leave passenger_max_pool_size at the default for now. (It might
   # eventually be an ERB variable that can be set automatically based on the
   # instance type and what roles it's in.)
   # passenger_max_pool_size 6;
+
+  # We leave the rails_spawn_method at the default, but we might want a config setting
+  # to allow it to be changed.
+  # rails_spawn_method smart-lv2;
   
   include /etc/nginx/mime.types;
   
@@ -88,7 +92,7 @@ http {
     root /mnt/app/current/public;
 
     error_page   400 /400.html;
-    error_page   500 502 503 504  /500.html;
+    error_page   500 502 504  /500.html;
     location = /500.html {
       root /mnt/app/current/public;
     }
@@ -110,9 +114,14 @@ http {
     # page if it exists in the doc root. This is for capistrano's
     # disable web task
     if (-f $document_root/system/maintenance.html) {
+      return 503;
+    }
+    error_page 503 @503;
+    location @503 {
       rewrite  ^(.*)$  /system/maintenance.html break;
     }
     
+    
     # see http://wiki.codemongers.com/NginxHttpStubStatusModule
     # for more information
     location /nginx_status {

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

@@ -29,7 +29,7 @@ RAILS_ENV = Ec2onrails::Utils.rails_env
 
 #reload configs to pick up any new changes
 # Just a thought... do we really need to load god files from inside the app? They could just be installed via install_system_files, that would be simpler
-Dir.glob("/etc/god/*.god") + Dir.glob("/mnt/app/current/config/god/#{RAILS_ENV}/*.god").each do |f|
+Dir.glob("/etc/god/*.god") + Dir.glob("/mnt/app/current/config/god/*.god").each do |f|
   sudo "god load '#{f}'"
 end
 

data/server/files/usr/local/ec2onrails/config

@@ -12,7 +12,7 @@ fi
 export EC2_HOME=/usr/local/ec2-api-tools
 export PATH="$PATH:$EC2_HOME/bin"
 
-export JAVA_HOME="/usr/lib/jvm/java-6-sun"
+if [ -e "/usr/lib/jvm/java-6-sun" ]; then export JAVA_HOME="/usr/lib/jvm/java-6-sun"; fi
 
 # Set the bash prompt to include the rails environment name
 case "$TERM" in

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

@@ -1,5 +1,6 @@
 module  GodHelper
   require '/usr/local/ec2onrails/lib/roles_helper'
+  require '/usr/local/ec2onrails/lib/utils'
   require 'fileutils'
 
   def default_configurations(w)
@@ -11,32 +12,45 @@ module  GodHelper
 
     w.start_if do |start|
       start.condition(:process_running) do |c|
-        c.notify = {:contacts => ['default'], :category => 'process not started...starting'}
         c.interval = 5.seconds
         c.running = false
       end
     end
 
     # determine when process has finished starting
-    # w.transition([:start, :restart], :up) do |on|
-    #   on.condition(:process_running) do |c|
-    #     c.running = true
-    #   end
-    # 
-    #   # failsafe
-    #   on.condition(:tries) do |c|
-    #     c.times = 8
-    #     c.within = 2.minutes
-    #     c.transition = :start
-    #   end
-    # end
-    # 
-    # # start if process is not running
-    # w.transition(:up, :start) do |on|
-    #   on.condition(:process_exits) do |c|
-    #     c.notify = {:contacts => ['default'], :category => 'process exited...restarting'}
-    #   end
-    # end
+    w.transition([:start, :restart], :up) do |on|
+      on.condition(:process_running) do |c|
+        c.running = true
+      end
+    
+      # failsafe
+      on.condition(:tries) do |c|
+        c.times = 8
+        c.within = 2.minutes
+        c.transition = :start
+      end
+    end
+    
+    # start if process is not running
+    w.transition(:up, :start) do |on|
+      on.condition(:process_exits) do |c|
+        c.notify = {:contacts => ['default'], :category => "RAILS_ENV=#{Ec2onrails::Utils.rails_env}"}
+      end
+    end
+    
+    w.lifecycle do |on|
+      on.condition(:flapping) do |c|
+        c.notify = {:contacts => ['default'], :category => "RAILS_ENV=#{Ec2onrails::Utils.rails_env}"}
+        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
 
   def restart_if_resource_hog(w, options={})
@@ -44,7 +58,7 @@ module  GodHelper
     w.restart_if do |restart|
       if options[:memory_usage]
         restart.condition(:memory_usage) do |c|
-          c.notify = {:contacts => ['default'], :category => "process over #{options[:memory_usage]/1.megabyte}MB.  restarting"}
+          c.notify = {:contacts => ['default'], :category => "RAILS_ENV=#{Ec2onrails::Utils.rails_env}"}
           c.above = options[:memory_usage]
           c.times = [3,5]
         end
@@ -52,7 +66,7 @@ module  GodHelper
 
       if options[:cpu_usage]
         restart.condition(:cpu_usage) do |c|
-          c.notify = {:contacts => ['default'], :category => "process over #{options[:cpu_usage]*100}%.  restarting"}
+          c.notify = {:contacts => ['default'], :category => "RAILS_ENV=#{Ec2onrails::Utils.rails_env}"}
           c.above = options[:cpu_usage]
           c.times = 5
         end
@@ -63,24 +77,8 @@ module  GodHelper
     end
   end
 
-  def monitor_lifecycle(w)
-    # w.transition(:up, :unmonitored) do |on|
-    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 = 5.minutes
-        c.transition = :unmonitored
-        c.retry_in = 10.minutes
-        c.retry_times = 5
-        c.retry_within = 2.hours
-      end
-    end
-  end
-  
   class Configs
      include Ec2onrails::RolesHelper
   end
   
-end
+end

data/server/rakefile.rb

@@ -87,7 +87,7 @@ require "#{File.dirname(__FILE__)}/../lib/ec2onrails/version"
   "optiflag",
   "passenger",
   "rails",
-  "rails -v '~> 2.3.2'",
+  "rails -v '~> 2.3.3'",
   "rails -v '~> 2.2.2'",
   "rails -v '~> 2.1.2'",
   "rails -v '~> 2.0.5'",
@@ -134,11 +134,13 @@ end
 desc "Install required ruby gems inside the image's filesystem"
 task :install_gems => [:require_root, :install_packages] do |t|
   unless_completed(t) do
-    url = "http://rubyforge.org/frs/download.php/56227/rubygems-1.3.3.tgz"
-    filename = "rubygems-1.3.3.tgz"
+    version = "1.3.5"
+    dir = "60718"
     
+    filename = "rubygems-#{version}.tgz"
+    url = "http://rubyforge.org/frs/download.php/#{dir}/#{filename}"
     run_chroot "sh -c 'cd /tmp && wget -q #{url} && tar zxf #{filename}'"
-    run_chroot "sh -c 'cd /tmp/rubygems-1.3.3 && ruby setup.rb'"
+    run_chroot "sh -c 'cd /tmp/rubygems-#{version} && ruby setup.rb'"
     run_chroot "ln -sf /usr/bin/gem1.8 /usr/bin/gem"
     #NOTE: this will update to the most recent rubygems version even if we haven't updated the url here
     run_chroot "gem update --system --no-rdoc --no-ri"
@@ -204,7 +206,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 varnish).each do |service|
+    %w(nginx mysql memcached varnish varnishncsa).each do |service|
       run_chroot "update-rc.d -f #{service} remove"
       run_chroot "update-rc.d #{service} stop 20 2 3 4 5 ."
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pauldowman-ec2onrails
 version: !ruby/object:Gem::Version 
-  version: 0.9.10.1
+  version: 0.9.10.2
 platform: ruby
 authors: 
 - Paul Dowman, Adam Greene
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-07 00:00:00 -07:00
+date: 2009-08-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ extra_rdoc_files:
 files: 
 - CHANGELOG
 - COPYING
+- ec2onrails.gemspec
 - echoe_config.rb
 - examples/Capfile
 - examples/deploy.rb
@@ -103,7 +104,6 @@ files:
 - 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
@@ -113,8 +113,9 @@ files:
 - 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/logrotate.d/rails
+- server/files/etc/logrotate.d/varnish
 - server/files/etc/memcached.conf
 - server/files/etc/motd.tail
 - server/files/etc/mysql/my.cnf
@@ -228,9 +229,9 @@ files:
 - test/test_app/test/performance/browsing_test.rb
 - test/test_app/test/test_helper.rb
 - TODO
-- ec2onrails.gemspec
 has_rdoc: false
 homepage: http://ec2onrails.rubyforge.org
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -256,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ec2onrails
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Client-side libraries (Capistrano tasks) for managing and  deploying to EC2 on Rails servers.

data/server/files/etc/god/examples/have_god_daemonize.god

@@ -1,18 +0,0 @@
-# here we have an example script which is not daemonized.  
-#
-# Make sure that mq_poller requires the right libraries and runs in a loop...
-
-God.watch do |w|
-  w.name = 'queue'
-  w.group = 'app'
-  
-  w.uid = @configs.user
-  w.gid = @configs.group
-  w.autostart = false
-  
-  w.start = "/usr/local/ec2onrails/bin/rails_env #{APP_ROOT}/script/mq_poller"
-
-  default_configurations(w)
-  restart_if_resource_hog(w)
-  monitor_lifecycle(w)
-end

data/server/files/etc/logrotate.d/mongrel

@@ -1,11 +0,0 @@
-/mnt/app/current/log/*/*.log /mnt/app/current/log/*.log {
-  daily
-  missingok
-  dateext
-  rotate 365
-  compress
-  notifempty
-  sharedscripts
-  extension gz
-  copytruncate
-}