Skip to content

Commit a795b7b

Browse files
dotneftdotneft
committed
Fixed usage Vault with non-vault DB credentials
1 parent 7714a31 commit a795b7b

File tree

10 files changed

+120
-50
lines changed

10 files changed

+120
-50
lines changed

‎Dockerfiles/server-mysql/alpine/docker-entrypoint.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -377,22 +377,29 @@ update_zbx_config() {
377377
update_config_var $ZBX_CONFIG "DBName" "${DB_SERVER_DBNAME}"
378378
update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}"
379379

380-
if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then
380+
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then
381381
update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}"
382-
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
383382
update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}"
384383
update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}"
385384
update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}"
386385
update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}"
387-
update_config_var $ZBX_CONFIG "DBUser"
388-
update_config_var $ZBX_CONFIG "DBPassword"
386+
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
387+
388+
if [ -n "${ZBX_VAULTDBPATH}" ]; then
389+
update_config_var $ZBX_CONFIG "DBUser"
390+
update_config_var $ZBX_CONFIG "DBPassword"
391+
else
392+
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
393+
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
394+
fi
389395
else
390396
update_config_var $ZBX_CONFIG "Vault"
391-
update_config_var $ZBX_CONFIG "VaultDBPath"
392397
update_config_var $ZBX_CONFIG "VaultTLSCertFile"
393398
update_config_var $ZBX_CONFIG "VaultTLSKeyFile"
394399
update_config_var $ZBX_CONFIG "VaultPrefix"
395400
update_config_var $ZBX_CONFIG "VaultURL"
401+
update_config_var $ZBX_CONFIG "VaultDBPath"
402+
396403
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
397404
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
398405
fi

‎Dockerfiles/server-mysql/centos/docker-entrypoint.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -374,22 +374,29 @@ update_zbx_config() {
374374
update_config_var $ZBX_CONFIG "DBName" "${DB_SERVER_DBNAME}"
375375
update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}"
376376

377-
if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then
377+
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then
378378
update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}"
379-
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
380379
update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}"
381380
update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}"
382381
update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}"
383382
update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}"
384-
update_config_var $ZBX_CONFIG "DBUser"
385-
update_config_var $ZBX_CONFIG "DBPassword"
383+
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
384+
385+
if [ -n "${ZBX_VAULTDBPATH}" ]; then
386+
update_config_var $ZBX_CONFIG "DBUser"
387+
update_config_var $ZBX_CONFIG "DBPassword"
388+
else
389+
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
390+
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
391+
fi
386392
else
387393
update_config_var $ZBX_CONFIG "Vault"
388-
update_config_var $ZBX_CONFIG "VaultDBPath"
389394
update_config_var $ZBX_CONFIG "VaultTLSCertFile"
390395
update_config_var $ZBX_CONFIG "VaultTLSKeyFile"
391396
update_config_var $ZBX_CONFIG "VaultPrefix"
392397
update_config_var $ZBX_CONFIG "VaultURL"
398+
update_config_var $ZBX_CONFIG "VaultDBPath"
399+
393400
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
394401
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
395402
fi

‎Dockerfiles/server-mysql/ol/docker-entrypoint.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -374,22 +374,29 @@ update_zbx_config() {
374374
update_config_var $ZBX_CONFIG "DBName" "${DB_SERVER_DBNAME}"
375375
update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}"
376376

377-
if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then
377+
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then
378378
update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}"
379-
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
380379
update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}"
381380
update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}"
382381
update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}"
383382
update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}"
384-
update_config_var $ZBX_CONFIG "DBUser"
385-
update_config_var $ZBX_CONFIG "DBPassword"
383+
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
384+
385+
if [ -n "${ZBX_VAULTDBPATH}" ]; then
386+
update_config_var $ZBX_CONFIG "DBUser"
387+
update_config_var $ZBX_CONFIG "DBPassword"
388+
else
389+
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
390+
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
391+
fi
386392
else
387393
update_config_var $ZBX_CONFIG "Vault"
388-
update_config_var $ZBX_CONFIG "VaultDBPath"
389394
update_config_var $ZBX_CONFIG "VaultTLSCertFile"
390395
update_config_var $ZBX_CONFIG "VaultTLSKeyFile"
391396
update_config_var $ZBX_CONFIG "VaultPrefix"
392397
update_config_var $ZBX_CONFIG "VaultURL"
398+
update_config_var $ZBX_CONFIG "VaultDBPath"
399+
393400
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
394401
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
395402
fi

‎Dockerfiles/server-mysql/rhel/docker-entrypoint.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -374,22 +374,29 @@ update_zbx_config() {
374374
update_config_var $ZBX_CONFIG "DBName" "${DB_SERVER_DBNAME}"
375375
update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}"
376376

