Merge branch 'master' of github.com:internetee/registry

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:
@@ -20,20 +20,20 @@ set :branch, 'master'
 task :st do
   set :domain, 'registry-st'
   set :deploy_to, '/home/registry/registry'
-  set :branch, 'master' # temp
+  set :branch, 'st'
 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.
 # 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]'

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

config/initializers/env.rb

@@ -1,2 +0,0 @@
-# options: :admin, :registrar, :eedirect
-REGISTRY_ENV = :eedirect