jesse/thirteen-tien-len_classic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update deploy config

Browse Source
This commit is contained in:
Jesse C. Fisher 2021-11-13 01:43:49 -08:00
parent 91d0d5b8a6
commit c4a1b857a9
4 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Capfile
View File

@ -1,10 +1,16 @@
# Load DSL and Setup Up Stages # Load DSL and Setup Up Stages
require 'capistrano/setup' require 'capistrano/setup'
require 'capistrano/rbenv'
# Includes default deployment tasks # Includes default deployment tasks
require 'capistrano/deploy' require 'capistrano/deploy'
require 'capistrano/rbenv'
require 'capistrano/puma'
install_plugin Capistrano::Puma # Default puma tasks
require 'capistrano/puma/workers'
require 'capistrano/puma/jungle'
require 'capistrano/bundler' require 'capistrano/bundler'
# require 'capistrano/nginx'
require 'capistrano/rails/assets' require 'capistrano/rails/assets'
require 'capistrano/rails/migrations' require 'capistrano/rails/migrations'
require 'capistrano/postgresql' require 'capistrano/postgresql'
@ -29,12 +35,6 @@ install_plugin Capistrano::SCM::Git#
# require 'capistrano/bundler' # require 'capistrano/bundler'
# require 'capistrano/rails/assets' # require 'capistrano/rails/assets'
# require 'capistrano/rails/migrations' # 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. # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r } Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }

2
Gemfile
View File

@ -31,7 +31,7 @@ group :development do
gem 'capistrano-bundler' gem 'capistrano-bundler'
gem 'capistrano-rails' gem 'capistrano-rails'
gem 'capistrano-rails-console' gem 'capistrano-rails-console'
gem 'capistrano3-puma' gem 'capistrano3-puma', '~> 3'
gem 'capistrano-rbenv' gem 'capistrano-rbenv'
gem 'capistrano-nginx', github: 'koenpunt/capistrano-nginx' gem 'capistrano-nginx', github: 'koenpunt/capistrano-nginx'
gem "capistrano-db-tasks", require: false gem "capistrano-db-tasks", require: false

9
Gemfile.lock
View File

@ -88,10 +88,10 @@ GEM
capistrano-rbenv (2.2.0) capistrano-rbenv (2.2.0)
capistrano (~> 3.1) capistrano (~> 3.1)
sshkit (~> 1.3) sshkit (~> 1.3)
capistrano3-puma (5.0.4) capistrano3-puma (3.1.1)
capistrano (~> 3.7) capistrano (~> 3.7)
capistrano-bundler capistrano-bundler
puma (>= 4.0, < 6.0) puma (~> 3.4)
capybara (3.36.0) capybara (3.36.0)
addressable addressable
matrix matrix
@ -265,8 +265,7 @@ GEM
interception (>= 0.5) interception (>= 0.5)
pry (>= 0.12.0) pry (>= 0.12.0)
public_suffix (4.0.6) public_suffix (4.0.6)
puma (5.5.2) puma (3.12.6)
nio4r (~> 2.0)
pundit (2.1.1) pundit (2.1.1)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
racc (1.6.0) racc (1.6.0)
@ -435,7 +434,7 @@ DEPENDENCIES
capistrano-rails capistrano-rails
capistrano-rails-console capistrano-rails-console
capistrano-rbenv capistrano-rbenv
capistrano3-puma capistrano3-puma (~> 3)
capybara capybara
capybara-screenshot capybara-screenshot
ci_reporter_rspec ci_reporter_rspec

22
config/nginx/13.whitewizardweb.com.conf
View File

@ -3,7 +3,7 @@ upstream thirteen_production {
} }
server { server {
server_name 13.whitewizardweb.com; server_name 13.whitewizardweb.com 13.24x7.hk 13.mounthoodlodge.com 13.my.to;
root /home/jesse/srv/thirteen-tien-len_production/current/public; root /home/jesse/srv/thirteen-tien-len_production/current/public;
access_log /home/jesse/srv/thirteen-tien-len_production/shared/log/nginx.access.log; access_log /home/jesse/srv/thirteen-tien-len_production/shared/log/nginx.access.log;
@ -35,11 +35,12 @@ server {
listen 443 ssl; # managed by Certbot listen 443 ssl; # managed by Certbot
ssl_certificate /etc/letsencrypt/live/13.whitewizardweb.com/fullchain.pem; # managed by Certbot ssl_certificate /etc/letsencrypt/live/13.24x7.hk/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/13.whitewizardweb.com/privkey.pem; # managed by Certbot ssl_certificate_key /etc/letsencrypt/live/13.24x7.hk/privkey.pem; # managed by Certbot
include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
} }
server { server {
@ -48,3 +49,18 @@ server {
server_name 13.whitewizardweb.com; server_name 13.whitewizardweb.com;
return 301 https://13.whitewizardweb.com$request_uri; return 301 https://13.whitewizardweb.com$request_uri;
} }
server {
if ($host = 13.24x7.hk) {
return 301 https://$host$request_uri;
} # managed by Certbot
listen 80;
server_name 13.whitewizardweb.com 13.24x7.hk 13.mounthoodlodge.com 13.my.to;
return 404; # managed by Certbot
}