diff --git a/doc/install.html b/doc/install.html index e647d01e..bc284832 100644 --- a/doc/install.html +++ b/doc/install.html @@ -307,10 +307,10 @@
@@ -319,7 +319,7 @@
-
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
-
vitro.local.solr.ipaddress.mask = 169.254.*
diff --git a/example.deploy.properties b/example.deploy.properties
index fe4d7d01..4d8c067c 100644
--- a/example.deploy.properties
+++ b/example.deploy.properties
@@ -56,16 +56,17 @@ webapp.name = vivo
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.
+# Restricts access to the Solr search platform. The value is a regular expression.
+# When a request is made to Solr, the IP address of the requestor must match the
+# 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:
# 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.*
-# If this expression doesn't match the IP address, you will see SolrExceptions
-# in the log.
-vitro.local.solr.ipaddress.mask = 127\.0\.0\.1,[0:]+:1[^:]*,
+vitro.local.solr.ipaddress.mask = 127\.0\.0\.1|[0:]+:1
#
# The location where the VIVO application will store the data that it creates.