Invent 'solr.multicorePrefix' to distinguish multiple DSpace instances running against a single Solr instance. #8129

dspace/config/dspace.cfg

@@ -42,9 +42,14 @@ default.language = en_US
 
 # Solr server/webapp.
 # DSpace uses Solr for all search/browse capability (and for usage statistics).
-# Since DSpace 7, SOLR must be installed as a stand-alone service
+# Since DSpace 7, SOLR must be installed as a stand-alone service.
 solr.server = http://localhost:8983/solr
 
+# Solr core name prefix.
+# If you connect multiple instances of DSpace to a single Solr instance, you
+# can organize them with a common core name prefix.
+solr.multicorePrefix =
+
 # Solr connection pool.
 # If you change these values, the changes are not effective until DSpace is
 # restarted.
@@ -1349,11 +1354,11 @@ sherpa.romeo.apikey =
 # org.dspace.content.authority.SampleAuthority = Sample, \
 # org.dspace.content.authority.SHERPARoMEOPublisher = SRPublisher, \
 # org.dspace.content.authority.SHERPARoMEOJournalTitle = SRJournalTitle, \
-#  org.dspace.content.authority.SolrAuthority = SolrAuthorAuthority
+# org.dspace.content.authority.SolrAuthority = SolrAuthorAuthority
 
 #Uncomment to enable ORCID authority control
 #plugin.named.org.dspace.content.authority.ChoiceAuthority = \
-#    org.dspace.content.authority.SolrAuthority = SolrAuthorAuthority
+# org.dspace.content.authority.SolrAuthority = SolrAuthorAuthority
 
 # URL of ORCID API
 # Defaults to using the Public API V3 (pub.orcid.org)
@@ -1403,8 +1408,9 @@ plugin.selfnamed.org.dspace.content.authority.ChoiceAuthority = \
 ## See manual or org.dspace.content.authority.Choices source for descriptions.
 authority.minconfidence = ambiguous
 
-# Configuration settings for ORCID based authority control, uncomment the lines below to enable configuration
+# Configuration settings for ORCID based authority control.
-#solr.authority.server=${solr.server}/authority
+# Uncomment the lines below to enable configuration.
+#solr.authority.server=${solr.server}/${solr.multicorePrefix}authority
 #choices.plugin.dc.contributor.author = SolrAuthorAuthority
 #choices.presentation.dc.contributor.author = authorLookup
 #authority.controlled.dc.contributor.author = true

dspace/config/modules/discovery.cfg

@@ -5,7 +5,7 @@
 # faceted-search system.                                        #
 #---------------------------------------------------------------#
 ##### Search Indexing #####
-discovery.search.server = ${solr.server}/search
+discovery.search.server = ${solr.server}/${solr.multicorePrefix}search
 
 #Enable the url validation of the search.server setting above.
 #Defaults to true: validation is enabled

dspace/config/modules/iiif.cfg

@@ -10,7 +10,7 @@ iiif.image.server = http://localhost:8182/iiif/2/
 # Base URL of the search service used to support the (experimental) IIIF Search
 # capability. The actual path will depend on how search is being supported.
 # This example uses the solr plugin https://dbmdz.github.io/solr-ocrhighlighting/
-# iiif.search.url = ${solr.server}/word_highlighting
+# iiif.search.url = ${solr.server}/${solr.multicorePrefix}word_highlighting
 
 # The search plugin used to support (experimental) IIIF Search.
 # This is the class used with https://dbmdz.github.io/solr-ocrhighlighting/

dspace/config/modules/oai.cfg

@@ -24,7 +24,7 @@ oai.storage=solr
 oai.url = ${dspace.server.url}/${oai.path}
 
 # Base solr index
-oai.solr.url=${solr.server}/oai
+oai.solr.url=${solr.server}/${solr.multicorePrefix}oai
 
 # OAI persistent identifier prefix
 # This field is used for two purposes:

dspace/config/modules/solr-statistics.cfg

@@ -10,7 +10,7 @@
 # set this to be the port you run the dspace "solr" webapp
 # on, by default, we are assuming a test configuration with
 # tomcat still running on port 8080
-solr-statistics.server = ${solr.server}/statistics
+solr-statistics.server = ${solr.server}/${solr.multicorePrefix}statistics
 
 # A comma-separated list that contains the bundles for which the bitstreams will be displayed
 solr-statistics.query.filter.bundles=ORIGINAL