litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2437 Make the Solr security mask a configurable property.

Browse source
This commit is contained in:
j2blake 2011-07-13 21:32:50 +00:00
parent f8bb741f15
commit 50dd167b3b
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
webapp/build.xml
View file

@ -326,6 +326,9 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
<classes dir="${webapp.dir}/config/solr/" /> <classes dir="${webapp.dir}/config/solr/" />
</war> </war>
<!-- if no mask is define, go with an unsecured installation. -->
<property name="vitro.local.solr.ipaddress.mask" value=".*" />
<!-- Create the context configuration XML with expanded properties. --> <!-- Create the context configuration XML with expanded properties. -->
<copy tofile="${solr.context.config}" filtering="true"> <copy tofile="${solr.context.config}" filtering="true">
<fileset file="${solr.context.config.example}" /> <fileset file="${solr.context.config.example}" />

20
webapp/config/example.deploy.properties
View file

@ -31,6 +31,26 @@ tomcat.home = /usr/local/tomcat
# #
webapp.name = vitro webapp.name = vitro
#
# URL of Solr context used in local VIVO search. Should consist of:
# scheme + servername + port + vivocontextpath + "solr"
# In the standard installation, the Solr context will be on the same server as VIVO,
# and in the same Tomcat instance. The path will be the VIVO webapp.name (specified
# above) + "solr"
# Example:
# vitro.local.solr.url = http://localhost:8080/vivosolr
vitro.local.solr.url = http://localhost:8080/vivosolr
#
# Restricts access to the Solr search platform. One or more regular expressions,
# separated by commas. When a request is made to Solr, the IP address of the
# requestor must match one of the patterns, or the request will be rejected.
# Examples:
# vitro.local.solr.ipaddress.mask = 127\.0\.0\.1
# vitro.local.solr.ipaddress.mask = 127\.0\.0\.1,0:0:0:0:0:0:0:1
# vitro.local.solr.ipaddress.mask = 169.254.*
vitro.local.solr.ipaddress.mask = 127\.0\.0\.1,0:0:0:0:0:0:0:1
# #
# The location where the Vitro application will store the data that it creates. # The location where the Vitro application will store the data that it creates.
# This includes uploaded files (usually images) and the search index. # This includes uploaded files (usually images) and the search index.