Skip to content

Commit

Permalink
Merge pull request #4311 from sul-dlss/corylown-patch-2
Browse files Browse the repository at this point in the history
Remove courses role; use db role for updating course data and pruning guest user data
  • Loading branch information
jcoyne authored Jul 10, 2024
2 parents d775880 + 58f3736 commit 14ed578
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 11 deletions.
2 changes: 2 additions & 0 deletions config/deploy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
# We want Honeybadger to report deployments to our Capistrano stage names (e.g., dev, stage, prod)
set :honeybadger_env, fetch(:stage)

set :whenever_roles, %i[app db]

desc 'Clear EDS cache on all web hosts'
task :clear_eds_cache do
on roles(:web) do
Expand Down
2 changes: 1 addition & 1 deletion config/deploy/preview_folio.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set :bundle_without, %w[sqlite development test].join(' ')

server 'sw-webapp-sandbox-f.stanford.edu', user: 'blacklight', roles: %w[web db app courses]
server 'sw-webapp-sandbox-f.stanford.edu', user: 'blacklight', roles: %w[web db app]

Capistrano::OneTimeKey.generate_one_time_key!
set :rails_env, 'production'
2 changes: 1 addition & 1 deletion config/deploy/preview_gryphon.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set :bundle_without, %w[sqlite development test].join(' ')

# Other aliases are sw-gryphon-search, gryphon-search, and searchworks-gryphon-search
server 'sw-webapp-sandbox-c.stanford.edu', user: 'blacklight', roles: %w[web db app courses]
server 'sw-webapp-sandbox-c.stanford.edu', user: 'blacklight', roles: %w[web db app]

Capistrano::OneTimeKey.generate_one_time_key!
set :rails_env, 'production'
6 changes: 3 additions & 3 deletions config/deploy/prod.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

set :bundle_without, %w[sqlite development test].join(' ')

server 'sw-webapp-a.stanford.edu', user: 'blacklight', roles: %w[web db app courses]
server 'sw-webapp-a.stanford.edu', user: 'blacklight', roles: %w[web db app]
server 'sw-webapp-b.stanford.edu', user: 'blacklight', roles: %w[web app]
server 'sw-webapp-c.stanford.edu', user: 'blacklight', roles: %w[web app]
server 'sw-webapp-d.stanford.edu', user: 'blacklight', roles: %w[web app]
server 'sw-webapp-e.stanford.edu', user: 'blacklight', roles: %w[web app]

server 'sw-webapp-bot-a.stanford.edu', user: 'blacklight', roles: %w[web db app courses]
server 'sw-webapp-bot-b.stanford.edu', user: 'blacklight', roles: %w[web db app courses]
server 'sw-webapp-bot-a.stanford.edu', user: 'blacklight', roles: %w[web db app]
server 'sw-webapp-bot-b.stanford.edu', user: 'blacklight', roles: %w[web db app]

Capistrano::OneTimeKey.generate_one_time_key!
set :rails_env, 'production'
Expand Down
6 changes: 3 additions & 3 deletions config/deploy/stage.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

set :bundle_without, %w[sqlite development test].join(' ')

server 'sw-webapp-stage-a.stanford.edu', user: 'blacklight', roles: %w[web db app courses]
server 'sw-webapp-stage-b.stanford.edu', user: 'blacklight', roles: %w[web db app]
server 'sw-webapp-stage-c.stanford.edu', user: 'blacklight', roles: %w[web db app]
server 'sw-webapp-stage-a.stanford.edu', user: 'blacklight', roles: %w[web db app]
server 'sw-webapp-stage-b.stanford.edu', user: 'blacklight', roles: %w[web app]
server 'sw-webapp-stage-c.stanford.edu', user: 'blacklight', roles: %w[web app]

Capistrano::OneTimeKey.generate_one_time_key!
set :rails_env, 'production'
2 changes: 1 addition & 1 deletion config/deploy/uat.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set :bundle_without, %w[sqlite development test].join(' ')

# Aliased to searchworks-uat
server 'sw-webapp-sandbox-g.stanford.edu', user: 'blacklight', roles: %w[web db app courses]
server 'sw-webapp-sandbox-g.stanford.edu', user: 'blacklight', roles: %w[web db app]

Capistrano::OneTimeKey.generate_one_time_key!
set :rails_env, 'production'
4 changes: 2 additions & 2 deletions config/schedule.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
rake 'searchworks:clear_rack_attack_cache'
end

every '0 4 * * *', roles: %i[app] do # daily at 4 am
every '0 4 * * *', roles: %i[db] do # daily at 4 am
rake 'searchworks:prune_old_guest_user_data[12]'
end

every 1.hours, roles: %i[courses] do
every 1.hours, roles: %i[db] do
rake 'folio:update_courses_db'
end

0 comments on commit 14ed578

Please sign in to comment.