diff --git a/doc/install.html b/doc/install.html index 526ef29b..40e1df51 100644 --- a/doc/install.html +++ b/doc/install.html @@ -339,32 +339,18 @@ - 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 the Tomcat service is running as. - upload.directory + vitro.home.directory - /usr/local/vivo/data/uploads - - - - - 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. - - - - - LuceneSetup.indexDir - - - /usr/local/vivo/data/luceneIndex + /usr/local/vivo/data diff --git a/doc/upgrade-1.3.html b/doc/upgrade-1.3.html new file mode 100644 index 00000000..b97e2888 --- /dev/null +++ b/doc/upgrade-1.3.html @@ -0,0 +1,12 @@ + + + + + VIVO Release 1 V1.2 Upgrade Guide + + + +

upload.directory and LuceneSetup.indexDir are merged into vitro.home.directory.

+ + + \ No newline at end of file diff --git a/example.deploy.properties b/example.deploy.properties index 54e0cdd2..323dcc04 100644 --- a/example.deploy.properties +++ b/example.deploy.properties @@ -42,19 +42,10 @@ tomcat.home = /usr/local/tomcat webapp.name = vivo # -# The location where the VIVO application will store uploaded files -# (usually images). Be sure this directory exists and is writable by the -# user that the Tomcat service is running as. You should arrange for these -# files to be backed up in some way. +# The location where the VIVO application will store the data that it creates. +# This includes uploaded files (usually images) and the Lucene search index. # -upload.directory = /usr/local/vivo/data/uploads - -# -# 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 +vitro.home.directory = /usr/local/vivo/data # # SMTP host which the "Contact Us" form can use to send mail. If this is left