More work on tuning capistrano deploy

6 files changed, 20 insertions, 6 deletions

diff --git a/Capfile b/Capfile
index 508e77e..138b8f8 100644
--- a/Capfile
+++ b/Capfile
@@ -30,8 +30,8 @@ require "capistrano/rvm"
 # require "capistrano/rbenv"
 # require "capistrano/chruby"
 require "capistrano/bundler"
-# require "capistrano/rails/assets"
-# require "capistrano/rails/migrations"
+require "capistrano/rails/assets"
+require "capistrano/rails/migrations"
 # require "capistrano/passenger"
 
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
diff --git a/Gemfile b/Gemfile
index 1f3e508..6888888 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,7 +54,7 @@ group :development do
   gem "capistrano-rails", require: false
   gem "capistrano-bundler", require: false
   gem "capistrano-rvm", require: false
-  gem "capistrano-puma", require: false
+  gem "capistrano3-puma", require: false
   gem "ed25519", ">= 1.2", "< 2.0", require: false # Needed for cap ed25519 support
   gem "bcrypt_pbkdf", ">= 1.0", "< 2.0", require: false # Needed for cap ed25519 support
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index e29108f..d84059e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -79,14 +79,16 @@ GEM
       sshkit (>= 1.9.0)
     capistrano-bundler (2.0.1)
       capistrano (~> 3.1)
-    capistrano-puma (0.2.3)
-      capistrano (>= 3.0)
     capistrano-rails (1.6.1)
       capistrano (~> 3.1)
       capistrano-bundler (>= 1.1, < 3)
     capistrano-rvm (0.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
+    capistrano3-puma (5.0.4)
+      capistrano (~> 3.7)
+      capistrano-bundler
+      puma (>= 4.0, < 6.0)
     capybara (3.35.3)
       addressable
       mini_mime (>= 0.1.3)
@@ -274,9 +276,9 @@ DEPENDENCIES
   byebug
   capistrano
   capistrano-bundler
-  capistrano-puma
   capistrano-rails
   capistrano-rvm
+  capistrano3-puma
   capybara (>= 3.26)
   devise
   ed25519 (>= 1.2, < 2.0)
diff --git a/config/database.yml b/config/database.yml
index bf858ca..4ba4454 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -81,5 +81,6 @@ test:
 #
 production:
   <<: *default
+  database: <%= ENV["ESOTERRA_DATABASE_NAME"] %>
   username: <%= ENV["ESOTERRA_DATABASE_USERNAME"] %>
   password: <%= ENV["ESOTERRA_DATABASE_PASSWORD"] %>
diff --git a/config/deploy.rb b/config/deploy.rb
index 8384427..925f0d6 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -17,6 +17,8 @@ append :linked_files, "config/database.yml", "config/master.key"
 set :keep_assets, 2
 set :keep_releases, 5
 
+set :conditionally_migrate, true
+
 set :rvm_custom_path, "/usr/share/rvm" # Needed for DO one-click Rails install setup
 
 # upload master.key and database.yml
diff --git a/lib/capistrano/tasks/deploy_restart.rake b/lib/capistrano/tasks/deploy_restart.rake
new file mode 100644
index 0000000..3fe1f43
--- /dev/null
+++ b/lib/capistrano/tasks/deploy_restart.rake
@@ -0,0 +1,9 @@
+namespace :deploy do
+  desc "Restart Rails Service"
+  task :restart do
+    on roles(:app) do
+      execute "sudo /bin/systemctl restart rails.service"
+    end
+  end
+end
+after "deploy:finishing", "deploy:restart"