From 435e92fdbc464778c0167fd5b4deb10ff739b336 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 13 Mar 2025 15:24:12 +0900 Subject: [PATCH] Fixed usage Vault DB credentials with server and proxy --- Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh | 13 +++++++++++-- Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh | 13 +++++++++++-- Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh | 13 +++++++++++-- Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh | 13 +++++++++++-- Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh | 13 +++++++++++-- .../server-mysql/alpine/docker-entrypoint.sh | 13 +++++++++++-- .../server-mysql/centos/docker-entrypoint.sh | 13 +++++++++++-- Dockerfiles/server-mysql/ol/docker-entrypoint.sh | 13 +++++++++++-- Dockerfiles/server-mysql/rhel/docker-entrypoint.sh | 13 +++++++++++-- .../server-mysql/ubuntu/docker-entrypoint.sh | 13 +++++++++++-- .../server-pgsql/alpine/docker-entrypoint.sh | 13 +++++++++++-- .../server-pgsql/centos/docker-entrypoint.sh | 13 +++++++++++-- Dockerfiles/server-pgsql/ol/docker-entrypoint.sh | 13 +++++++++++-- Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh | 13 +++++++++++-- .../server-pgsql/ubuntu/docker-entrypoint.sh | 13 +++++++++++-- 15 files changed, 165 insertions(+), 30 deletions(-) diff --git a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh index 19cf9d07c..9d7782162 100755 --- a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh @@ -354,8 +354,17 @@ update_zbx_config() { export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}" - export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" - export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + else + unset ZBX_DB_USER + unset ZBX_DB_PASSWORD + fi export ZBX_SERVER_HOST="${ZBX_SERVER_HOST:="zabbix-server"}" diff --git a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh index 510cf5d2f..6e32ff852 100755 --- a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh @@ -351,8 +351,17 @@ update_zbx_config() { export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}" - export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" - export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + else + unset ZBX_DB_USER + unset ZBX_DB_PASSWORD + fi export ZBX_SERVER_HOST="${ZBX_SERVER_HOST:="zabbix-server"}" diff --git a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh index 510cf5d2f..6e32ff852 100755 --- a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh @@ -351,8 +351,17 @@ update_zbx_config() { export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}" - export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" - export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + else + unset ZBX_DB_USER + unset ZBX_DB_PASSWORD + fi export ZBX_SERVER_HOST="${ZBX_SERVER_HOST:="zabbix-server"}" diff --git a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh index 510cf5d2f..6e32ff852 100755 --- a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh @@ -351,8 +351,17 @@ update_zbx_config() { export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}" - export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" - export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + else + unset ZBX_DB_USER + unset ZBX_DB_PASSWORD + fi export ZBX_SERVER_HOST="${ZBX_SERVER_HOST:="zabbix-server"}" diff --git a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh index 510cf5d2f..6e32ff852 100755 --- a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh @@ -351,8 +351,17 @@ update_zbx_config() { export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}" - export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" - export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + else + unset ZBX_DB_USER + unset ZBX_DB_PASSWORD + fi export ZBX_SERVER_HOST="${ZBX_SERVER_HOST:="zabbix-server"}" diff --git a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh index c37b17b24..1a998f53d 100755 --- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh @@ -367,8 +367,17 @@ update_zbx_config() { export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}" - export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" - export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + else + unset ZBX_DB_USER + unset ZBX_DB_PASSWORD + fi : ${ZBX_ENABLE_SNMP_TRAPS:="false"} [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1 diff --git a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh index b6e65d2b1..65829573c 100755 --- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh @@ -364,8 +364,17 @@ update_zbx_config() { export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}" - export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" - export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + else + unset ZBX_DB_USER + unset ZBX_DB_PASSWORD + fi : ${ZBX_ENABLE_SNMP_TRAPS:="false"} [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1 diff --git a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh index b6e65d2b1..65829573c 100755 --- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh @@ -364,8 +364,17 @@ update_zbx_config() { export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}" - export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" - export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + else + unset ZBX_DB_USER + unset ZBX_DB_PASSWORD + fi : ${ZBX_ENABLE_SNMP_TRAPS:="false"} [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1 diff --git a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh index b6e65d2b1..65829573c 100755 --- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh @@ -364,8 +364,17 @@ update_zbx_config() { export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}" - export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" - export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + else + unset ZBX_DB_USER + unset ZBX_DB_PASSWORD + fi : ${ZBX_ENABLE_SNMP_TRAPS:="false"} [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1 diff --git a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh index b6e65d2b1..65829573c 100755 --- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh @@ -364,8 +364,17 @@ update_zbx_config() { export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}" - export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" - export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + else + unset ZBX_DB_USER + unset ZBX_DB_PASSWORD + fi : ${ZBX_ENABLE_SNMP_TRAPS:="false"} [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1 diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh index 4002263ea..e9f67dd70 100755 --- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh @@ -394,8 +394,17 @@ update_zbx_config() { export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_SCHEMA="${DB_SERVER_SCHEMA}" - export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" - export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + else + unset ZBX_DB_USER + unset ZBX_DB_PASSWORD + fi : ${ZBX_ENABLE_SNMP_TRAPS:="false"} [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1 diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh index 4002263ea..e9f67dd70 100755 --- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh @@ -394,8 +394,17 @@ update_zbx_config() { export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_SCHEMA="${DB_SERVER_SCHEMA}" - export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" - export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + else + unset ZBX_DB_USER + unset ZBX_DB_PASSWORD + fi : ${ZBX_ENABLE_SNMP_TRAPS:="false"} [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1 diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh index 4002263ea..e9f67dd70 100755 --- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh @@ -394,8 +394,17 @@ update_zbx_config() { export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_SCHEMA="${DB_SERVER_SCHEMA}" - export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" - export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + else + unset ZBX_DB_USER + unset ZBX_DB_PASSWORD + fi : ${ZBX_ENABLE_SNMP_TRAPS:="false"} [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1 diff --git a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh index 4002263ea..e9f67dd70 100755 --- a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh @@ -394,8 +394,17 @@ update_zbx_config() { export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_SCHEMA="${DB_SERVER_SCHEMA}" - export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" - export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + else + unset ZBX_DB_USER + unset ZBX_DB_PASSWORD + fi : ${ZBX_ENABLE_SNMP_TRAPS:="false"} [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1 diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh index 4002263ea..e9f67dd70 100755 --- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh @@ -394,8 +394,17 @@ update_zbx_config() { export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_SCHEMA="${DB_SERVER_SCHEMA}" - export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" - export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + elif [ ! -n "${ZBX_VAULT}" ] && [ ! -n "${ZBX_VAULTURL}" ]; then + export ZBX_DB_USER="${DB_SERVER_ZBX_USER}" + export ZBX_DB_PASSWORD="${DB_SERVER_ZBX_PASS}" + else + unset ZBX_DB_USER + unset ZBX_DB_PASSWORD + fi : ${ZBX_ENABLE_SNMP_TRAPS:="false"} [[ "${ZBX_ENABLE_SNMP_TRAPS,,}" == "true" ]] && export ZBX_STARTSNMPTRAPPER=1