More flexible DB TLS params usage

This commit is contained in:
Alexey Pustovalov
2020-08-27 12:58:54 -04:00
parent 4cb8a75def
commit d5ed6498dd
13 changed files with 308 additions and 88 deletions

View File

@ -172,6 +172,28 @@ check_variables() {
DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"}
}
db_tls_params() {
local result=""
if [ "${ZBX_DB_ENCRYPTION}" == "true" ]; then
result="--ssl"
if [ -n "${ZBX_DB_CA_FILE}" ]; then
result="${result} --ssl-ca=${ZBX_DB_CA_FILE}"
fi
if [ -n "${ZBX_DB_KEY_FILE}" ]; then
result="${result} --ssl-key=${ZBX_DB_KEY_FILE}"
fi
if [ -n "${ZBX_DB_CERT_FILE}" ]; then
result="${result} --ssl-cert=${ZBX_DB_CERT_FILE}"
fi
fi
echo $result
}
check_db_connect() {
echo "********************"
echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}"
@ -190,9 +212,7 @@ check_db_connect() {
WAIT_TIMEOUT=5
if [ "${ZBX_DB_ENCRYPTION}" == "true" ]; then
ssl_opts="--ssl --ssl-ca=${ZBX_DB_CA_FILE} --ssl-key=${ZBX_DB_KEY_FILE} --ssl-cert=${ZBX_DB_CERT_FILE}"
fi
ssl_opts="$(db_tls_params)"
while [ ! "$(mysqladmin ping -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} -u ${DB_SERVER_ROOT_USER} \
--password="${DB_SERVER_ROOT_PASS}" --silent --connect_timeout=10 $ssl_opts)" ]; do