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. + + + 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.