Skip to content

Commit

Permalink
Change default Solr port from 8080 to 8983 (vufind-org#1632)
Browse files Browse the repository at this point in the history
- Resolves VUFIND-1340
  • Loading branch information
demiankatz authored Jun 4, 2020
1 parent 404f8e2 commit 6f9068f
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions config/vufind/Search2.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/vufind/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/vufind/searches.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/vufind/website.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion import/import.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Solr settings
solr.core.name = biblio
solr.indexer.properties = marc.properties, marc_local.properties
solr.hosturl = http://localhost:8080/solr/biblio/update
solr.hosturl = http://localhost:8983/solr/biblio/update

# where to look for properties files, translation maps, and custom scripts
# note that . refers to the directory where the jarfile for SolrMarc is located.
Expand Down
2 changes: 1 addition & 1 deletion import/import_auth.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Solr settings
solr.core.name = authority
solr.indexer.properties = marc_auth.properties
solr.hosturl = http://localhost:8080/solr/authority/update
solr.hosturl = http://localhost:8983/solr/authority/update

# where to look for properties files, translation maps, and custom scripts
# note that . refers to the directory where the jarfile for SolrMarc is located.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ protected function getBackendManagerWithMockSolr()
->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;
}
Expand Down
4 changes: 2 additions & 2 deletions solr.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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%"
Expand Down
4 changes: 2 additions & 2 deletions solr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -74,7 +74,7 @@ fi

if [ -z "$SOLR_PORT" ]
then
SOLR_PORT="8080"
SOLR_PORT="8983"
fi

if [ -z "$SOLR_ADDITIONAL_START_OPTIONS" ]
Expand Down

0 comments on commit 6f9068f

Please sign in to comment.