377-
if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then
377+
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then
378378
update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}"
379-
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
380379
update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}"
381380
update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}"
382381
update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}"
383382
update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}"
384-
update_config_var $ZBX_CONFIG "DBUser"
385-
update_config_var $ZBX_CONFIG "DBPassword"
383+
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
384+
385+
if [ -n "${ZBX_VAULTDBPATH}" ]; then
386+
update_config_var $ZBX_CONFIG "DBUser"
387+
update_config_var $ZBX_CONFIG "DBPassword"
388+
else
389+
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
390+
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
391+
fi
386392
else
387393
update_config_var $ZBX_CONFIG "Vault"
388-
update_config_var $ZBX_CONFIG "VaultDBPath"
389394
update_config_var $ZBX_CONFIG "VaultTLSCertFile"
390395
update_config_var $ZBX_CONFIG "VaultTLSKeyFile"
391396
update_config_var $ZBX_CONFIG "VaultPrefix"
392397
update_config_var $ZBX_CONFIG "VaultURL"
398+
update_config_var $ZBX_CONFIG "VaultDBPath"
399+
393400
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
394401
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
395402
fi

‎Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -374,22 +374,29 @@ update_zbx_config() {
374374
update_config_var $ZBX_CONFIG "DBName" "${DB_SERVER_DBNAME}"
375375
update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}"
376376

377-
if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then
377+
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then
378378
update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}"
379-
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
380379
update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}"
381380
update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}"
382381
update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}"
383382
update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}"
384-
update_config_var $ZBX_CONFIG "DBUser"
385-
update_config_var $ZBX_CONFIG "DBPassword"
383+
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
384+
385+
if [ -n "${ZBX_VAULTDBPATH}" ]; then
386+
update_config_var $ZBX_CONFIG "DBUser"
387+
update_config_var $ZBX_CONFIG "DBPassword"
388+
else
389+
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
390+
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
391+
fi
386392
else
387393
update_config_var $ZBX_CONFIG "Vault"
388-
update_config_var $ZBX_CONFIG "VaultDBPath"
389394
update_config_var $ZBX_CONFIG "VaultTLSCertFile"
390395
update_config_var $ZBX_CONFIG "VaultTLSKeyFile"
391396
update_config_var $ZBX_CONFIG "VaultPrefix"
392397
update_config_var $ZBX_CONFIG "VaultURL"
398+
update_config_var $ZBX_CONFIG "VaultDBPath"
399+
393400
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
394401
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
395402
fi

‎Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -390,22 +390,29 @@ update_zbx_config() {
390390
update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}"
391391
update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}"
392392

393-
if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then
393+
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then
394394
update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}"
395-
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
396395
update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}"
397396
update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}"
398397
update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}"
399398
update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}"
400-
update_config_var $ZBX_CONFIG "DBUser"
401-
update_config_var $ZBX_CONFIG "DBPassword"
399+
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
400+
401+
if [ -n "${ZBX_VAULTDBPATH}" ]; then
402+
update_config_var $ZBX_CONFIG "DBUser"
403+
update_config_var $ZBX_CONFIG "DBPassword"
404+
else
405+
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
406+
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
407+
fi
402408
else
403409
update_config_var $ZBX_CONFIG "Vault"
404-
update_config_var $ZBX_CONFIG "VaultDBPath"
405410
update_config_var $ZBX_CONFIG "VaultTLSCertFile"
406411
update_config_var $ZBX_CONFIG "VaultTLSKeyFile"
407412
update_config_var $ZBX_CONFIG "VaultPrefix"
408413
update_config_var $ZBX_CONFIG "VaultURL"
414+
update_config_var $ZBX_CONFIG "VaultDBPath"
415+
409416
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
410417
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
411418
fi

‎Dockerfiles/server-pgsql/centos/docker-entrypoint.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -390,22 +390,29 @@ update_zbx_config() {
390390
update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}"
391391
update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}"
392392

393-
if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then
393+
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then
394394
update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}"
395-
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
396395
update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}"
397396
update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}"
398397
update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}"
399398
update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}"
400-
update_config_var $ZBX_CONFIG "DBUser"
401-
update_config_var $ZBX_CONFIG "DBPassword"
399+
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
400+
401+
if [ -n "${ZBX_VAULTDBPATH}" ]; then
402+
update_config_var $ZBX_CONFIG "DBUser"
403+
update_config_var $ZBX_CONFIG "DBPassword"
404+
else
405+
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
406+
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
407+
fi
402408
else
403409
update_config_var $ZBX_CONFIG "Vault"
404-
update_config_var $ZBX_CONFIG "VaultDBPath"
405410
update_config_var $ZBX_CONFIG "VaultTLSCertFile"
406411
update_config_var $ZBX_CONFIG "VaultTLSKeyFile"
407412
update_config_var $ZBX_CONFIG "VaultPrefix"
408413
update_config_var $ZBX_CONFIG "VaultURL"
414+
update_config_var $ZBX_CONFIG "VaultDBPath"
415+
409416
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
410417
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
411418
fi

