Update deploy qa file to read rails_env:qa (#3692)

pulibrary · Aug 21, 2023 · 2c7cf11 · 2c7cf11
1 parent 8075136
commit 2c7cf11
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 22 deletions.
diff --git a/config/alma.yml b/config/alma.yml
@@ -8,7 +8,7 @@ test:
   <<: *default
   read_write_apikey: 'TESTME'
 
-alma_qa:
+qa:
   <<: *default
 
 staging:

diff --git a/config/blacklight.yml b/config/blacklight.yml
@@ -19,9 +19,6 @@ test: &test
 staging:
   adapter: solr
   url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %>
-alma_qa:
-  adapter: solr
-  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %>
 qa:
   adapter: solr
   url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %>

diff --git a/config/database.yml b/config/database.yml
@@ -64,7 +64,5 @@ production:
 
 staging:
   <<: *default
-alma_qa:
-  <<: *default
 qa:
   <<: *default
diff --git a/config/deploy/qa.rb b/config/deploy/qa.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 set :rvm_ruby_string, :local # use the same ruby as used locally for deployment
-set :rails_env, 'alma_qa'
+set :rails_env, 'qa'
 set :branch, ENV['BRANCH'] || 'main'
 
 server 'catalog-qa1.princeton.edu', user: 'deploy', roles: %i[web app db worker mailcatcher cron_db]

diff --git a/config/orangelight.yml b/config/orangelight.yml
@@ -71,15 +71,6 @@ staging:
     exchange: 'orangelight_events'
   firestone_locator_base_url: https://locator-staging.princeton.edu
 
-alma_qa:
-  <<: *defaults
-  redis:
-    host: <%= ENV['OL_REDIS_HOST'] %>
-    port: <%= ENV['OL_REDIS_PORT'] || '6379' %>
-    db: 'orangelight_qa'
-  events:
-    server: <%= ENV['OL_RABBIT_SERVER'] || 'amqp://localhost:5672' %>
-    exchange: 'orangelight_events'
 qa:
   <<: *defaults
   redis:

diff --git a/config/redis.yml b/config/redis.yml
@@ -18,10 +18,6 @@ staging:
   <<: *defaults
   host: <%= ENV['OL_REDIS_HOST'] %>
   port: <%= ENV['OL_REDIS_PORT'] || '6379' %>
-alma_qa:
-  <<: *defaults
-  host: <%= ENV['OL_REDIS_HOST'] %>
-  port: <%= ENV['OL_REDIS_PORT'] || '6379' %>
 qa:
   <<: *defaults
   host: <%= ENV['OL_REDIS_HOST'] %>

diff --git a/config/secrets.yml b/config/secrets.yml
@@ -23,7 +23,5 @@ production:
 
 staging:
   secret_key_base: <%= ENV['OL_SECRET_KEY_BASE'] %>
-alma_qa:
-  secret_key_base: <%= ENV['OL_SECRET_KEY_BASE'] %>
 qa:
   secret_key_base: <%= ENV['OL_SECRET_KEY_BASE'] %>