diff --git a/config/deploy.rb b/config/deploy.rb index 840f144..e0ada53 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -25,7 +25,7 @@ append :linked_files, ".env" set :linked_dirs, %w{log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system public/lift-calculator} -set :rbenv_type, :user # or :system, depends on your rbenv setup +set :rbenv_type, :system # or :system, depends on your rbenv setup # set :rbenv_ruby, '2.6.0' set :rbenv_ruby, File.read('.ruby-version').strip set :rbenv_map_bins, %w{rake gem bundle ruby rails} @@ -38,7 +38,8 @@ set :default_env, { } # set :keep_releases, 5 -set :rbenv_custom_path, "/home/jesse/.rbenv/" + +set :rbenv_custom_path, "/usr/local/rbenv" set :rbenv_prefix, "RBENV_ROOT=#{fetch(:rbenv_custom_path)} RBENV_VERSION=#{fetch(:rbenv_ruby)} #{fetch(:rbenv_custom_path)}/bin/rbenv exec" # set :nginx_path, '/etc/nginx' # directory containing sites-available and sites-enabled # set :nginx_template, 'config/deploy/nginx_conf.erb' # configuration template diff --git a/config/environments/production.rb b/config/environments/production.rb index 3bf453e..c4328ec 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -96,6 +96,6 @@ Rails.application.configure do # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false - config.relative_url_root = "/13" - config.action_controller.relative_url_root = '/13' + # config.relative_url_root = "/13" + # config.action_controller.relative_url_root = '/13' end diff --git a/config/nginx/13.owlephant.icu.conf b/config/nginx/13.whitewizardweb.com.conf similarity index 81% rename from config/nginx/13.owlephant.icu.conf rename to config/nginx/13.whitewizardweb.com.conf index fc49cd1..94a0a11 100644 --- a/config/nginx/13.owlephant.icu.conf +++ b/config/nginx/13.whitewizardweb.com.conf @@ -3,7 +3,7 @@ upstream thirteen_production { } server { - server_name 13.owlephant.icu; + server_name 13.whitewizardweb.com; root /home/jesse/srv/thirteen-tien-len_production/current/public; access_log /home/jesse/srv/thirteen-tien-len_production/shared/log/nginx.access.log; @@ -35,8 +35,8 @@ server { listen 443 ssl; # managed by Certbot - ssl_certificate /etc/letsencrypt/live/13.owlephant.icu/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/13.owlephant.icu/privkey.pem; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/13.whitewizardweb.com/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/13.whitewizardweb.com/privkey.pem; # managed by Certbot include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot @@ -45,6 +45,6 @@ server { server { listen 80; listen [::]:80; - server_name 13.owlephant.icu; - return 301 https://13.owlephant.icu$request_uri; + server_name 13.whitewizardweb.com; + return 301 https://13.whitewizardweb.com$request_uri; }