From 581667fdfcddf11e77551c1b1ae7ebe5c393d768 Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Mon, 5 Jan 2015 14:55:04 +0200
Subject: [PATCH 1/3] added devise example secret

---
 config/deploy.rb                             | 6 +++---
 config/initializers/devise_secret_example.rb | 5 +++++
 config/initializers/env.rb                   | 2 --
 3 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 config/initializers/devise_secret_example.rb
 delete mode 100644 config/initializers/env.rb

diff --git a/config/deploy.rb b/config/deploy.rb
index c85ec4a9d..de447e0df 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -2,7 +2,7 @@ require 'mina/bundler'
 require 'mina/rails'
 require 'mina/git'
 require 'mina/whenever'
-# require 'mina/rbenv'  # for rbenv support. (http://rbenv.org)
+require 'mina/rbenv'  # for rbenv support. (http://rbenv.org)
 # require 'mina/rvm'    # for rvm support. (http://rvm.io)
 
 # Basic settings:
@@ -33,7 +33,7 @@ end
 # Manually create these paths in shared/ (eg: shared/config/database.yml) in your server.
 # They will be linked in the 'deploy:link_shared_paths' step.
 set :shared_paths, [
-  'config/initializers/env.rb',
+  'config/initializers/devise_secret.rb',
   'config/database.yml',
   'config/secrets.yml',
   'log',
@@ -50,7 +50,7 @@ set :shared_paths, [
 task :environment do
   # If you're using rbenv, use this to load the rbenv environment.
   # Be sure to commit your .rbenv-version to your repository.
-  # invoke :'rbenv:load'
+  invoke :'rbenv:load'
 
   # For those using RVM, use this to load an RVM version@gemset.
   # invoke :'rvm:use[ruby-1.9.3-p125@default]'
diff --git a/config/initializers/devise_secret_example.rb b/config/initializers/devise_secret_example.rb
new file mode 100644
index 000000000..0e19a27cf
--- /dev/null
+++ b/config/initializers/devise_secret_example.rb
@@ -0,0 +1,5 @@
+# Please generate production secret with 'rake secret' command
+# example secret: 'c831d559c77de1e6544ed4954d5752c294d2390036e45962dc0d44942f20db795ab7b0485b34faf237183660348e3192344404f52df7dee23d8031521d550f89'
+Devise.setup do |config|
+  config.secret_key = 'please-change'
+end
diff --git a/config/initializers/env.rb b/config/initializers/env.rb
deleted file mode 100644
index 9e0618ffb..000000000
--- a/config/initializers/env.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# options: :admin, :registrar, :eedirect
-REGISTRY_ENV = :eedirect

From c8cc83b0e27c374caabfa67bbb3e92c45154a4b4 Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Mon, 5 Jan 2015 14:57:41 +0200
Subject: [PATCH 2/3] added production branch

---
 config/deploy.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index de447e0df..901b19ecc 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -20,14 +20,14 @@ set :branch, 'master'
 task :st do
   set :domain, 'registry-st'
   set :deploy_to, '/home/registry/registry'
-  set :branch, 'master' # temp
+  set :branch, 'pr'
 end
 
 # production
 task :pr do
   set :domain, 'registry'
   set :deploy_to, '/home/registry/registry'
-  set :branch, 'master' # temp
+  set :branch, 'pr'
 end
 
 # Manually create these paths in shared/ (eg: shared/config/database.yml) in your server.

From e4cbcb14a113ec3e8921bf8c3c5638748f1078fb Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Mon, 5 Jan 2015 15:01:52 +0200
Subject: [PATCH 3/3] added staging branch

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

diff --git a/config/deploy.rb b/config/deploy.rb
index 901b19ecc..589d7f3e0 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -20,7 +20,7 @@ set :branch, 'master'
 task :st do
   set :domain, 'registry-st'
   set :deploy_to, '/home/registry/registry'
-  set :branch, 'pr'
+  set :branch, 'st'
 end
 
 # production