zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-03 09:43:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Andres Keskküla 2014-10-08 16:33:04 +03:00
commit 8932eaec79
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/models/ability.rb
View file

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

6
config/deploy.rb
View file

@ -10,7 +10,7 @@ require 'mina/git'
# repository - Git repo to clone from. (needed by mina/git) # repository - Git repo to clone from. (needed by mina/git)
# branch - Branch name to deploy. (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 :deploy_to, '/home/app/eedirekt'
set :repository, 'https://github.com/internetee/registry' set :repository, 'https://github.com/internetee/registry'
set :branch, 'master' set :branch, 'master'
@ -19,6 +19,10 @@ task :admin do
set :deploy_to, '/home/app/registry' set :deploy_to, '/home/app/registry'
end 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. # 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. # They will be linked in the 'deploy:link_shared_paths' step.
set :shared_paths, [ set :shared_paths, [

2
config/initializers/env.rb
View file

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