From b64af189f649b0cbf60f708366c604cfccdda289 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Thu, 4 Jun 2020 13:42:20 -0400
Subject: [PATCH] Change default Solr port from 8080 to 8983 (#1632)
- Resolves VUFIND-1340
---
Vagrantfile | 2 +-
config/vufind/Search2.ini | 6 +++---
config/vufind/config.ini | 2 +-
config/vufind/searches.ini | 4 ++--
config/vufind/website.ini | 2 +-
.../tests/unit-tests/src/VuFindTest/Solr/WriterTest.php | 2 +-
solr.bat | 4 ++--
solr.sh | 4 ++--
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Vagrantfile b/Vagrantfile
index 426e9a9ba7c..1c62c7aff87 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -26,7 +26,7 @@ Vagrant.configure("2") do |config|
# Network configuration to forward ports.
config.vm.network :forwarded_port, guest: 80, host: 4567
- config.vm.network :forwarded_port, guest: 8080, host: 4568
+ config.vm.network :forwarded_port, guest: 8983, host: 4568
config.vm.synced_folder ".", "/vagrant", :owner => 'ubuntu'
# Enable provisioning with a shell script. Additional provisioners such as
diff --git a/config/vufind/Search2.ini b/config/vufind/Search2.ini
index 62a0493c6cd..44879ebded9 100644
--- a/config/vufind/Search2.ini
+++ b/config/vufind/Search2.ini
@@ -16,7 +16,7 @@
; ---------- config.ini settings ----------
[Index]
-url = http://localhost:8080/solr
+url = http://localhost:8983/solr
default_core = biblio
maxBooleanClauses = 1024
timeout = 30
@@ -143,8 +143,8 @@ topic = "Subjects"
container_title = "Journal Title"
;[IndexShards]
-;Library Catalog = localhost:8080/solr/biblio
-;Website = localhost:8080/solr/website
+;Library Catalog = localhost:8983/solr/biblio
+;Website = localhost:8983/solr/website
;[ShardPreferences]
;showCheckboxes = true
diff --git a/config/vufind/config.ini b/config/vufind/config.ini
index dc4d52b23c3..efaec85e904 100644
--- a/config/vufind/config.ini
+++ b/config/vufind/config.ini
@@ -519,7 +519,7 @@ ils_encryption_key = false
; url can also be an array of servers. If so, VuFind will try the servers one by one
; until one can be reached. This is only useful for advanced fault-tolerant Solr
; installations.
-url = http://localhost:8080/solr
+url = http://localhost:8983/solr
; Default bibliographic record core
default_core = biblio
; Default authority record core
diff --git a/config/vufind/searches.ini b/config/vufind/searches.ini
index b8839083a4d..eb2f672a90d 100644
--- a/config/vufind/searches.ini
+++ b/config/vufind/searches.ini
@@ -578,8 +578,8 @@ container_title = "Journal Title"
; To use sharding, simply fill in lines using the format:
; [display name of shard] = [URL of shard (without http://)]
;[IndexShards]
-;Library Catalog = localhost:8080/solr/biblio
-;Website = localhost:8080/solr/website
+;Library Catalog = localhost:8983/solr/biblio
+;Website = localhost:8983/solr/website
; This section allows you to set preferences for shards display. You only need to
; set these if you want to use shards. See also the [StripFields] section below
diff --git a/config/vufind/website.ini b/config/vufind/website.ini
index 4c41c1959eb..292764405e6 100644
--- a/config/vufind/website.ini
+++ b/config/vufind/website.ini
@@ -44,5 +44,5 @@ facet_limit = 30
; a default_core of "website" will be used, and the url will be inherited from
; the [Index] section of config.ini.
;[Index]
-;url = http://localhost:8080/solr
+;url = http://localhost:8983/solr
;default_core = website
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Solr/WriterTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Solr/WriterTest.php
index 40341026205..745a0446d6b 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Solr/WriterTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Solr/WriterTest.php
@@ -144,7 +144,7 @@ class WriterTest extends \VuFindTest\Unit\TestCase
->getMock();
$mockBackend->expects($this->any())->method('getConnector')->will($this->returnValue($mockConnector));
$mockConnector->expects($this->any())->method('getTimeout')->will($this->returnValue(30));
- $mockConnector->expects($this->any())->method('getUrl')->will($this->returnValue('http://localhost:8080/solr/biblio'));
+ $mockConnector->expects($this->any())->method('getUrl')->will($this->returnValue('http://localhost:8983/solr/biblio'));
$sm->setService('Solr', $mockBackend);
return $pm;
}
diff --git a/solr.bat b/solr.bat
index cff8418c125..accdc491581 100644
--- a/solr.bat
+++ b/solr.bat
@@ -16,7 +16,7 @@ rem SOLR_HOME
rem Home of the Solr indexes and configurations.
rem
rem SOLR_PORT
-rem Network port for Solr. Defaults to 8080.
+rem Network port for Solr. Defaults to 8983.
rem
rem JAVA_HOME
rem Home of Java installation (not directly used by this script, but passed along to
@@ -80,7 +80,7 @@ set SOLR_HEAP=1G
rem Set SOLR_PORT
if not "!%SOLR_PORT%!"=="!!" goto solrportset
-set SOLR_PORT=8080
+set SOLR_PORT=8983
:solrportset
call %SOLR_BIN%\solr.cmd %1 %SOLR_ADDITIONAL_START_OPTIONS% -p %SOLR_PORT% -s %SOLR_HOME% -m %SOLR_HEAP% -a "-Ddisable.configEdit=true -Dsolr.log=%SOLR_LOGS_DIR% %SOLR_ADDITIONAL_JVM_OPTIONS%"
diff --git a/solr.sh b/solr.sh
index c9d352a1985..046ce7fa98f 100755
--- a/solr.sh
+++ b/solr.sh
@@ -17,7 +17,7 @@
# Home of the Solr indexes and configurations.
#
# SOLR_PORT
-# Network port for Solr. Defaults to 8080.
+# Network port for Solr. Defaults to 8983.
#
# JAVA_HOME
# Home of Java installation (not directly used by this script, but passed along to
@@ -74,7 +74,7 @@ fi
if [ -z "$SOLR_PORT" ]
then
- SOLR_PORT="8080"
+ SOLR_PORT="8983"
fi
if [ -z "$SOLR_ADDITIONAL_START_OPTIONS" ]
--
GitLab