From 3a2d36ebc0b9e909b5ae020eafc72170a418c956 Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Tue, 13 Jan 2015 10:48:58 +0200
Subject: [PATCH 1/2] branch cleanup

---
 config/deploy.rb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index 6e8d61d69..f1b18f25f 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -11,23 +11,26 @@ require 'mina/rbenv'  # for rbenv support. (http://rbenv.org)
 #   repository   - Git repo to clone from. (needed by mina/git)
 #   branch       - Branch name to deploy. (needed by mina/git)
 
+# developers branch
 set :domain, 'registry-st'
 set :deploy_to, '$HOME/registry'
-set :repository, 'https://github.com/internetee/registry'
+set :repository, 'https://github.com/domify/registry' # dev repo
 set :branch, 'master'
 
 # staging
 task :st do
   set :domain, 'registry-st'
   set :deploy_to, '$HOME/registry'
-  set :branch, 'st'
+  set :repository, 'https://github.com/internetee/registry' # production repo
+  set :branch, 'master' # same as production
 end
 
 # production
 task :pr do
   set :domain, 'registry'
   set :deploy_to, '$HOME/registry'
-  set :branch, 'pr'
+  set :repository, 'https://github.com/internetee/registry' # production repo
+  set :branch, 'master' # same as staging
 end
 
 # Manually create these paths in shared/ (eg: shared/config/database.yml) in your server.
@@ -92,8 +95,8 @@ task deploy: :environment do
     invoke :'bundle:install'
     invoke :'rails:db_migrate'
     invoke :'rails:assets_precompile'
+    invoke :'whenever:update'
     to :launch do
-      invoke :'whenever:update'
       invoke :restart
     end
   end
@@ -107,8 +110,8 @@ task rollback: :environment do
     ls -Art "#{deploy_to}/releases" | sort | tail -n 2 | head -n 1 |
     xargs -I active ln -nfs "#{deploy_to}/releases/active" "#{deploy_to}/current"
   )
+  invoke :'whenever:update'
   to :launch do
-    invoke :'whenever:update'
     invoke :restart
   end
 end

From 48dfa45f1b215216061e21824fd22d3e5ca63dee Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Tue, 13 Jan 2015 10:50:23 +0200
Subject: [PATCH 2/2] update whenever deploy

---
 config/deploy.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index f1b18f25f..b41ed3088 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -95,8 +95,8 @@ task deploy: :environment do
     invoke :'bundle:install'
     invoke :'rails:db_migrate'
     invoke :'rails:assets_precompile'
-    invoke :'whenever:update'
     to :launch do
+      invoke :'whenever:update'
       invoke :restart
     end
   end