From a795b7bcc9f6aafe04a980b02ded00c6f8efd47e Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 22 Jul 2024 16:51:42 +0900 Subject: [PATCH] Fixed usage Vault with non-vault DB credentials --- .../server-mysql/alpine/docker-entrypoint.sh | 17 ++++++++++++----- .../server-mysql/centos/docker-entrypoint.sh | 17 ++++++++++++----- .../server-mysql/ol/docker-entrypoint.sh | 17 ++++++++++++----- .../server-mysql/rhel/docker-entrypoint.sh | 17 ++++++++++++----- .../server-mysql/ubuntu/docker-entrypoint.sh | 17 ++++++++++++----- .../server-pgsql/alpine/docker-entrypoint.sh | 17 ++++++++++++----- .../server-pgsql/centos/docker-entrypoint.sh | 17 ++++++++++++----- .../server-pgsql/ol/docker-entrypoint.sh | 17 ++++++++++++----- .../server-pgsql/rhel/docker-entrypoint.sh | 17 ++++++++++++----- .../server-pgsql/ubuntu/docker-entrypoint.sh | 17 ++++++++++++----- 10 files changed, 120 insertions(+), 50 deletions(-) diff --git a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh index 83154dcb5..dd5129f71 100755 --- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh @@ -377,22 +377,29 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBName" "${DB_SERVER_DBNAME}" update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" - if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}" - update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" - update_config_var $ZBX_CONFIG "DBUser" - update_config_var $ZBX_CONFIG "DBPassword" + update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" + + if [ -n "${ZBX_VAULTDBPATH}" ]; then + update_config_var $ZBX_CONFIG "DBUser" + update_config_var $ZBX_CONFIG "DBPassword" + else + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" + update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" + fi else update_config_var $ZBX_CONFIG "Vault" - update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" + update_config_var $ZBX_CONFIG "VaultDBPath" + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" fi diff --git a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh index f44468466..e317019e8 100755 --- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh @@ -374,22 +374,29 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBName" "${DB_SERVER_DBNAME}" update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" - if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}" - update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" - update_config_var $ZBX_CONFIG "DBUser" - update_config_var $ZBX_CONFIG "DBPassword" + update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" + + if [ -n "${ZBX_VAULTDBPATH}" ]; then + update_config_var $ZBX_CONFIG "DBUser" + update_config_var $ZBX_CONFIG "DBPassword" + else + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" + update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" + fi else update_config_var $ZBX_CONFIG "Vault" - update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" + update_config_var $ZBX_CONFIG "VaultDBPath" + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" fi diff --git a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh index f44468466..e317019e8 100755 --- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh @@ -374,22 +374,29 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBName" "${DB_SERVER_DBNAME}" update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" - if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}" - update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" - update_config_var $ZBX_CONFIG "DBUser" - update_config_var $ZBX_CONFIG "DBPassword" + update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" + + if [ -n "${ZBX_VAULTDBPATH}" ]; then + update_config_var $ZBX_CONFIG "DBUser" + update_config_var $ZBX_CONFIG "DBPassword" + else + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" + update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" + fi else update_config_var $ZBX_CONFIG "Vault" - update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" + update_config_var $ZBX_CONFIG "VaultDBPath" + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" fi diff --git a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh index f44468466..e317019e8 100755 --- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh @@ -374,22 +374,29 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBName" "${DB_SERVER_DBNAME}" update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" - if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}" - update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" - update_config_var $ZBX_CONFIG "DBUser" - update_config_var $ZBX_CONFIG "DBPassword" + update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" + + if [ -n "${ZBX_VAULTDBPATH}" ]; then + update_config_var $ZBX_CONFIG "DBUser" + update_config_var $ZBX_CONFIG "DBPassword" + else + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" + update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" + fi else update_config_var $ZBX_CONFIG "Vault" - update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" + update_config_var $ZBX_CONFIG "VaultDBPath" + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" fi diff --git a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh index 4675a05bf..69994785d 100755 --- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh @@ -374,22 +374,29 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBName" "${DB_SERVER_DBNAME}" update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" - if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}" - update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" - update_config_var $ZBX_CONFIG "DBUser" - update_config_var $ZBX_CONFIG "DBPassword" + update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" + + if [ -n "${ZBX_VAULTDBPATH}" ]; then + update_config_var $ZBX_CONFIG "DBUser" + update_config_var $ZBX_CONFIG "DBPassword" + else + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" + update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" + fi else update_config_var $ZBX_CONFIG "Vault" - update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" + update_config_var $ZBX_CONFIG "VaultDBPath" + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" fi diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh index 5d3e1d613..81589f489 100755 --- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh @@ -390,22 +390,29 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}" - update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" - update_config_var $ZBX_CONFIG "DBUser" - update_config_var $ZBX_CONFIG "DBPassword" + update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" + + if [ -n "${ZBX_VAULTDBPATH}" ]; then + update_config_var $ZBX_CONFIG "DBUser" + update_config_var $ZBX_CONFIG "DBPassword" + else + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" + update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" + fi else update_config_var $ZBX_CONFIG "Vault" - update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" + update_config_var $ZBX_CONFIG "VaultDBPath" + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" fi diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh index 5d3e1d613..81589f489 100755 --- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh @@ -390,22 +390,29 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}" - update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" - update_config_var $ZBX_CONFIG "DBUser" - update_config_var $ZBX_CONFIG "DBPassword" + update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" + + if [ -n "${ZBX_VAULTDBPATH}" ]; then + update_config_var $ZBX_CONFIG "DBUser" + update_config_var $ZBX_CONFIG "DBPassword" + else + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" + update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" + fi else update_config_var $ZBX_CONFIG "Vault" - update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" + update_config_var $ZBX_CONFIG "VaultDBPath" + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" fi diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh index 5d3e1d613..81589f489 100755 --- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh @@ -390,22 +390,29 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}" - update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" - update_config_var $ZBX_CONFIG "DBUser" - update_config_var $ZBX_CONFIG "DBPassword" + update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" + + if [ -n "${ZBX_VAULTDBPATH}" ]; then + update_config_var $ZBX_CONFIG "DBUser" + update_config_var $ZBX_CONFIG "DBPassword" + else + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" + update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" + fi else update_config_var $ZBX_CONFIG "Vault" - update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" + update_config_var $ZBX_CONFIG "VaultDBPath" + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" fi diff --git a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh index 5d3e1d613..81589f489 100755 --- a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh @@ -390,22 +390,29 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}" - update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" - update_config_var $ZBX_CONFIG "DBUser" - update_config_var $ZBX_CONFIG "DBPassword" + update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" + + if [ -n "${ZBX_VAULTDBPATH}" ]; then + update_config_var $ZBX_CONFIG "DBUser" + update_config_var $ZBX_CONFIG "DBPassword" + else + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" + update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" + fi else update_config_var $ZBX_CONFIG "Vault" - update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" + update_config_var $ZBX_CONFIG "VaultDBPath" + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" fi diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh index fff2ba0b3..a5a819ddd 100755 --- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh @@ -390,22 +390,29 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then + if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}" - update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}" update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" - update_config_var $ZBX_CONFIG "DBUser" - update_config_var $ZBX_CONFIG "DBPassword" + update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" + + if [ -n "${ZBX_VAULTDBPATH}" ]; then + update_config_var $ZBX_CONFIG "DBUser" + update_config_var $ZBX_CONFIG "DBPassword" + else + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" + update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" + fi else update_config_var $ZBX_CONFIG "Vault" - update_config_var $ZBX_CONFIG "VaultDBPath" update_config_var $ZBX_CONFIG "VaultTLSCertFile" update_config_var $ZBX_CONFIG "VaultTLSKeyFile" update_config_var $ZBX_CONFIG "VaultPrefix" update_config_var $ZBX_CONFIG "VaultURL" + update_config_var $ZBX_CONFIG "VaultDBPath" + update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}" update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}" fi