conflicts resolved in merge 3.9.1_6.8.0 over k8s branch

This commit is contained in:
AlfonsoRBJ
2019-05-28 12:43:16 +02:00
12 changed files with 54 additions and 37 deletions
+2 -1
View File
@@ -19,7 +19,8 @@ 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|http://elasticsearch:9200|'$ELASTICSEARCH_KIBANA_IP'|g' /usr/share/kibana/config/kibana.yml
fi
if [ "$KIBANA_IP" != "" ]; then