Add support for Solr 6.1.0. Update dev deployment, documentation.

[lui-solr.git] / doc / debian-install.md

diff --git a/doc/debian-install.md b/doc/debian-install.md
index 4848314..a437bb7 100644 (file)
--- a/doc/debian-install.md
+++ b/doc/debian-install.md
@@ -4,9 +4,15 @@ Unified Index (lui-solr) on Debian Linux
 Prerequisites
 =============
 
-* lui-solr is based on Solr 5.x, which requires Java 7. The package
+* masterkey-lui-solr5 is based on Solr 5.x, which requires Java 7. The package
 depends on openjdk-7-jdk.
 
+* masterkey-lui-solr6 is based on Solr 6.x, which requires Java 8. The package
+depends on openjdk-8-jdk, available on backports for
+jessie. openjdk-8-jdk is _not_ available for wheezy. To install
+masterkey-lui-solr6 on wheezy is possible, bu it is outside the scope
+of this document.
+
 Pre-installation
 ================
 
@@ -31,8 +37,23 @@ apt keyring.
 
 ```
 
+* For masterkey-lui-solr6 on jessie: Add the backports apt
+repository. Add the following content to /etc/apt/sources.list:
+
+```
+     deb http://ftp.debian.org/debian jessie-backports main
+
+```
+
+And update your package list:
+
+```
+     sudo apt-get update
+
+```
+
 * Masterkey LUI stores its Solr indexes by default in
-/var/lib/masterkey/lui/data.  Ensure this partition is large enough to
+/var/lib/masterkey/lui/solr.  Ensure this partition is large enough to
 accomodate your Solr indexes.
 
 Installation
@@ -40,16 +61,16 @@ Installation
 
 The lui-solr package installs a Solr binary installation in
 /usr/share/masterkey/lui, a default configuration in
-/etc/masterkey/lui, a data directory in /var/lib/masterkey/lui/data,
+/etc/masterkey/lui/solr, a data directory in /var/lib/masterkey/lui/solr,
 and logs in /var/log/masterkey/lui. It creates the "lui-solr" service
 and installs an init script for startup. The Solr server runs by
 default on port 8983, and processes and files are owned by the
 "lui-solr" user.
 
-* Install the masterkey-lui-solr5 package:
+* Install the masterkey-lui-solr5 or masterkey-lui-solr6 package:
 
 ```
-     sudo apt-get install masterkey-lui-solr5
+     sudo apt-get install <masterkey-lui-solr5|masterkey-lui-solr6>
 
 ```
 
@@ -60,7 +81,7 @@ default on port 8983, and processes and files are owned by the
 depends on several factors, including the total amount of RAM
 available on the system and the size of your indexes.  The default of
 512m, however, is likely too low for production. Edit
-/etc/masterkey/lui/lui-solr.in.sh and increase 'SOLR_HEAP'.  Example:
+/etc/masterkey/lui/solr/lui-solr.in.sh and increase 'SOLR_HEAP'.  Example:
 
 ```
      SOLR_HEAP="2048m"