diff --git a/config/deploy.rb b/config/deploy.rb index a268bb326..c89869333 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -21,7 +21,7 @@ set :log_level, :info set :pty, true set :use_sudo, false -set :linked_files, %w{config/database.yml config/secrets.yml} +set :linked_files, %w{config/database.yml config/secrets.yml config/unicorn.rb config/environments/production.rb} set :linked_dirs, %w{log tmp public/system public/assets} set :keep_releases, 5 @@ -41,9 +41,9 @@ set(:config_files, %w( set :whenever_roles, -> { :app } namespace :deploy do - before :starting, 'rvm1:install:rvm' # install/update RVM - before :starting, 'rvm1:install:ruby' # install Ruby and create gemset - before :starting, 'install_bundler_gem' # install bundler gem + #before :starting, 'rvm1:install:rvm' # install/update RVM + #before :starting, 'rvm1:install:ruby' # install Ruby and create gemset + #before :starting, 'install_bundler_gem' # install bundler gem after :publishing, 'deploy:restart' after :published, 'delayed_job:restart' diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 90eb501c2..14ae536ac 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -1,12 +1,12 @@ set :deploy_to, deploysecret(:deploy_to) set :server_name, deploysecret(:server_name) set :db_server, deploysecret(:db_server) -set :branch, :stable +set :branch, :master set :ssh_options, port: deploysecret(:ssh_port) set :stage, :production set :rails_env, :production -#server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer) -server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer cron background) -server deploysecret(:server3), user: deploysecret(:user), roles: %w(web app db importer) -server deploysecret(:server4), user: deploysecret(:user), roles: %w(web app db importer) +server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer cron background) +#server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer cron background) +#server deploysecret(:server3), user: deploysecret(:user), roles: %w(web app db importer) +#server deploysecret(:server4), user: deploysecret(:user), roles: %w(web app db importer) diff --git a/lib/capistrano/tasks/restart.cap b/lib/capistrano/tasks/restart.cap index 54c90819a..30740e3a7 100644 --- a/lib/capistrano/tasks/restart.cap +++ b/lib/capistrano/tasks/restart.cap @@ -1,10 +1,10 @@ namespace :deploy do - desc 'Commands for unicorn application' - %w(start stop force-stop restart upgrade reopen-logs).each do |command| - task command.to_sym do - on roles(:app), in: :sequence, wait: 5 do - execute "/etc/init.d/unicorn_#{fetch(:full_app_name)} #{command}" - end - end - end -end + desc 'Restart Unicorn' + task :restart do + on roles(:app) do + execute "kill -QUIT `cat /home/deploy/consul/pids/unicorn.pid`; true" + execute "kill -QUIT `cat /home/deploy/consul/shared/pids/unicorn.pid`; true" + execute "cd /home/deploy/consul/current && /home/deploy/.rvm/gems/ruby-2.3.2/wrappers/unicorn -c config/unicorn.rb -E production -D" + end + end +end \ No newline at end of file