From ba1e82849b30bb47e343aa9039d001906cb2b8c9 Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Thu, 18 Mar 2021 15:32:30 +0100
Subject: [PATCH] Use ES_JAVA_HOME instead of JAVA_HOME (#789)

This commit set `ES_JAVA_HOME` environment variable instead of
`JAVA_HOME` when `es_java_home` environment variable is used.

See https://github.com/elastic/elasticsearch/issues/68848 for more
context.
---
 templates/elasticsearch.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/elasticsearch.j2 b/templates/elasticsearch.j2
index 367bf95..4e64f38 100644
--- a/templates/elasticsearch.j2
+++ b/templates/elasticsearch.j2
@@ -10,9 +10,9 @@ ES_TMPDIR={{ es_tmp_dir }}
 
 # Elasticsearch Java path
 {% if es_java_home | length > 0 %}
-JAVA_HOME={{ es_java_home }}
+ES_JAVA_HOME={{ es_java_home }}
 {% else %}
-#JAVA_HOME=
+#ES_JAVA_HOME=
 {% endif %}
 
 # Elasticsearch configuration directory