server/files/etc/ec2onrails/rails_env server/files/etc/nginx/nginx.conf.erb server/files/etc/nginx/nginx.conf.working @@ -14,7 +14,6 @@ ssh_options[:keys] = ["#{ENV['HOME']}/.ssh/your-ec2-key"] # any other name (in case you have your own DNS alias) or it won't # be able to resolve to the internal IP address. role :web, "ec2-12-xx-xx-xx.z-1.compute-1.amazonaws.com" -role :app, "ec2-34-xx-xx-xx.z-1.compute-1.amazonaws.com" role :memcache, "ec2-12-xx-xx-xx.z-1.compute-1.amazonaws.com" role :db, "ec2-56-xx-xx-xx.z-1.compute-1.amazonaws.com", :primary => true # role :db, "ec2-56-xx-xx-xx.z-1.compute-1.amazonaws.com", :primary => true, :ebs_vol_id => 'vol-12345abc' examples/deploy.rb @@ -48,11 +48,12 @@ Capistrano::Configuration.instance.load do set :use_sudo, false set :user, "app" - #in case any changes were made to the configs, like changing the number of mongrels + #in case any changes were made to the configs 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" + # TODO I don't think we can do gem source -a every time because I think it adds the same repo multiple times after "ec2onrails:server:install_gems", "ec2onrails:server:add_gem_sources" # There's an ordering problem here. For convenience, we want to run 'rake gems:install' automatically @@ -60,9 +61,10 @@ Capistrano::Configuration.instance.load do # setup tasks, and at that point I don't want run_rails_rake_gems_install to run. So run_rails_rake_gems_install # can't be triggered by an "after" hook on update_code. # But users might want to have their own tasks triggered after update_code, and those tasks will - # need to have the gems installed already. + # fail if they require gems to be installed (or anything else to be set up). # - # The best solution is to use an after hook on "deploy:symlink" or "deploy:update" + # The best solution is to use an after hook on "deploy:symlink" or "deploy:update" instead of on + # "deploy:update_code" on :load do before "deploy:symlink", "ec2onrails:server:run_rails_rake_gems_install" before "deploy:symlink", "ec2onrails:server:install_system_files" lib/ec2onrails/recipes.rb @@ -4,27 +4,24 @@ Capistrano::Configuration.instance(:must_exist).load do # override default start/stop/restart tasks to use god namespace :deploy do desc <<-DESC - Overrides the default Capistrano deploy:start, uses \ - 'god start app' + Overrides the default Capistrano deploy:start. DESC - task :start, :roles => :app do - sudo "god start app" + task :start, :roles => :web do + run "touch #{current_release}/tmp/restart.txt" end desc <<-DESC - Overrides the default Capistrano deploy:stop, uses \ - 'god stop app' + Overrides the default Capistrano deploy:stop. DESC - task :stop, :roles => :app do + task :stop, :roles => :web do sudo "god stop app" end desc <<-DESC - Overrides the default Capistrano deploy:restart, uses \ - 'god restart app' + Overrides the default Capistrano deploy:restart. DESC - task :restart, :roles => :app do - sudo "god restart app" + task :restart, :roles => :web do + run "touch #{current_release}/tmp/restart.txt" end end end \ No newline at end of file lib/ec2onrails/recipes/deploy.rb @@ -36,9 +36,8 @@ Capistrano::Configuration.instance(:must_exist).load do 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. + Change the default value of RAILS_ENV on the server. + The value is specified in :rails_env. Be sure to do deploy:restart after this. DESC task :set_rails_env do lib/ec2onrails/recipes/server.rb @@ -1,5 +1,4 @@ --- :memcache: :db_primary: -:app: :web: server/files/etc/ec2onrails/roles.yml @@ -3,12 +3,13 @@ applog(nil, :info, "loading /etc/god/master.conf") require '/usr/local/ec2onrails/lib/god_helper' +require '/usr/local/ec2onrails/lib/utils' require "fileutils" include GodHelper APP_ROOT = "/mnt/app/current" -RAILS_ENV = `/usr/local/ec2onrails/bin/rails_env`.strip +RAILS_ENV = Ec2onrails::Utils.rails_env @configs = GodHelper::Configs.new server/files/etc/god/master.conf @@ -19,11 +19,13 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. require "#{File.dirname(__FILE__)}/../lib/roles_helper" +require "#{File.dirname(__FILE__)}/../lib/utils" + include Ec2onrails::RolesHelper APP_ROOT = "/mnt/app/current" -RAILS_ENV = `/usr/local/ec2onrails/bin/rails_env`.strip +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 server/files/usr/local/ec2onrails/bin/init_services @@ -19,16 +19,15 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -# This script runs a command with RAILS_ENV set to the value that's specified -# in the the mongrel_cluster config file. If a command isn't given as an -# argument it simply prints the value of RAILS_ENV +# This script runs a command with RAILS_ENV set to current value for +# this instance. If a command isn't given as an argument it simply +# prints the value of RAILS_ENV require "yaml" - -@rails_env = YAML::load_file("/etc/mongrel_cluster/app.yml")["environment"] +require "#{File.dirname(__FILE__)}/../lib/utils" if ARGV.any? - exec "env RAILS_ENV=#{@rails_env} #{ARGV.join(' ')}" + exec "env RAILS_ENV=#{Ec2onrails::Utils.rails_env} #{ARGV.join(' ')}" else - puts @rails_env + puts Ec2onrails::Utils.rails_env end server/files/usr/local/ec2onrails/bin/rails_env @@ -19,8 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -# This script updates the value of "environment" in the the mongrel_cluster -# config file. +# This script updates the current RAILS_ENV setting for this instance require "yaml" require "erb" @@ -32,9 +31,6 @@ end @rails_env = ARGV[0] -# update mongrel_cluster config -config = YAML::load_file("/etc/mongrel_cluster/app.yml") -config["environment"] = @rails_env -File.open("/etc/mongrel_cluster/app.yml", 'w') do |f| - YAML.dump(config, f) +File.open("/etc/ec2onrails/rails_env", 'w') do |f| + f << @rails_env end server/files/usr/local/ec2onrails/bin/set_rails_env @@ -23,11 +23,12 @@ require 'pp' require 'resolv' require 'socket' require 'yaml' +require "#{File.dirname(__FILE__)}/utils" module Ec2onrails module RolesHelper + ROLES_FILE = "/etc/ec2onrails/roles.yml" - MONGREL_CONF_FILE = "/etc/mongrel_cluster/app.yml" def local_address @local_address ||= get_metadata "local-ipv4" @@ -100,38 +101,6 @@ module Ec2onrails #to provide deprecated usage alias :in_role :in_role? - def web_starting_port - mongrel_config['port'].to_i rescue 8000 - end - - def web_num_instances - mongrel_config['servers'].to_i rescue 6 - end - - def web_port_range - (web_starting_port..(web_starting_port + web_num_instances-1)) - end - - def server_environment - mongrel_config["environment"] - end - - def user - mongrel_config['user'] - end - - def group - mongrel_config['group'] - end - - def application_root - mongrel_config['cwd'] - end - - def pid_file - "#{application_root}/#{mongrel_config['pid_file']}" - end - # Re-write the roles file with the hostnames resolved def resolve_hostnames_in_roles_file File.open(ROLES_FILE, 'w') {|f| YAML.dump(roles, f)} @@ -164,9 +133,8 @@ module Ec2onrails # The output from "filename.erb" will be saved as "filename" def process_config_file_templates # 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, but I think that's OK. - web_port_range = self.web_port_range - web_starting_port = self.web_starting_port + # We're processing ALL templates, even ones that won't be used in the current role. + rails_env = Ec2onrails::Utils.rails_env roles = self.roles Dir["/etc/**/*.erb"].each do |template| @@ -181,11 +149,5 @@ module Ec2onrails end end - private - - def mongrel_config - @mongrel_config ||= YAML::load_file(MONGREL_CONF_FILE) - end - end end \ No newline at end of file server/files/usr/local/ec2onrails/lib/roles_helper.rb @@ -6,7 +6,7 @@ module Ec2onrails end def self.rails_env - `/usr/local/ec2onrails/bin/rails_env`.strip + File.read("/etc/ec2onrails/rails_env").strip end def self.hostname server/files/usr/local/ec2onrails/lib/utils.rb @@ -26,10 +26,6 @@ require 'yaml' require 'erb' require "#{File.dirname(__FILE__)}/../lib/ec2onrails/version" -if `whoami`.strip != 'root' - raise "Sorry, this buildfile must be run as root." -end - # package notes: # * gcc: libraries needed to compile c/c++ files from source # * libmysqlclient-dev : provide mysqlclient-dev libs, needed for DataObject gems @@ -86,9 +82,8 @@ end "god", "RubyInline", "memcache-client", - "mongrel", - "mongrel_cluster", "optiflag", + "passenger", "rails", "rails -v '~> 2.3.2'", "rails -v '~> 2.2.2'", @@ -106,7 +101,7 @@ end task :default => :configure desc "Removes all build files" -task :clean_all do |t| +task :clean_all => :require_root do |t| puts "Unmounting proc and dev from #{@build_root}..." run "umount #{@build_root}/ubuntu/proc", true run "umount #{@build_root}/ubuntu/dev", true @@ -115,8 +110,14 @@ task :clean_all do |t| rm_rf @build_root end +task :require_root do |t| + if `whoami`.strip != 'root' + raise "Sorry, this buildfile must be run as root." + end +end + desc "Use aptitude to install required packages inside the image's filesystem" -task :install_packages do |t| +task :install_packages => :require_root do |t| unless_completed(t) do ENV['DEBIAN_FRONTEND'] = 'noninteractive' ENV['LANG'] = '' @@ -128,7 +129,7 @@ task :install_packages do |t| end desc "Install required ruby gems inside the image's filesystem" -task :install_gems => [:install_packages] do |t| +task :install_gems => [:require_root, :install_packages] do |t| unless_completed(t) do run_chroot "sh -c 'cd /tmp && wget -q http://rubyforge.org/frs/download.php/55066/rubygems-1.3.2.tgz && tar zxf rubygems-1.3.2.tgz'" run_chroot "sh -c 'cd /tmp/rubygems-1.3.2 && ruby setup.rb'" @@ -145,9 +146,9 @@ task :install_gems => [:install_packages] do |t| end desc "Install nginx from source" -task :install_nginx => [:install_packages] do |t| +task :install_nginx => [:require_root, :install_packages, :install_gems] do |t| unless_completed(t) do - nginx_version = "nginx-0.6.35" + nginx_version = "nginx-0.6.36" nginx_tar = "#{nginx_version}.tar.gz" nginx_img = "http://sysoev.ru/nginx/#{nginx_tar}" @@ -155,35 +156,26 @@ task :install_nginx => [:install_packages] do |t| src_dir = "/tmp/src/nginx" # 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 "mkdir -p -m 755 #{src_dir}/modules/nginx-upstream-fair" run_chroot "sh -c 'cd #{src_dir} && wget -q #{nginx_img} && tar -xzf #{nginx_tar}'" - - run_chroot "sh -c 'cd #{src_dir}/modules && \ - wget -q #{fair_bal_img} && \ - tar -xzf *nginx-upstream-fair*.tar.gz -o -C ./nginx-upstream-fair && \ - mv nginx-upstream-fair/*/* nginx-upstream-fair/.'" - - run_chroot "sh -c 'cd #{src_dir}/#{nginx_version} && \ - ./configure \ - --sbin-path=/usr/sbin \ - --conf-path=/etc/nginx/nginx.conf \ - --pid-path=/var/run/nginx.pid \ - --with-http_ssl_module \ - --with-http_stub_status_module \ - --add-module=#{src_dir}/modules/nginx-upstream-fair && \ - make && \ - make install'" - # run_chroot "ln -sf /usr/local/nginx/sbin/nginx /usr/sbin/nginx" - # run_chroot "ln -sf /usr/local/nginx/conf /etc/nginx" + run_chroot "sh -c 'cd #{src_dir}/#{nginx_version} && \ + ./configure \ + --sbin-path=/usr/sbin \ + --conf-path=/etc/nginx/nginx.conf \ + --pid-path=/var/run/nginx.pid \ + --with-http_ssl_module \ + --with-http_stub_status_module \ + --add-module=`/usr/bin/passenger-config --root`/ext/nginx && \ + make && \ + make install'" end end desc "Install Ubuntu packages, download and compile other software, and install gems" -task :install_software => [:install_gems, :install_packages, :install_nginx] +task :install_software => [:require_root, :install_gems, :install_packages, :install_nginx] desc "Configure the image" -task :configure => [:install_software] do |t| +task :configure => [:require_root, :install_software] do |t| unless_completed(t) do sh("cp -r files/* #{@fs_dir}") replace("#{@fs_dir}/etc/motd.tail", /!!VERSION!!/, "Version #{@version}") server/rakefile.rb @@ -6,7 +6,6 @@ ssh_options[:keys] = ["#{ENV['HOME']}/.ssh/public-ec2-key"] set :host, ENV['HOST'] || "" role :web, host -role :app, host role :db, host, :primary => true set :rails_env, "production" test/test_app/config/deploy.rb ec2onrails.gemspec server/files/etc/god/app.god server/files/etc/mongrel_cluster/app.yml server/files/etc/nginx/nginx.conf server/files/etc/nginx/upstream_members.erb fb89a916b1888b7ab345d2f00d95f6f556589b90 Paul Dowman paul@pauldowman.com http://github.com/pauldowman/ec2onrails/commit/36fd82ec1a609d9947aacd9142571f4d9a2497a3 36fd82ec1a609d9947aacd9142571f4d9a2497a3 2009-04-30T06:32:17-07:00 2009-04-30T06:32:17-07:00 First pass at switching from mongrel to Passenger. Not yet fully tested. The app role has been removed because passenger runs in the web role, a proxy role will be added to handle multi-instance setups. 38ac3fca4988d16d2ba428250106837f5dbb5fc7 Paul Dowman paul@pauldowman.com