Merge branch 'debian-pkg' of https://github.com/karussell/elasticsearch

pom.xml

@@ -398,7 +398,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <!-- some infos https://github.com/tcurdt/jdeb/blob/master/docs/maven.md 
+                <!-- some infos https://github.com/tcurdt/jdeb/blob/master/docs/maven.md
                 -->
                 <artifactId>jdeb</artifactId>
                 <groupId>org.vafer</groupId>

src/deb/control/postrm

@@ -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)

src/deb/init.d/elasticsearch

@@ -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