extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-05-29 22:30:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed VAULT_CERT_FILE detection

Browse Source
This commit is contained in:
Alexey Pustovalov 2024-04-26 15:43:18 +09:00
parent 25d7215712
commit cd52a48021
18 changed files with 18 additions and 18 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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