From 2c3d1013ddfa4d0679327ed9dac534cdcd6a2fdf Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 16 Feb 2024 14:22:44 +0900 Subject: [PATCH] Merge pull request #1183 from zabbix/security_patches Updated Zabbix web-frontend configuration file --- .../web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php | 2 +- .../web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php | 2 +- .../web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php | 2 +- .../web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 2 +- .../web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php | 2 +- .../web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php | 2 +- .../web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php | 2 +- .../web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 2 +- .../web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php | 2 +- .../web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php | 2 +- .../web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php | 2 +- .../web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php | 2 +- .../web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 2 +- .../web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php | 2 +- .../web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php | 2 +- .../web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php | 2 +- .../web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = ''; 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = ''; 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = ''; 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = ''; 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = ''; 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = ''; 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = ''; 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = ''; 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = ''; 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = ''; 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = ''; 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = ''; 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = ''; 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = ''; 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = ''; 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = ''; 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 27bdc211d..734ff03ff 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 @@ -36,7 +36,7 @@ if (file_exists('/etc/zabbix/web/certs/vault.crt')) { $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt'); } elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { - $DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; + $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE'); } else { $DB['VAULT_CERT_FILE'] = '';