Skip to content

Commit

Permalink
Merge 8cf3f36 into 5d07ac4
Browse files Browse the repository at this point in the history
  • Loading branch information
@val99erie
val99erie committed Apr 12, 2018
2 parents 5d07ac4 + 8cf3f36 commit 8d4cbff
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions config/blacklight.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" %>
4 changes: 2 additions & 2 deletions config/solr.yml
View file
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 8d4cbff

Please sign in to comment.