Merge commit '0d0dc9de679d36b2fe78306e3e8f223d8baf5b62' into ha

[lui-solr.git] / doc / upgrade.md

diff --git a/doc/upgrade.md b/doc/upgrade.md
index 0a9d0f8..86791e1 100644 (file)
--- a/doc/upgrade.md
+++ b/doc/upgrade.md
@@ -32,7 +32,7 @@ Major Changes
   may require changes to Harvester datasource settings and/or search
   target settings for existing installations. The Solr port can be set
   by the user in the configuration file
-  /etc/masterkey/lui/lui-solr.in.sh (look for the SOLR_PORT variable).
+  /etc/masterkey/lui/solr/lui-solr.in.sh (look for the SOLR_PORT variable).
 
 * Solr 5 no longer has the feature of serving up a default core
   ("collection1") on the root of the web
@@ -40,14 +40,14 @@ Major Changes
   "lui", addressable at http://localhost:8983/solr/lui. This may also
   require changes to Harvester and search target settings.
 
-  * Cores are defined in the /etc/masterkey/lui/solr-home
+  * Cores are defined in the /etc/masterkey/lui/solr/solr-home
     directory. Indexes are stored by default in
-    /var/lib/masterkey/lui/data/<core-name>.
+    /var/lib/masterkey/lui/solr/<core-name>.
 
 * There are no longer separate packages for master and slave
   configurations. To configure a lui-solr core as a slave, edit the
   configuration file
-  /etc/masterkey/lui/solr-home/<core-name>/conf/solrconfig.xml. Look
+  /etc/masterkey/lui/solr/solr-home/<core-name>/conf/solrconfig.xml. Look
   for the "/replication" requestHandler.
 
 * SolrCloud support (which was mostly aspirational, to be honest) is
@@ -56,15 +56,15 @@ Major Changes
 * Package layout has changed somewhat, to better conform with the
   Linux FSH and with other applications in the MasterKey Platform:
 
-  * All configuration files are now found in /etc/masterkey/lui. Core
+  * All configuration files are now found in /etc/masterkey/lui/solr. Core
     configuration (schema and solrconfig) are in
-    /etc/masterkey/lui/solr-home. Solr environment and logging are
-    controlled by /etc/masterkey/lui/lui-solr.in.sh and
-    /etc/masterkey/lui/log4j.properties, respectively.
+    /etc/masterkey/lui/solr/solr-home. Solr environment and logging are
+    controlled by /etc/masterkey/lui/solr/lui-solr.in.sh and
+    /etc/masterkey/lui/solr/log4j.properties, respectively.
 
   * /usr/share/masterkey/lui contains only the runtime files for Solr.
 
-  * Data files for Solr cores are in /var/lib/masterkey/lui/data.
+  * Data files for Solr cores are in /var/lib/masterkey/lui/solr.
 
   * Logs for lui-solr are in /var/log/masterkey/lui.
 
@@ -83,7 +83,7 @@ Upgrading an existing lui-solr installation
    /usr/share/masterkey/lui/solr4/<master|slave>/conf/
    directory. These will need to be backported into the configuration
    for the Solr 5 core (installed in
-   /etc/masterkey/lui/solr-home/lui/conf/ by the masterkey-lui-solr5
+   /etc/masterkey/lui/solr/solr-home/lui/conf/ by the masterkey-lui-solr5
    package).
 
 4. Remove any masterkey-lui-solr4* packages installed on the
@@ -100,7 +100,7 @@ Upgrading an existing lui-solr installation
    debian-install.md.
 
 6. Make any updates necessary to the configuration files in
-   /etc/masterkey/lui and restart the lui-solr service. You should be
+   /etc/masterkey/lui/solr and restart the lui-solr service. You should be
    able to point to your existing index by editing
-   /etc/masterkey/lui/solr-home/lui/solrconfig.xml and altering the
+   /etc/masterkey/lui/solr/solr-home/lui/solrconfig.xml and altering the
    entry for `<dataDir>`.