From 085cb292197794f02504744aacaa410f4c19c564 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Mon, 3 Dec 2018 08:43:56 -0600 Subject: [PATCH] Remove TEST_JETTY_PORT variable from blacklight.yml This is not something we use in Blacklight and can easily be set in an application that uses blacklight if needed. Also removed old comments about jetty_path, a configuration option that was removed long ago. --- .../blacklight/templates/config/blacklight.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/lib/generators/blacklight/templates/config/blacklight.yml b/lib/generators/blacklight/templates/config/blacklight.yml index 01160687d4..e90d785d54 100644 --- a/lib/generators/blacklight/templates/config/blacklight.yml +++ b/lib/generators/blacklight/templates/config/blacklight.yml @@ -1,21 +1,9 @@ -# = jetty_path key -# each environment can have a jetty_path with absolute or relative -# (to app root) path to a jetty/solr install. This is used -# by the rake tasks that start up solr automatically for testing -# and by rake solr:marc:index. -# -# jetty_path is not used by a running Blacklight application -# at all. In general you do NOT need to deploy solr in Jetty, you can deploy it -# however you want. -# jetty_path is only required for rake tasks that need to know -# how to start up solr, generally for automated testing. - development: adapter: solr url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %> test: &test adapter: solr - url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/blacklight-core" %> + url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983}/solr/blacklight-core" %> production: adapter: solr url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %>