From 8cf3f366f0f53cb7b6f6f84adece2a5b6a6bdb2c Mon Sep 17 00:00:00 2001 From: val99erie Date: Thu, 12 Apr 2018 14:14:15 -0500 Subject: [PATCH] Change config to full URL so that pieces of the URL aren't hard-coded --- config/blacklight.yml | 4 ++-- config/solr.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/blacklight.yml b/config/blacklight.yml index 6859f0b..298a63a 100644 --- a/config/blacklight.yml +++ b/config/blacklight.yml @@ -12,10 +12,10 @@ development: adapter: solr - url: http://127.0.0.1:<%= ENV['SOLR_TEST_PORT'] || 8983 %>/solr/aster-development + url: <%= ENV['DEV_SOLR_URL'] || "http://127.0.0.1:8983/solr/aster-development" %> test: &test adapter: solr - url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/aster-test" %> + url: <%= ENV['TEST_SOLR_URL'] || 'http://127.0.0.1:8985/solr/aster-test' %> production: adapter: solr url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/aster" %> diff --git a/config/solr.yml b/config/solr.yml index 55a83a6..99a3789 100644 --- a/config/solr.yml +++ b/config/solr.yml @@ -1,6 +1,6 @@ development: - url: http://127.0.0.1:<%= ENV['SOLR_TEST_PORT'] || 8983 %>/solr/aster-development + url: <%= ENV['DEV_SOLR_URL'] || "http://127.0.0.1:8983/solr/aster-development" %> test: - url: http://127.0.0.1:<%= ENV['SOLR_TEST_PORT'] || 8985 %>/solr/aster-test + url: <%= ENV['TEST_SOLR_URL'] || 'http://127.0.0.1:8985/solr/aster-test' %> production: url: http://127.0.0.1:8983/solr/aster