From a8987c1691ba27195ee87963241d298563ba8d95 Mon Sep 17 00:00:00 2001 From: Jessie Keck <jessie.keck@gmail.com> Date: Thu, 11 Sep 2014 11:37:16 -0700 Subject: [PATCH] Support sub-directory deploys in -test. --- Capfile | 1 - config/deploy/testing.rb | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Capfile b/Capfile index 203938fbc..aff53fb5b 100644 --- a/Capfile +++ b/Capfile @@ -20,7 +20,6 @@ require 'capistrano/deploy' # require 'capistrano/rails/assets' # require 'capistrano/rails/migrations' require 'capistrano/bundler' -require 'capistrano/rvm' require 'capistrano/rails' require 'dlss/capistrano' require 'squash/rails/capistrano3' diff --git a/config/deploy/testing.rb b/config/deploy/testing.rb index 9a4eaa5a7..2a085c0b9 100644 --- a/config/deploy/testing.rb +++ b/config/deploy/testing.rb @@ -1,14 +1,11 @@ -set :keep_releases, 50 +set :keep_releases, 70 set :deploy_host, ask("Server", 'e.g. server.stanford.edu') - -set :sub_dir, "redesign" +set :sub_dir, ask('Deploy directory', 'e.g. gdor') set :symlinks_directory, "#{fetch(:home_directory)}/SearchWorksSubURIs" set :symlink_deploy_path, "#{fetch(:symlinks_directory)}/#{fetch(:sub_dir)}" set :bundle_without, %w{production test}.join(' ') -set :rvm_ruby_version, '2.1.0' - task :symlink_sub_directory_deploy do on roles(:app), wait: 1 do set :last_release, capture("ls #{releases_path}").split("\n").last @@ -16,7 +13,6 @@ set :public_release_path, "#{fetch(:last_release_path)}/public" # Write .htaccess file with RailsBaseURI directive execute("echo 'RailsBaseURI /#{fetch(:sub_dir)}' > #{fetch(:public_release_path)}/.htaccess") - execute("echo 'PassengerRuby /usr/local/rvm/wrappers/ruby-2.1.0-preview2/ruby' >> #{fetch(:public_release_path)}/.htaccess") # Remove symlink if it already exists execute("rm #{fetch(:symlink_deploy_path)}") if sub_uri_exists? fetch(:symlink_deploy_path) # Symlink release's public directory