From 020a306e83ce9ab31fb8f34eff282f03de93e3d5 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 13 Dec 2011 20:25:45 +0000
Subject: [PATCH] Merge 3871 from 1.4 maint branch

---
 doc/install.html          | 10 +++++-----
 example.deploy.properties | 15 ++++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

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 @@
                     </tr>
                     <tr>
                         <td colspan="2">
-                            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 the expression, 
+                            or the request will be rejected.
                             <br>
                             Examples:<code>
                                 <ul>
@@ -319,7 +319,7 @@
                                     </li>
                                     <li>
                                         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>
                                         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.