NIHVIVO-2450 combine upload.directory and LuceneSetup.indexDir under vitro.home.directory

This commit is contained in:
j2blake 2011-04-04 16:35:13 +00:00
parent 64a69b9e1e
commit 92d47eabf7
3 changed files with 19 additions and 30 deletions

View file

@ -339,32 +339,18 @@
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
Directory where uploaded files will be stored. Directory where the VIVO application will store the data that it creates.
This includes uploaded files (usually imageS) and the Lucene search index.
Be sure this directory exists and is writable by the user who Be sure this directory exists and is writable by the user who
the Tomcat service is running as. the Tomcat service is running as.
</td> </td>
</tr> </tr>
<tr class="odd_row"> <tr class="odd_row">
<td> <td>
upload.directory vitro.home.directory
</td> </td>
<td> <td>
/usr/local/vivo/data/uploads /usr/local/vivo/data
</td>
</tr>
<tr>
<td colspan="2">
Directory where the Lucene search index will be
built. Be sure this directory exists and is writable by the user who
the Tomcat service is running as.
</td>
</tr>
<tr class="odd_row">
<td>
LuceneSetup.indexDir
</td>
<td>
/usr/local/vivo/data/luceneIndex
</td> </td>
</tr> </tr>
<tr> <tr>

12
doc/upgrade-1.3.html Normal file
View file

@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>VIVO Release 1 V1.2 Upgrade Guide</title>
<link rel="stylesheet" href="./css/doc.css" media="screen" />
</head>
<body>
<h3>upload.directory and LuceneSetup.indexDir are merged into vitro.home.directory.</h3>
</body>
</html>

View file

@ -42,19 +42,10 @@ tomcat.home = /usr/local/tomcat
webapp.name = vivo webapp.name = vivo
# #
# The location where the VIVO application will store uploaded files # The location where the VIVO application will store the data that it creates.
# (usually images). Be sure this directory exists and is writable by the # This includes uploaded files (usually images) and the Lucene search index.
# user that the Tomcat service is running as. You should arrange for these
# files to be backed up in some way.
# #
upload.directory = /usr/local/vivo/data/uploads vitro.home.directory = /usr/local/vivo/data
#
# The location where the VIVO application will create its Lucene search
# index. Be sure this directory exists and is writable by the
# user that the Tomcat service is running as.
#
LuceneSetup.indexDir = /usr/local/vivo/data/luceneIndex
# #
# SMTP host which the "Contact Us" form can use to send mail. If this is left # SMTP host which the "Contact Us" form can use to send mail. If this is left