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

app/controllers/application_controller.rb

@@ -10,7 +10,7 @@ class ApplicationController < ActionController::Base
   end
 
   def after_sign_in_path_for(resource)
-    if resource.admin?
+    if REGISTRY_ENV == :admin && resource.admin?
       (session[:user_return_to].nil?) ? admin_root_path : session[:user_return_to].to_s
     else
       (session[:user_return_to].nil?) ? client_root_path : session[:user_return_to].to_s

app/models/ability.rb

@@ -6,7 +6,7 @@ class Ability
     alias_action :create, :read, :update, :destroy, :to => :crud
 
     user ||= User.new
-    if user.admin?
+    if REGISTRY_ENV == :admin && user.admin?
       can :manage, Domain
       can :switch, :registrar
       can :crud, DomainTransfer

config/deploy.rb

@@ -15,9 +15,14 @@ set :deploy_to, '/home/app/registry'
 set :repository, 'https://github.com/internetee/registry'
 set :branch, 'master'
 
+task :admin do
+  set :deploy_to, '/home/app/admin-registry'
+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/database.yml',
   'config/secrets.yml',
   'log',
@@ -49,6 +54,9 @@ task setup: :environment do
   queue! %(mkdir -p "#{deploy_to}/shared/config")
   queue! %(chmod g+rx,u+rwx "#{deploy_to}/shared/config")
 
+  queue! %(mkdir -p "#{deploy_to}/shared/config/initializers")
+  queue! %(chmod g+rx,u+rwx "#{deploy_to}/shared/config/initializers")
+
   queue! %(mkdir -p "#{deploy_to}/shared/public")
   queue! %(chmod g+rx,u+rwx "#{deploy_to}/shared/public")
 

config/initializers/env.rb

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