From 99008b5e697236ce1f9fafb4dd917796e106557a Mon Sep 17 00:00:00 2001
From: manuasir <manuel.jimenez@wazuh.com>
Date: Mon, 29 Apr 2019 17:04:38 +0200
Subject: [PATCH] Added a conditional flag for enabling XPACK auth requests.

---
 elasticsearch/config/load_settings.sh | 2 +-
 kibana/config/entrypoint.sh           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/elasticsearch/config/load_settings.sh b/elasticsearch/config/load_settings.sh
index b601476f..2a69b36f 100644
--- a/elasticsearch/config/load_settings.sh
+++ b/elasticsearch/config/load_settings.sh
@@ -11,7 +11,7 @@ else
   wazuh_url="${WAZUH_API_URL}"
 fi
 
-if [ "x${ELASTICSEARCH_USERNAME}" = "x" ]; then
+if [ ${ENABLED_XPACK} != "true" || "x${ELASTICSEARCH_USERNAME}" = "x" || "x${ELASTICSEARCH_PASSWORD}" = "x" ]; then
   auth=""
 else
   auth="--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}"
diff --git a/kibana/config/entrypoint.sh b/kibana/config/entrypoint.sh
index e449ae2c..f171374f 100644
--- a/kibana/config/entrypoint.sh
+++ b/kibana/config/entrypoint.sh
@@ -13,7 +13,7 @@ else
   el_url="${ELASTICSEARCH_URL}"
 fi
 
-if [ "x${ELASTICSEARCH_USERNAME}" = "x" ]; then
+if [ ${ENABLED_XPACK} != "true" || "x${ELASTICSEARCH_USERNAME}" = "x" || "x${ELASTICSEARCH_PASSWORD}" = "x" ]; then
   auth=""
 else
   auth="--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}"