From 91d0d5b8a699f93ede07d63387ec8a90b1bba02f Mon Sep 17 00:00:00 2001 From: "Jesse C. Fisher" Date: Sat, 13 Nov 2021 01:26:53 -0800 Subject: [PATCH] Update deploy config --- Capfile | 14 +++--- Gemfile.lock | 93 +++++++++++++++++++------------------ config/deploy/production.rb | 10 ++-- 3 files changed, 60 insertions(+), 57 deletions(-) diff --git a/Capfile b/Capfile index fa2f5d76..da6929a8 100644 --- a/Capfile +++ b/Capfile @@ -1,16 +1,10 @@ # Load DSL and Setup Up Stages require 'capistrano/setup' +require 'capistrano/rbenv' # Includes default deployment tasks require 'capistrano/deploy' - -require 'capistrano/puma' -install_plugin Capistrano::Puma # Default puma tasks -require 'capistrano/puma/workers' -require 'capistrano/puma/jungle' -require 'capistrano/rbenv' require 'capistrano/bundler' -# require 'capistrano/nginx' require 'capistrano/rails/assets' require 'capistrano/rails/migrations' require 'capistrano/postgresql' @@ -35,6 +29,12 @@ install_plugin Capistrano::SCM::Git# # require 'capistrano/bundler' # require 'capistrano/rails/assets' # require 'capistrano/rails/migrations' +require 'capistrano/puma' +install_plugin Capistrano::Puma::Systemd +# install_plugin Capistrano::Puma # Default puma tasks +# require 'capistrano/puma/workers' +# require 'capistrano/puma/jungle' +# require 'capistrano/nginx' # Loads custom tasks from `lib/capistrano/tasks' if you have any defined. Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r } diff --git a/Gemfile.lock b/Gemfile.lock index a67757a4..cfe4b96b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,8 +92,9 @@ GEM capistrano (~> 3.7) capistrano-bundler puma (>= 4.0, < 6.0) - capybara (3.35.3) + capybara (3.36.0) addressable + matrix mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) @@ -103,7 +104,7 @@ GEM capybara-screenshot (1.0.25) capybara (>= 1.0, < 4) launchy - childprocess (3.0.0) + childprocess (4.1.0) ci_reporter (2.0.0) builder (>= 2.1.2) ci_reporter_rspec (1.0.0) @@ -142,9 +143,9 @@ GEM dotenv-rails (2.7.6) dotenv (= 2.7.6) railties (>= 3.2) - em-websocket (0.5.2) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) erubi (1.10.0) erubis (2.7.0) eventmachine (1.2.7) @@ -154,19 +155,19 @@ GEM factory_girl_rails (4.9.0) factory_girl (~> 4.9.0) railties (>= 3.0.0) - faker (2.18.0) + faker (2.19.0) i18n (>= 1.6, < 2) - ffi (1.15.3) + ffi (1.15.4) formatador (0.3.0) - globalid (0.4.2) - activesupport (>= 4.2.0) - guard (2.17.0) + globalid (0.5.2) + activesupport (>= 5.0) + guard (2.18.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) nenv (~> 0.1) notiffany (~> 0.0) - pry (>= 0.9.12) + pry (>= 0.13.0) shellany (~> 0.0) thor (>= 0.18.1) guard-bundler (2.2.1) @@ -189,7 +190,7 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - haml (5.2.1) + haml (5.2.2) temple (>= 0.8.0) tilt haml-rails (2.0.1) @@ -204,9 +205,9 @@ GEM haml (>= 4.0, < 6) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - http_parser.rb (0.6.0) + http_parser.rb (0.8.0) hub (1.12.4) - i18n (1.8.10) + i18n (1.8.11) concurrent-ruby (~> 1.0) interception (0.5) jbuilder (2.11.2) @@ -217,10 +218,10 @@ GEM thor (>= 0.14, < 2.0) launchy (2.5.0) addressable (~> 2.7) - listen (3.5.1) + listen (3.7.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.10.0) + loofah (2.12.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.8) @@ -228,30 +229,31 @@ GEM mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) + matrix (0.4.2) method_source (1.0.0) mimemagic (0.3.10) nokogiri (~> 1) rake - mini_mime (1.1.0) - mini_portile2 (2.5.3) + mini_mime (1.1.2) + mini_portile2 (2.6.1) minitest (5.14.4) multi_json (1.15.0) nenv (0.3.0) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) - nio4r (2.5.7) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + nio4r (2.5.8) + nokogiri (1.12.5) + mini_portile2 (~> 2.6.1) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) orm_adapter (0.5.0) - parallel (1.20.1) - parallel_tests (3.7.0) + parallel (1.21.0) + parallel_tests (3.7.3) parallel - parser (3.0.1.1) + parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) pry (0.14.1) @@ -263,11 +265,11 @@ GEM interception (>= 0.5) pry (>= 0.12.0) public_suffix (4.0.6) - puma (5.3.2) + puma (5.5.2) nio4r (~> 2.0) - pundit (2.1.0) + pundit (2.1.1) activesupport (>= 3.0.0) - racc (1.5.2) + racc (1.6.0) rack (2.2.3) rack-livereload (0.3.17) rack @@ -289,7 +291,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) rails_layout (1.0.42) railties (5.2.2) @@ -299,13 +301,13 @@ GEM rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (13.0.4) + rake (13.0.6) rb-fchange (0.0.6) ffi rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.3.2) + rdoc (6.3.3) react-rails (2.6.1) babel-transpiler (>= 0.7.0) connection_pool @@ -329,7 +331,7 @@ GEM rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-rails (5.0.1) + rspec-rails (5.0.2) actionpack (>= 5.2) activesupport (>= 5.2) railties (>= 5.2) @@ -337,21 +339,21 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.10.2) - rubocop (1.18.3) + rspec-support (3.10.3) + rubocop (1.22.3) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.7.0, < 2.0) + rubocop-ast (>= 1.12.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.7.0) + rubocop-ast (1.13.0) parser (>= 3.0.1.1) ruby-progressbar (1.11.0) - ruby_parser (3.16.0) - sexp_processor (~> 4.15, >= 4.15.1) + ruby_parser (3.18.1) + sexp_processor (~> 4.16) rubyzip (2.3.2) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) @@ -365,10 +367,11 @@ GEM tilt sdoc (2.2.0) rdoc (>= 5.0) - selenium-webdriver (3.142.7) - childprocess (>= 0.5, < 4.0) + selenium-webdriver (4.0.3) + childprocess (>= 0.5, < 5.0) + rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2) - sexp_processor (4.15.3) + sexp_processor (4.16.0) shellany (0.0.1) simple_form (5.1.0) actionpack (>= 5.2) @@ -385,9 +388,9 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.3.0) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) sshkit (1.21.2) net-scp (>= 1.1.2) @@ -405,13 +408,13 @@ GEM thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (2.0.0) + unicode-display_width (2.1.0) warden (1.2.9) rack (>= 2.0.9) - webdrivers (4.6.0) + webdrivers (5.0.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) - selenium-webdriver (>= 3.0, < 4.0) + selenium-webdriver (~> 4.0) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) diff --git a/config/deploy/production.rb b/config/deploy/production.rb index 47856e86..c76b5e4b 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -1,15 +1,15 @@ set :stage, :production -set :nginx_server_name, '13.whitewizardweb.com' # optional, defaults to :application +set :nginx_server_name, '13.24x7.hk' # optional, defaults to :application # Simple Role Syntax # ================== # server in each group is considered to be the first # unless any hosts have the primary property set. -role :app, %w{jesse@13.whitewizardweb.com} +role :app, %w{jesse@13.24x7.hk} # Supports bulk-adding hosts to roles, the primary -role :web, %w{jesse@13.whitewizardweb.com} -role :db, %w{jesse@13.whitewizardweb.com} +role :web, %w{jesse@13.24x7.hk} +role :db, %w{jesse@13.24x7.hk} # Extended Server Syntax # ====================== @@ -17,7 +17,7 @@ role :db, %w{jesse@13.whitewizardweb.com} # definition into the server list. The second argument # something that quacks like a hash can be used to set # extended properties on the server. -server '13.whitewizardweb.com', user: 'jesse', roles: %w{web app db}, my_property: :my_value +server '13.24x7.hk', user: 'jesse', roles: %w{web app db}, my_property: :my_value # you can set custom ssh options # it's possible to pass any option but you need to keep in mind that net/ssh understand limited list of options