Fix Bash syntax error with multiple conditions on ES and Kibana

Allow port change for elasticsearch url in kibana
2019-07-05 12:27:35 +02:00 · 2019-05-18 11:56:30 +02:00
3 changed files with 3 additions and 3 deletions
@@ -11,7 +11,7 @@ else
  wazuh_url="${WAZUH_API_URL}"
 fi

-if [ ${ENABLED_XPACK} != "true" || "x${ELASTICSEARCH_USERNAME}" = "x" || "x${ELASTICSEARCH_PASSWORD}" = "x" ]; then
+if [[ ${ENABLED_XPACK} != "true" || "x${ELASTICSEARCH_USERNAME}" = "x" || "x${ELASTICSEARCH_PASSWORD}" = "x" ]]; then
  auth=""
 else
  auth="--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}"
@@ -13,7 +13,7 @@ else
  el_url="${ELASTICSEARCH_URL}"
 fi

-if [ ${ENABLED_XPACK} != "true" || "x${ELASTICSEARCH_USERNAME}" = "x" || "x${ELASTICSEARCH_PASSWORD}" = "x" ]; then
+if [[ ${ENABLED_XPACK} != "true" || "x${ELASTICSEARCH_USERNAME}" = "x" || "x${ELASTICSEARCH_PASSWORD}" = "x" ]]; then
  auth=""
 else
  auth="--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}"
@@ -19,7 +19,7 @@ WAZUH_MAJOR=3
 # Customize elasticsearch ip
 ##############################################################################
 if [ "$ELASTICSEARCH_KIBANA_IP" != "" ]; then
-  sed -i "s/elasticsearch:9200/$ELASTICSEARCH_KIBANA_IP:9200/" /usr/share/kibana/config/kibana.yml
+  sed -i "s/elasticsearch:9200/$ELASTICSEARCH_KIBANA_IP/" /usr/share/kibana/config/kibana.yml
 fi

 if [ "$KIBANA_IP" != "" ]; then
Author	SHA1	Message	Date
Jose M	55dcf354c9	Fix Bash syntax error with multiple conditions on ES and Kibana	2019-07-05 12:27:35 +02:00
Javier Castro	2c67ad822e	Allow port change for elasticsearch url in kibana	2019-05-18 11:56:30 +02:00