fix: env ZBX_DB_SOCKET being set to an empty value

This commit is contained in:
Marks Sunins 2025-05-08 07:14:38 +00:00
parent 5ac01a4821
commit 6638ca1b6b
No known key found for this signature in database
GPG Key ID: BADED4DBFD15F1A2
10 changed files with 30 additions and 20 deletions

View File

@ -351,8 +351,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

View File

@ -348,8 +348,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

View File

@ -348,8 +348,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

View File

@ -348,8 +348,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

View File

@ -348,8 +348,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

View File

@ -364,8 +364,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

View File

@ -361,8 +361,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

View File

@ -361,8 +361,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

View File

@ -361,8 +361,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

View File

@ -361,8 +361,9 @@ create_db_schema_mysql() {
update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}"
export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
if [ -n "${DB_SERVER_SOCKET}" ]; then
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then