Update the elasticsearch cookbook

cookbooks/elasticsearch/templates/debian/initscript.erb

@@ -39,7 +39,7 @@ ES_HOME=/usr/share/$NAME
 #ES_JAVA_OPTS=
 
 # Maximum number of open files
-MAX_OPEN_FILES=65536
+MAX_OPEN_FILES=65535
 
 # Maximum amount of locked memory
 #MAX_LOCKED_MEMORY=
@@ -82,22 +82,8 @@ if [ ! -x "$DAEMON" ]; then
 	exit 1
 fi
 
-checkJava() {
-	if [ -x "$JAVA_HOME/bin/java" ]; then
-		JAVA="$JAVA_HOME/bin/java"
-	else
-		JAVA=`which java`
-	fi
-
-	if [ ! -x "$JAVA" ]; then
-		echo "Could not find any executable java binary. Please install java in your PATH or set JAVA_HOME"
-		exit 1
-	fi
-}
-
 case "$1" in
   start)
-	checkJava
 
 	log_daemon_msg "Starting $DESC"
 
@@ -124,7 +110,7 @@ case "$1" in
 		ulimit -l $MAX_LOCKED_MEMORY
 	fi
 
-	if [ -n "$MAX_MAP_COUNT" -a -f /proc/sys/vm/max_map_count ]; then
+	if [ -n "$MAX_MAP_COUNT" -a -f /proc/sys/vm/max_map_count ] && [ "$MAX_MAP_COUNT" -gt $(cat /proc/sys/vm/max_map_count) ]; then
 		sysctl -q -w vm.max_map_count=$MAX_MAP_COUNT
 	fi