Skip to content

Commit

Permalink
deploys successfully
Browse files Browse the repository at this point in the history
  • Loading branch information
Philip (flip) Kromer committed Dec 11, 2009
1 parent f7e7571 commit a961cbe
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 15 deletions.
18 changes: 8 additions & 10 deletions config/deploy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,11 @@
end

task :restart, :roles => [:web, :app] do
run "kill -USR2 \`cat #{deploy_to}/shared/tmp/unicorn.pid\` || true"
sleep 1
run "kill -QUIT \`cat #{deploy_to}/shared/tmp/unicorn.pid\` || true"
end

# This will make sure that Capistrano doesn't try to run rake:migrate (this is not a Rails project!)
task :cold do
deploy.update
deploy.start
run(%Q{ if [ -f #{deploy_to}/shared/tmp/unicorn.pid ] ; } +
%Q{ then kill -USR2 \`cat #{deploy_to}/shared/tmp/unicorn.pid\` ; sleep 1 ; kill -QUIT \`cat #{deploy_to}/shared/tmp/unicorn.pid\` ; } +
%Q{ else cd #{deploy_to}/current && unicorn -D -c unicorn-conf.rb config.ru ; fi })
end


task :after_symlink do
run "ln -nfs #{deploy_to}/shared/system/settings.yml #{deploy_to}/current/config/settings.yml"
end
Expand All @@ -48,4 +41,9 @@
run "sudo gem install rack rack-test sinatra haml extlib monk-glue json unicorn god godhead"
end

# This will make sure that Capistrano doesn't try to run rake:migrate (this is not a Rails project!)
task :cold do
deploy.update
deploy.start
end
end
10 changes: 5 additions & 5 deletions config/production/etc/nginx/vhosts/cartilage.conf
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
upstream cartilage {
server unix:/slice/www/cartilage/shared/tmp/unicorn.sock;
server unix:/var/www/cartilage/shared/tmp/unicorn.sock;
}

server {
listen 80;
server_name _ * "";
root /slice/www/cartilage/current/public;
access_log /slice/www/cartilage/shared/log/cartilage-access.log;
error_log /slice/www/cartilage/shared/log/cartilage-error.log;
server_name _ "";
root /var/www/cartilage/current/public;
access_log /var/www/cartilage/shared/log/cartilage-access.log;
error_log /var/www/cartilage/shared/log/cartilage-error.log;
client_max_body_size 200M;

if (-f $document_root/maintenance.html) {
Expand Down

0 comments on commit a961cbe

Please sign in to comment.