Skip to content

Commit

Permalink
Merge pull request #1183 from zabbix/security_patches
Browse files Browse the repository at this point in the history 
Updated Zabbix web-frontend configuration file
  • Loading branch information
@dotneft
dotneft committed Feb 16, 2024
1 parent 8466fff commit 2c3d101
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Dockerfiles/web-apache-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-apache-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-apache-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-apache-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-apache-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$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'] = '';
Expand Down

0 comments on commit 2c3d101

Please sign in to comment.