Upgrade to Capistrano 3.3.4 and use capistrano-passenger gem.

This also moves us back to stable capistrano deploys.

3 files changed, 13 insertions, 36 deletions

diff --git a/Gemfile b/Gemfile
index a2d611b..8fa8184 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,11 +19,12 @@ end
 
 group :deployment do
     # Deploy with Capistrano
-    gem 'capistrano', :git => 'git@github.com:capistrano/capistrano.git' #'~> 3.2.1'
+    gem 'capistrano', '~> 3.3.4'
     gem 'capistrano-bundler'
     gem 'capistrano-rails'
     gem 'capistrano-rvm'
     gem 'capistrano-postgresql', '~>3.0'
+    gem 'capistrano-passenger'
 end
 
 # Gems used only for assets and not required
diff --git a/Gemfile.lock b/Gemfile.lock
index 7269d45..1683de3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,3 @@
-GIT
-  remote: git@github.com:capistrano/capistrano.git
-  revision: d3023202d5139a88fe71c0a6bc3b0aee7c8b6180
-  specs:
-    capistrano (3.2.1)
-      i18n
-      rake (>= 10.0.0)
-      sshkit (~> 1.3)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -48,9 +39,16 @@ GEM
     babosa (0.3.10)
     bcrypt-ruby (3.0.1)
     builder (3.0.4)
+    capistrano (3.3.4)
+      capistrano-stats (~> 1.1.0)
+      i18n
+      rake (>= 10.0.0)
+      sshkit (~> 1.3)
     capistrano-bundler (1.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
+    capistrano-passenger (0.0.1)
+      capistrano (~> 3.0)
     capistrano-postgresql (3.0.1)
       capistrano (>= 3.0)
     capistrano-rails (1.1.1)
@@ -59,6 +57,7 @@ GEM
     capistrano-rvm (0.1.1)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
+    capistrano-stats (1.1.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -364,8 +363,9 @@ PLATFORMS
 DEPENDENCIES
   activerecord-postgresql-adapter
   bcrypt-ruby (~> 3.0.0)
-  capistrano!
+  capistrano (~> 3.3.4)
   capistrano-bundler
+  capistrano-passenger
   capistrano-postgresql (~> 3.0)
   capistrano-rails
   capistrano-rvm
diff --git a/config/deploy.rb.example b/config/deploy.rb.example
index 51362d5..4f04d26 100644
--- a/config/deploy.rb.example
+++ b/config/deploy.rb.example
@@ -1,4 +1,4 @@
-lock '3.2.1'
+lock '3.3.4'
 
 # change this to your application name
 set :application, 'hmno'
@@ -8,27 +8,3 @@ set :repo_url, 'git@github.com:snake66/project-limestone.git'
 
 set :linked_files, %w{config/initializers/refinery/core.rb config/initializers/secret_token.rb config/piwik.yml}
 set :linked_dirs, %w{log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system}
-
-namespace :deploy do
-
-  desc 'Restart application'
-  task :restart do
-    on roles(:app), in: :sequence, wait: 5 do
-      # Touching this file forces the server to reload
-      # the application
-      execute :touch, release_path.join('tmp/restart.txt')
-    end
-  end
-
-  after :publishing, :restart
-
-  after :restart, :clear_cache do
-    on roles(:web), in: :groups, limit: 3, wait: 10 do
-      # Here we can do anything such as:
-      # within release_path do
-      #   execute :rake, 'cache:clear'
-      # end
-    end
-  end
-
-end