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

app/models/ability.rb

@@ -12,6 +12,9 @@ class Ability
       when :eedirekt
         can :create, :session
         admin = false
+      when :registrar
+        can :create, :session
+        admin = false
       when :admin
         can :create, :admin_session
         admin = user.admin?

config/deploy.rb

@@ -10,7 +10,7 @@ require 'mina/git'
 #   repository   - Git repo to clone from. (needed by mina/git)
 #   branch       - Branch name to deploy. (needed by mina/git)
 
-set :domain, 'testregistry'
+set :domain, 'localregistry'
 set :deploy_to, '/home/app/eedirekt'
 set :repository, 'https://github.com/internetee/registry'
 set :branch, 'master'
@@ -19,6 +19,10 @@ task :admin do
   set :deploy_to, '/home/app/registry'
 end
 
+task :registrar do
+  set :deploy_to, '/home/app/registrar'
+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

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