Skip to content

Commit

Permalink
Baseline deploy.rb should suit new systems, not lyberservices
Browse files Browse the repository at this point in the history
Effectively, this treats the "old" sets as the exception rather than the
rule.  Note: deploying master to lyberservices will break things.  Use
the `v3-legacy` branch for that.

Remove ignored/redundant rvm lines (we have `.ruby-version` file).

Use ssh to access github.
  • Loading branch information
atz committed Aug 22, 2018
1 parent 843cc0b commit 1a342e9
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 13 deletions.
6 changes: 3 additions & 3 deletions config/deploy.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set :application, 'pre-assembly'
set :repo_url, 'https://github.com/sul-dlss/pre-assembly.git'
set :repo_url, 'ssh://git@github.com/sul-dlss/pre-assembly'

set :ssh_options, {
keys: [Capistrano::OneTimeKey.temporary_ssh_private_key_path],
Expand All @@ -11,7 +11,7 @@
ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call

# Default deploy_to directory is /var/www/my_app
set :deploy_to, '/home/lyberadmin/pre-assembly'
set :deploy_to, '/opt/app/preassembly/pre-assembly'

# Default value for :scm is :git
# set :scm, :git
Expand All @@ -25,7 +25,7 @@
# Default value for :pty is false
# set :pty, true

# update shared_configs before restarting app
# update shared_configs before restarting app
before 'deploy:restart', 'shared_configs:update'

# Default value for :linked_files is []
Expand Down
1 change: 1 addition & 0 deletions config/deploy/old_prod.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

Capistrano::OneTimeKey.generate_one_time_key!
set :rails_env, "production"
set :deploy_to, '/home/lyberadmin/pre-assembly'
1 change: 1 addition & 0 deletions config/deploy/old_stage.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

Capistrano::OneTimeKey.generate_one_time_key!
set :rails_env, "test"
set :deploy_to, '/home/lyberadmin/pre-assembly'
6 changes: 1 addition & 5 deletions config/deploy/prod.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
server 'sul-preassembly-prod.stanford.edu', user: 'preassembly', roles: %w{web app db}

Capistrano::OneTimeKey.generate_one_time_key!
set :rails_env, "production"

set :rvm_ruby_version, '2.4.4'
set :deploy_to, '/opt/app/preassembly/pre-assembly'
set :rails_env, 'production'
set :linked_files, []
set :repo_url, 'ssh://git@github.com/sul-dlss/pre-assembly'
6 changes: 1 addition & 5 deletions config/deploy/stage.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
server 'sul-preassembly-stage.stanford.edu', user: 'preassembly', roles: %w{web app db}

Capistrano::OneTimeKey.generate_one_time_key!
set :rails_env, "production"

set :rvm_ruby_version, '2.4.4'
set :deploy_to, '/opt/app/preassembly/pre-assembly'
set :rails_env, 'production'
set :linked_files, []
set :repo_url, 'ssh://git@github.com/sul-dlss/pre-assembly'

0 comments on commit 1a342e9

Please sign in to comment.