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

This commit is contained in:
Martin Lensment 2015-04-02 18:31:05 +03:00
commit 53023b455c
33 changed files with 746 additions and 143 deletions

View file

@ -45,8 +45,6 @@ module Registry
# Instead, the errors will propagate normally just like in other Active Record callbacks.
config.active_record.raise_in_transactional_callbacks = true
config.active_job.queue_adapter = :delayed_job
config.generators do |g|
g.stylesheets false
g.javascripts false

View file

@ -17,7 +17,6 @@ set :deploy_to, '$HOME/registry'
set :repository, 'https://github.com/domify/registry' # dev repo
set :branch, 'master'
set :rails_env, 'alpha'
set :delayed_job, true
# alpha branch
task :epp do
@ -26,7 +25,6 @@ task :epp do
set :repository, 'https://github.com/domify/registry' # dev repo
set :branch, 'master'
set :rails_env, 'alpha'
set :delayed_job, false
end
task :registrar do
@ -35,7 +33,6 @@ task :registrar do
set :repository, 'https://github.com/domify/registry' # dev repo
set :branch, 'master'
set :rails_env, 'alpha'
set :delayed_job, false
end
# staging
@ -45,7 +42,6 @@ task :st do
set :repository, 'https://github.com/internetee/registry' # production repo
set :branch, 'master' # same as production
set :rails_env, 'staging'
set :delayed_job, true
end
# staging
@ -55,7 +51,6 @@ task :eppst do
set :repository, 'https://github.com/internetee/registry' # production repo
set :branch, 'master' # same as production
set :rails_env, 'staging'
set :delayed_job, false
end
# staging
@ -65,7 +60,6 @@ task :registrarst do
set :repository, 'https://github.com/internetee/registry' # production repo
set :branch, 'master'
set :rails_env, 'staging'
set :delayed_job, false
end
# production
@ -75,7 +69,6 @@ task :pr do
set :repository, 'https://github.com/internetee/registry' # production repo
set :branch, 'master' # same as staging
set :rails_env, 'production'
set :delayed_job, true
end
# production
@ -85,7 +78,6 @@ task :epppr do
set :repository, 'https://github.com/internetee/registry' # production repo
set :branch, 'master' # same as staging
set :rails_env, 'production'
set :delayed_job, false
end
# production
@ -95,7 +87,6 @@ task :registrarst do
set :repository, 'https://github.com/internetee/registry' # production repo
set :branch, 'master'
set :rails_env, 'production'
set :delayed_job, false
end
# Manually create these paths in shared/ (eg: shared/config/database.yml) in your server.
@ -159,10 +150,6 @@ task deploy: :environment do
deploy do
# Put things that will set up an empty directory into a fully set-up
# instance of your project.
to :prepare do
invoke :'delayed_job:stop' if delayed_job
end
invoke :'git:clone'
invoke :load_commit_hash
invoke :'deploy:link_shared_paths'
@ -171,7 +158,6 @@ task deploy: :environment do
invoke :'rails:assets_precompile'
to :launch do
invoke :restart
invoke :'delayed_job:start' if delayed_job
end
end
end
@ -197,16 +183,6 @@ task load_commit_hash: :environment do
)
end
namespace :delayed_job do
task stop: :environment do
queue %(echo "-----> Stopping delayed job"; cd #{deploy_to}/current; RAILS_ENV=#{rails_env} bin/delayed_job stop)
end
task start: :environment do
queue %(echo "-----> Starting delayed job"; cd #{deploy_to}/current; RAILS_ENV=#{rails_env} bin/delayed_job start)
end
end
desc 'Restart Passenger application'
task restart: :environment do
queue "mkdir -p #{deploy_to}/current/tmp; touch #{deploy_to}/current/tmp/restart.txt"