From 609b0ce86c1777af9d43dacf85e56106ac204961 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 4 Nov 2021 15:42:05 +0200 Subject: [PATCH] Fixed issue with VAULT_TOKEN variable --- Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh | 2 +- Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh | 2 +- Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh | 2 +- Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh | 2 +- Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh | 2 +- .../proxy-sqlite3/alpine/docker-entrypoint.sh | 2 +- .../proxy-sqlite3/centos/docker-entrypoint.sh | 2 +- Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh | 2 +- Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh | 2 +- .../proxy-sqlite3/ubuntu/docker-entrypoint.sh | 2 +- Dockerfiles/server-mysql/alpine/docker-entrypoint.sh | 2 +- Dockerfiles/server-mysql/centos/docker-entrypoint.sh | 2 +- Dockerfiles/server-mysql/ol/docker-entrypoint.sh | 2 +- Dockerfiles/server-mysql/rhel/docker-entrypoint.sh | 2 +- Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh | 2 +- Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh | 2 +- Dockerfiles/server-pgsql/centos/docker-entrypoint.sh | 2 +- Dockerfiles/server-pgsql/ol/docker-entrypoint.sh | 2 +- Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh | 2 +- .../alpine/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../centos/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../ol/conf/etc/zabbix/web/zabbix.conf.php | 12 ++++++++---- .../ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../alpine/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../centos/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../ol/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../alpine/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../centos/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../ol/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../rhel/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../alpine/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../centos/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../ol/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../rhel/conf/etc/zabbix/web/zabbix.conf.php | 4 ++-- .../zabbix-appliance/rhel/docker-entrypoint.sh | 2 +- 38 files changed, 62 insertions(+), 58 deletions(-) diff --git a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh index 2d7aac592..c01b8e985 100755 --- a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh @@ -346,7 +346,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" diff --git a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh index bc745153d..a48c18e8f 100755 --- a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh @@ -344,7 +344,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" diff --git a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh index bc745153d..a48c18e8f 100755 --- a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh @@ -344,7 +344,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" diff --git a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh index 4328240c6..79c238455 100755 --- a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh @@ -345,7 +345,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" diff --git a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh index 1b29c77cd..1c4869aab 100755 --- a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh @@ -343,7 +343,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" diff --git a/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh index ee04cdd17..bb3b25902 100755 --- a/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh @@ -144,7 +144,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPassword" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" else diff --git a/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh index ee04cdd17..bb3b25902 100755 --- a/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh @@ -144,7 +144,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPassword" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" else diff --git a/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh index ee04cdd17..bb3b25902 100755 --- a/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh @@ -144,7 +144,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPassword" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" else diff --git a/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh index ee04cdd17..bb3b25902 100755 --- a/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh @@ -144,7 +144,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPassword" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" else diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh index 02f3e972f..426124565 100755 --- a/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh @@ -144,7 +144,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBPort" update_config_var $ZBX_CONFIG "DBPassword" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" else diff --git a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh index 43b0e2e17..f06bc5a4a 100755 --- a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh @@ -327,7 +327,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" diff --git a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh index bd98852eb..76006e474 100755 --- a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh @@ -324,7 +324,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" diff --git a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh index bd98852eb..76006e474 100755 --- a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh @@ -324,7 +324,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" diff --git a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh index bd98852eb..76006e474 100755 --- a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh @@ -324,7 +324,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" diff --git a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh index 046c284ce..f2dcb5bbd 100755 --- a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh @@ -324,7 +324,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh index 2c49cbd53..c3bf23ee5 100755 --- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh @@ -362,7 +362,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh index 2c49cbd53..c3bf23ee5 100755 --- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh @@ -362,7 +362,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh index 2c49cbd53..c3bf23ee5 100755 --- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh @@ -362,7 +362,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh index c767d37e9..82d6ad79d 100755 --- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh @@ -362,7 +362,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser" diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php index 72b99cfc1..2b667eb01 100644 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php @@ -6,10 +6,10 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = getenv('DB_SERVER_USER'); -$DB['PASSWORD'] = getenv('DB_SERVER_PASS'); +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; -// Schema name. Used for IBM DB2 and PostgreSQL. +// Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); $ZBX_SERVER = getenv('ZBX_SERVER_HOST'); @@ -24,6 +24,11 @@ $DB['CA_FILE'] = getenv('ZBX_DB_CA_FILE'); $DB['VERIFY_HOST'] = getenv('ZBX_DB_VERIFY_HOST') == 'true' ? true: false; $DB['CIPHER_LIST'] = getenv('ZBX_DB_CIPHER_LIST') ? getenv('ZBX_DB_CIPHER_LIST') : ''; +// Vault configuration. Used if database credentials are stored in Vault secrets manager. +$DB['VAULT_URL'] = getenv('ZBX_VAULTURL'); +$DB['VAULT_DB_PATH'] = getenv('ZBX_VAULTDBPATH'); +$DB['VAULT_TOKEN'] = getenv('VAULT_TOKEN'); + // Use IEEE754 compatible value range for 64-bit Numeric (float) history values. // This option is enabled by default for new Zabbix installations. // For upgraded installations, please read database upgrade notes before enabling this option. @@ -41,7 +46,6 @@ $storage_types = str_replace("'","\"",getenv('ZBX_HISTORYSTORAGETYPES')); $HISTORY['types'] = (json_decode($storage_types)) ? json_decode($storage_types, true) : array(); // Used for SAML authentication. -// Uncomment to override the default paths to SP private key, SP and IdP X.509 certificates, and to set extra settings. $SSO['SP_KEY'] = file_exists('/etc/zabbix/web/certs/sp.key') ? '/etc/zabbix/web/certs/sp.key' : (file_exists(getenv('ZBX_SSO_SP_KEY')) ? getenv('ZBX_SSO_SP_KEY') : ''); $SSO['SP_CERT'] = file_exists('/etc/zabbix/web/certs/sp.crt') ? '/etc/zabbix/web/certs/sp.crt' : (file_exists(getenv('ZBX_SSO_SP_CERT')) ? getenv('ZBX_SSO_SP_CERT') : ''); $SSO['IDP_CERT'] = file_exists('/etc/zabbix/web/certs/idp.crt') ? '/etc/zabbix/web/certs/idp.crt' : (file_exists(getenv('ZBX_SSO_IDP_CERT')) ? getenv('ZBX_SSO_IDP_CERT') : ''); diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/zabbix-appliance/rhel/conf/etc/zabbix/web/zabbix.conf.php b/Dockerfiles/zabbix-appliance/rhel/conf/etc/zabbix/web/zabbix.conf.php index e3a21c62b..2b667eb01 100644 --- a/Dockerfiles/zabbix-appliance/rhel/conf/etc/zabbix/web/zabbix.conf.php +++ b/Dockerfiles/zabbix-appliance/rhel/conf/etc/zabbix/web/zabbix.conf.php @@ -6,8 +6,8 @@ $DB['TYPE'] = getenv('DB_SERVER_TYPE'); $DB['SERVER'] = getenv('DB_SERVER_HOST'); $DB['PORT'] = getenv('DB_SERVER_PORT'); $DB['DATABASE'] = getenv('DB_SERVER_DBNAME'); -$DB['USER'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_USER') : ''; -$DB['PASSWORD'] = ! getenv('VAULT_TOKEN') ? getenv('DB_SERVER_PASS') : ''; +$DB['USER'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_USER') : ''; +$DB['PASSWORD'] = (! getenv('VAULT_TOKEN') || ! getenv('ZBX_VAULTURL')) ? getenv('DB_SERVER_PASS') : ''; // Schema name. Used for PostgreSQL. $DB['SCHEMA'] = getenv('DB_SERVER_SCHEMA'); diff --git a/Dockerfiles/zabbix-appliance/rhel/docker-entrypoint.sh b/Dockerfiles/zabbix-appliance/rhel/docker-entrypoint.sh index dd5c92585..54faec9dd 100755 --- a/Dockerfiles/zabbix-appliance/rhel/docker-entrypoint.sh +++ b/Dockerfiles/zabbix-appliance/rhel/docker-entrypoint.sh @@ -412,7 +412,7 @@ update_zbx_config() { update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}" update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}" - if [ -n "${VAULT_TOKEN}" ]; then + if [ -n "${VAULT_TOKEN}" ] && [ -n "${ZBX_VAULTURL}" ]; then update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}" update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}" update_config_var $ZBX_CONFIG "DBUser"