‎Dockerfiles/server-pgsql/ol/docker-entrypoint.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -390,22 +390,29 @@ update_zbx_config() {
390390
update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}"
391391
update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}"
392392

393-
if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then
393+
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then
394394
update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}"
395-
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
396395
update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}"
397396
update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}"
398397
update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}"
399398
update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}"
400-
update_config_var $ZBX_CONFIG "DBUser"
401-
update_config_var $ZBX_CONFIG "DBPassword"
399+
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
400+
401+
if [ -n "${ZBX_VAULTDBPATH}" ]; then
402+
update_config_var $ZBX_CONFIG "DBUser"
403+
update_config_var $ZBX_CONFIG "DBPassword"
404+
else
405+
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
406+
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
407+
fi
402408
else
403409
update_config_var $ZBX_CONFIG "Vault"
404-
update_config_var $ZBX_CONFIG "VaultDBPath"
405410
update_config_var $ZBX_CONFIG "VaultTLSCertFile"
406411
update_config_var $ZBX_CONFIG "VaultTLSKeyFile"
407412
update_config_var $ZBX_CONFIG "VaultPrefix"
408413
update_config_var $ZBX_CONFIG "VaultURL"
414+
update_config_var $ZBX_CONFIG "VaultDBPath"
415+
409416
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
410417
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
411418
fi

‎Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -390,22 +390,29 @@ update_zbx_config() {
390390
update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}"
391391
update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}"
392392

393-
if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then
393+
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then
394394
update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}"
395-
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
396395
update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}"
397396
update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}"
398397
update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}"
399398
update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}"
400-
update_config_var $ZBX_CONFIG "DBUser"
401-
update_config_var $ZBX_CONFIG "DBPassword"
399+
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
400+
401+
if [ -n "${ZBX_VAULTDBPATH}" ]; then
402+
update_config_var $ZBX_CONFIG "DBUser"
403+
update_config_var $ZBX_CONFIG "DBPassword"
404+
else
405+
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
406+
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
407+
fi
402408
else
403409
update_config_var $ZBX_CONFIG "Vault"
404-
update_config_var $ZBX_CONFIG "VaultDBPath"
405410
update_config_var $ZBX_CONFIG "VaultTLSCertFile"
406411
update_config_var $ZBX_CONFIG "VaultTLSKeyFile"
407412
update_config_var $ZBX_CONFIG "VaultPrefix"
408413
update_config_var $ZBX_CONFIG "VaultURL"
414+
update_config_var $ZBX_CONFIG "VaultDBPath"
415+
409416
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
410417
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
411418
fi

‎Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -390,22 +390,29 @@ update_zbx_config() {
390390
update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}"
391391
update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}"
392392

393-
if [ -n "${ZBX_VAULTDBPATH}" ] && [ -n "${ZBX_VAULTURL}" ]; then
393+
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ]; then
394394
update_config_var $ZBX_CONFIG "Vault" "${ZBX_VAULT}"
395-
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
396395
update_config_var $ZBX_CONFIG "VaultTLSCertFile" "${ZBX_VAULTTLSCERTFILE}"
397396
update_config_var $ZBX_CONFIG "VaultTLSKeyFile" "${ZBX_VAULTTLSKEYFILE}"
398397
update_config_var $ZBX_CONFIG "VaultPrefix" "${ZBX_VAULTPREFIX}"
399398
update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}"
400-
update_config_var $ZBX_CONFIG "DBUser"
401-
update_config_var $ZBX_CONFIG "DBPassword"
399+
update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
400+
401+
if [ -n "${ZBX_VAULTDBPATH}" ]; then
402+
update_config_var $ZBX_CONFIG "DBUser"
403+
update_config_var $ZBX_CONFIG "DBPassword"
404+
else
405+
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
406+
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
407+
fi
402408
else
403409
update_config_var $ZBX_CONFIG "Vault"
404-
update_config_var $ZBX_CONFIG "VaultDBPath"
405410
update_config_var $ZBX_CONFIG "VaultTLSCertFile"
406411
update_config_var $ZBX_CONFIG "VaultTLSKeyFile"
407412
update_config_var $ZBX_CONFIG "VaultPrefix"
408413
update_config_var $ZBX_CONFIG "VaultURL"
414+
update_config_var $ZBX_CONFIG "VaultDBPath"
415+
409416
update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
410417
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
411418
fi

0 commit comments

Comments
 (0)