Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-23 14:57:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/kibana] remove unsable function kibana_set_key_value function and move to kibana_conf_set (#76759)

Browse Source 
[bitnami/kibana] remove unsable function kibana_set_key_value function and move to kibana_conf_set in containers/bitnami/kibana/8/debian-12/rootfs/opt/bitnami/scripts/libkibana.sh

Signed-off-by: CHOCOLATTE <w.wiriya.m@gmail.com>
This commit is contained in:
CHOCOLATTE
2025-02-21 22:47:52 +07:00
committed by GitHub
parent e584bba254
commit f595414b62
1 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
bitnami/kibana/8/debian-12/rootfs/opt/bitnami/scripts/libkibana.sh
View File

@@ -16,23 +16,6 @@
# Functions
########################
# Set Elasticsearch keystore values
# Globals:
# ELASTICSEARCH_*
# Arguments:
# None
# Returns:
# None
#########################
kibana_set_key_value() {
local key="${1:?missing key}"
local value="${2:?missing value}"
debug "Storing key: ${key}"
kibana-keystore add --stdin --force "$key" <<<"$value"
}
########################
# Waits for Elasticsearch to be available and creates the user 'kibana_user', if it doesn't exists
# Globals:
@@ -252,20 +235,12 @@ kibana_initialize() {
kibana_conf_set "server.ssl.certificate" "$SERVER_CERT_LOCATION"
kibana_conf_set "server.ssl.key" "$SERVER_KEY_LOCATION"
if ! is_empty_value "$SERVER_KEY_PASSWORD"; then
if [[ "$SERVER_FLAVOR" = "opensearch-dashboards" ]]; then
kibana_conf_set "server.ssl.keyPassphrase" "$SERVER_KEY_PASSWORD"
else
kibana_set_key_value "server.ssl.keyPassphrase" "$SERVER_KEY_PASSWORD"
fi
kibana_conf_set "server.ssl.keyPassphrase" "$SERVER_KEY_PASSWORD"
fi
else
kibana_conf_set "server.ssl.keystore.path" "$SERVER_KEYSTORE_LOCATION"
if ! is_empty_value "$SERVER_KEYSTORE_PASSWORD"; then
if [[ "$SERVER_FLAVOR" = "opensearch-dashboards" ]]; then
kibana_conf_set "server.ssl.keystore.password" "$SERVER_KEY_PASSWORD"
else
kibana_set_key_value "server.ssl.keystore.password" "$SERVER_KEY_PASSWORD"
fi
kibana_conf_set "server.ssl.keystore.password" "$SERVER_KEYSTORE_PASSWORD"
fi
fi
fi
@@ -279,11 +254,7 @@ kibana_initialize() {
else
kibana_conf_set "${dbFlavor}.ssl.truststore.path" "$SERVER_DB_TRUSTSTORE_LOCATION"
if ! is_empty_value "$SERVER_DB_TRUSTSTORE_PASSWORD"; then
if [[ "$SERVER_FLAVOR" = "opensearch-dashboards" ]]; then
kibana_conf_set "${dbFlavor}.ssl.truststore.password" "$SERVER_DB_TRUSTSTORE_PASSWORD"
else
kibana_set_key_value "${dbFlavor}.ssl.truststore.password" "$SERVER_DB_TRUSTSTORE_PASSWORD"
fi
kibana_conf_set "${dbFlavor}.ssl.truststore.password" "$SERVER_DB_TRUSTSTORE_PASSWORD"
fi
fi
fi