From f3ef085632d2419b65fe4a8da4d5e9e35f4c8b3e Mon Sep 17 00:00:00 2001 From: Andre Arko Date: Thu, 8 Apr 2010 15:05:17 -0700 Subject: [PATCH] Link mongrel_cluster.yml so mongrels can start Change-Id: I8bd80e7687059274ff5b27a68adbdba2d8f0cf8e Reviewed-on: http://review.engineyard.com/184 Reviewed-by: Sam Merritt Tested-by: Sam Merritt --- lib/ey-deploy/deploy.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/ey-deploy/deploy.rb b/lib/ey-deploy/deploy.rb index 1c541681..50c3d624 100644 --- a/lib/ey-deploy/deploy.rb +++ b/lib/ey-deploy/deploy.rb @@ -34,18 +34,15 @@ def push_code # task def restart puts "~> Restarting app servers" + puts "~> restarting app: #{c.latest_release}" roles :app_master, :app, :solo do restart_command = case c.stack when "nginx_unicorn" - "/etc/init.d/unicorn_#{c.app} restart" + sudo("/etc/init.d/unicorn_#{c.app} deploy") when "nginx_mongrel" - "monit restart all -g #{c.app}" + sudo("monit restart all -g #{c.app}") when "nginx_passenger", "apache_passenger" - "touch #{c.latest_release}/tmp/restart.txt" - end - if restart_command - puts "~> restarting app: #{c.latest_release}" - sudo("cd #{c.current_path} && INLINEDIR=/tmp #{c.framework_envs} #{restart_command}") + sudo("touch #{c.latest_release}/tmp/restart.txt") end callback(:after_restart) end @@ -109,6 +106,7 @@ def symlink_configs(release_to_link=c.latest_release) "ln -nfs #{c.shared_path}/system #{release_to_link}/public/system", "ln -nfs #{c.shared_path}/pids #{release_to_link}/tmp/pids", "ln -nfs #{c.shared_path}/config/database.yml #{release_to_link}/config/database.yml", + "ln -nfs #{c.shared_path}/config/mongrel_cluster.yml #{release_to_link}/config/mongrel_cluster.yml", "chown -R #{c.user}:#{c.group} #{release_to_link}" ].join(" && ") end