This commit is contained in:
Shay Banon 2012-02-08 15:41:33 +02:00
commit 7b37774a00
3 changed files with 7 additions and 4 deletions

View File

@ -3,8 +3,11 @@ set -e
case "$1" in
remove)
# Remove logs and data
rm -rf /var/log/elasticsearch /var/lib/elasticsearch
# Remove logs
rm -rf /var/log/elasticsearch
# remove **only** empty data dir
rmdir -p --ignore-fail-on-non-empty /var/lib/elasticsearch
;;
purge)

View File

@ -46,7 +46,7 @@ ES_USER=elasticsearch
ES_GROUP=elasticsearch
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT)
JDK_DIRS="/usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun"
JDK_DIRS="/usr/lib/jvm/java-6-sun /usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-7-openjdk"
# Look for the right JVM to use
for jdir in $JDK_DIRS; do