diff --git a/config/deploy.rb b/config/deploy.rb index 491acd4..38d4407 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,11 +1,11 @@ set :application, 'dmptool' -set :repo_url, 'https://github.com/DMPRoadmap/roadmap.git' +set :repo_url, 'https://github.com/CDLUC3/roadmap.git' #set :user, 'dmp' # Default branch is :master -# ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp -set :branch, 'development' +ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp unless ENV['BRANCH'] +set :branch, ENV['BRANCH'] if ENV['BRANCH'] # Default deploy_to directory is /var/www/my_app_name set :deploy_to, '/dmp/apps/roadmap' diff --git a/config/deploy/development.rb b/config/deploy/development.rb index e4b7573..d5bc4e5 100644 --- a/config/deploy/development.rb +++ b/config/deploy/development.rb @@ -6,8 +6,6 @@ set :server_host, ENV["SERVER_HOST"] || 'uc3-roadmap-dev.cdlib.org' server fetch(:server_host), user: 'dmp', roles: %w{web app db} -set :branch, 'development' - # role-based syntax # ==================