[zookeeper] 01/03: apply patch for #839184

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository zookeeper.

commit 40f728339bea68ce898c78d534bf5683cb544fb0
Author: tony mancill <tmancill at debian.org>
Date:   Sun Oct 16 20:48:00 2016 -0700

    apply patch for #839184
---
 debian/conf_example/environment  | 5 +++++
 debian/zookeeperd.zookeeper.init | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/conf_example/environment b/debian/conf_example/environment
index cbd8404..b84918c 100644
--- a/debian/conf_example/environment
+++ b/debian/conf_example/environment
@@ -1,10 +1,15 @@
 ZOOMAIN=org.apache.zookeeper.server.quorum.QuorumPeerMain
+ZOOCFGDIR=/etc/zookeeper/conf
 ZOOCFG=/etc/zookeeper/conf/zoo.cfg
 ZOO_LOG_DIR=/var/log/zookeeper
 ZOO_LOG4J_PROP=INFO,ROLLINGFILE
 JMXLOCALONLY=false
 JAVA_OPTS=""
 
+# If ZooKeeper is started through systemd, this will only be used for command
+# line tools such as `zkCli.sh` and not for the actual server
+JAVA=/usr/bin/java
+
 # TODO: This is really ugly
 # How to find out which jars are needed?
 # Seems that log4j requires the log4j.properties file to be in the classpath
diff --git a/debian/zookeeperd.zookeeper.init b/debian/zookeeperd.zookeeper.init
index b596cd4..ea25c00 100644
--- a/debian/zookeeperd.zookeeper.init
+++ b/debian/zookeeperd.zookeeper.init
@@ -31,7 +31,6 @@ DESC="Coordination service for distributed applications"
 NAME=zookeeper
 USER=$NAME
 GROUP=$NAME
-JAVA=/usr/bin/java
 PIDDIR="/var/run/$NAME"
 PIDFILE="$PIDDIR/$NAME.pid"
 SCRIPTNAME="/etc/init.d/$NAME"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/zookeeper.git