extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-05-31 15:16:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1183 from zabbix/security_patches

Browse Source 
Updated Zabbix web-frontend configuration file
This commit is contained in:
Alexey Pustovalov 2024-02-16 14:22:44 +09:00 committed by GitHub
commit 098c680d2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';

2
Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';

2
Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';

2
Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';

2
Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';

2
Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';

2
Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';

2
Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';

2
Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';

2
Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';

2
Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';

2
Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';

2
Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';

2
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';

2
Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';

2
Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';

2
Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
View File

@ -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'); $DB['VAULT_CERT_FILE'] = file_exists('/etc/zabbix/web/certs/vault.crt');
} }
elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) { elseif (file_exists(getenv('ZBX_VAULTCERTFILE'))) {
$DB['VAULT_CERT_FILE'] = $DB['VAULT_CERT_FILE']; $DB['VAULT_CERT_FILE'] = getenv('ZBX_VAULTCERTFILE');
} }
else { else {
$DB['VAULT_CERT_FILE'] = ''; $DB['VAULT_CERT_FILE'] = '';