Use recommended revision-based deploy provider.

ajgon · Oct 7, 2020 · d41f60e · d41f60e
1 parent 53e30e2
commit d41f60e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/recipes/deploy.rb b/recipes/deploy.rb
@@ -21,7 +21,7 @@
 
   fire_hook(:before_deploy, items: databases + [source, framework, appserver, worker, webserver])
 
-  deploy application['shortname'] do
+  deploy_revision application['shortname'] do
     deploy_to deploy_dir(application)
     user node['deployer']['user'] || 'root'
     group www_group

diff --git a/recipes/undeploy.rb b/recipes/undeploy.rb
@@ -16,7 +16,7 @@
 
   fire_hook(:before_undeploy, items: databases + [source, framework, appserver, worker, webserver])
 
-  deploy application['shortname'] do
+  deploy_revision application['shortname'] do
     deploy_to deploy_dir(application)
     user node['deployer']['user'] || 'root'
     group www_group

diff --git a/templates/default/appserver.service.erb b/templates/default/appserver.service.erb
@@ -34,7 +34,8 @@ def different_gemfile?
   current_gemfile = "#{ROOT_PATH}/current/Gemfile.lock"
   if File.exists?(current_gemfile)
     dir = Dir["#{ROOT_PATH}/releases/*"]
-    previous_release_path = dir.sort[dir.size-2]
+    previous_release_path = dir.sort_by { |d| ::File.ctime(d) }[-2]
+
     if !previous_release_path.nil? && File.exists?("#{previous_release_path}/Gemfile.lock")
       return Digest::MD5.hexdigest(File.read(current_gemfile)) != Digest::MD5.hexdigest(File.read("#{previous_release_path}/Gemfile.lock"))
     end