From 50dd167b3bda1de41029fbd0da89482bd8e13e28 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 13 Jul 2011 21:32:50 +0000
Subject: [PATCH] NIHVIVO-2437 Make the Solr security mask a configurable
 property.

---
 webapp/build.xml                        |  3 +++
 webapp/config/example.deploy.properties | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/webapp/build.xml b/webapp/build.xml
index d670a0670..50f68dbab 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -326,6 +326,9 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 			<classes dir="${webapp.dir}/config/solr/" />
 		</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. -->
 		<copy tofile="${solr.context.config}" filtering="true">
 			<fileset file="${solr.context.config.example}" />
diff --git a/webapp/config/example.deploy.properties b/webapp/config/example.deploy.properties
index abb6f1ad2..10e048aed 100644
--- a/webapp/config/example.deploy.properties
+++ b/webapp/config/example.deploy.properties
@@ -31,6 +31,26 @@ tomcat.home = /usr/local/tomcat
 #
 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.
 # This includes uploaded files (usually images) and the search index.