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

Merge 9389 from 1.4 maint branch

Browse source
This commit is contained in:
j2blake 2011-12-13 20:24:33 +00:00
parent 02304f6bb8
commit b726e1efe3
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/install.html
View file

@ -369,9 +369,9 @@
<tr> <tr>
<td colspan="2"> <td colspan="2">
Restricts access to the Solr search platform. Restricts access to the Solr search platform.
One or more regular expressions, separated by commas. When a request is The value is a regular expression. When a request is
made to Solr, the IP address of the requestor must match one of the made to Solr, the IP address of the requestor must the expression,
patterns, or the request will be rejected. or the request will be rejected.
<br> <br>
Examples:<code> Examples:<code>
<ul> <ul>
@ -380,7 +380,7 @@
</li> </li>
<li> <li>
vitro.local.solr.ipaddress.mask = vitro.local.solr.ipaddress.mask =
127\.0\.0\.1,0:0:0:0:0:0:0:1 127\.0\.0\.1|0:0:0:0:0:0:0:1
</li> </li>
<li> <li>
vitro.local.solr.ipaddress.mask = 169.254.* vitro.local.solr.ipaddress.mask = 169.254.*

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

@ -46,17 +46,17 @@ webapp.name = vitro
vitro.local.solr.url = http://localhost:8080/vitrosolr vitro.local.solr.url = http://localhost:8080/vitrosolr
# #
# Restricts access to the Solr search platform. One or more regular expressions, # Restricts access to the Solr search platform. The value is a regular expression.
# separated by commas. When a request is made to Solr, the IP address of the # When a request is made to Solr, the IP address of the requestor must match the
# requestor must match one of the patterns, or the request will be rejected. # regular expression, or the request will be rejected.
#
# NOTE: don't leave a space on the end of the line, unless you want it to be
# part of the expression.
# Examples: # Examples:
# vitro.local.solr.ipaddress.mask = 127\.0\.0\.1 # 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 = 127\.0\.0\.1|0:0:0:0:0:0:0:1
# vitro.local.solr.ipaddress.mask = 169.254.* # vitro.local.solr.ipaddress.mask = 169.254.*
# If this expression doesn't match the IP address, you will see SolrExceptions vitro.local.solr.ipaddress.mask = 127\.0\.0\.1|[0:]+:1
# in the log.
vitro.local.solr.ipaddress.mask = 127\.0\.0\.1,[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.