From 7d2d382bb5d029ccebb9454ecd8c7fc7ed971b81 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 30 Sep 2026 11:18:24 +0300 Subject: [PATCH] Fix Zabbix database environment variables --- scripts/deploy-zabbix.sh | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/scripts/deploy-zabbix.sh b/scripts/deploy-zabbix.sh index c15173c..5ec3b8b 100755 --- a/scripts/deploy-zabbix.sh +++ b/scripts/deploy-zabbix.sh @@ -453,12 +453,19 @@ source "${ENV_FILE}" set +a -: "${POSTGRES_HOST:?POSTGRES_HOST not defined}" -: "${POSTGRES_PORT:?POSTGRES_PORT not defined}" -: "${POSTGRES_DB:?POSTGRES_DB not defined}" -: "${POSTGRES_USER:?POSTGRES_USER not defined}" -: "${POSTGRES_PASSWORD:?POSTGRES_PASSWORD not defined}" +DB_HOST="${DB_SERVER_HOST:-${POSTGRES_HOST:-}}" +DB_PORT="${DB_SERVER_PORT:-${POSTGRES_PORT:-5432}}" +DB_NAME="${POSTGRES_DB:-}" +DB_USER="${POSTGRES_USER:-}" +DB_PASSWORD="${POSTGRES_PASSWORD:-}" + + +: "${DB_HOST:?DB_SERVER_HOST not defined}" +: "${DB_PORT:?DB_SERVER_PORT not defined}" +: "${DB_NAME:?POSTGRES_DB not defined}" +: "${DB_USER:?POSTGRES_USER not defined}" +: "${DB_PASSWORD:?POSTGRES_PASSWORD not defined}" export PGPASSWORD="${POSTGRES_PASSWORD}" export PGCONNECT_TIMEOUT=10 @@ -753,8 +760,8 @@ EOF DB_TEST="$( psql \ - -h "${POSTGRES_HOST}" \ - -p "${POSTGRES_PORT}" \ + -h "${DB_HOST}" \ + -p "${DB_PORT}" \ -U "${POSTGRES_USER}" \ -d "${POSTGRES_DB}" \ -Atqc 'SELECT 1;' @@ -771,8 +778,8 @@ EOF SERVER_VERSION="$( psql \ - -h "${POSTGRES_HOST}" \ - -p "${POSTGRES_PORT}" \ + -h "${DB_HOST}" \ + -p "${DB_PORT}" \ -U "${POSTGRES_USER}" \ -d "${POSTGRES_DB}" \ -Atqc 'SHOW server_version;' @@ -817,8 +824,8 @@ EOF DB_SIZE="$( psql \ - -h "${POSTGRES_HOST}" \ - -p "${POSTGRES_PORT}" \ + -h "${DB_HOST}" \ + -p "${DB_PORT}" \ -U "${POSTGRES_USER}" \ -d "${POSTGRES_DB}" \ -Atqc \ @@ -838,8 +845,8 @@ EOF pg_dump \ - -h "${POSTGRES_HOST}" \ - -p "${POSTGRES_PORT}" \ + -h "${DB_HOST}" \ + -p "${DB_PORT}" \ -U "${POSTGRES_USER}" \ -d "${POSTGRES_DB}" \ --format=custom \