From a135c9bd8b4c29c7f147d125762a9a6456cbc35d Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Wed, 8 Feb 2012 15:47:13 +0200
Subject: [PATCH] prefer jdk 7 over 6, and provide use the new ES_HEAP_SIZE env
 (so min max are the same)

---
 src/deb/init.d/elasticsearch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/deb/init.d/elasticsearch b/src/deb/init.d/elasticsearch
index 0dc8781a067..c4ea2177b93 100644
--- a/src/deb/init.d/elasticsearch
+++ b/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-6-sun /usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-7-openjdk"
+JDK_DIRS="/usr/lib/jvm/java-7-oracle /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-7-openjdk /usr/lib/jvm/java-6-openjdk"
 
 # Look for the right JVM to use
 for jdir in $JDK_DIRS; do
@@ -59,11 +59,11 @@ export JAVA_HOME
 # Directory where the ElasticSearch binary distribution resides
 ES_HOME=/usr/share/$NAME
 
-# Minimum Heap memory to run ElasticSearch
-ES_MIN_MEM=256m
+# Heap Size (defaults to 256m min, 1g max)
+#ES_HEAP_SIZE=2g
 
-# Maximum Heap memory to run ElasticSearch
-ES_MAX_MEM=1g
+# Additional Java OPTS
+#ES_JAVA_OPTS=
 
 # ElasticSearch log directory
 LOG_DIR=/var/log/$NAME