mirror of
https://github.com/nextcloud/all-in-one.git
synced 2025-12-22 07:26:55 +00:00
Merge pull request #5117 from nextcloud/enh/noid/improve-config
nextcloud: config files: do not compare against false
This commit is contained in:
commit
6986eccad4
3 changed files with 7 additions and 7 deletions
|
|
@ -13,6 +13,6 @@ $CONFIG = array (
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
if (getenv('APPS_ALLOWLIST') !== false) {
|
if (getenv('APPS_ALLOWLIST')) {
|
||||||
$CONFIG['appsallowlist'] = explode(" ", getenv('APPS_ALLOWLIST'));
|
$CONFIG['appsallowlist'] = explode(" ", getenv('APPS_ALLOWLIST'));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
<?php
|
<?php
|
||||||
if (getenv('HTTP_PROXY') !== false) {
|
if (getenv('HTTP_PROXY')) {
|
||||||
$CONFIG['proxy'] = getenv('HTTP_PROXY');
|
$CONFIG['proxy'] = getenv('HTTP_PROXY');
|
||||||
}
|
}
|
||||||
if (getenv('HTTPS_PROXY') !== false) {
|
if (getenv('HTTPS_PROXY')) {
|
||||||
$CONFIG['proxy'] = getenv('HTTPS_PROXY');
|
$CONFIG['proxy'] = getenv('HTTPS_PROXY');
|
||||||
}
|
}
|
||||||
if (getenv('PROXY_USER_PASSWORD') !== false) {
|
if (getenv('PROXY_USER_PASSWORD')) {
|
||||||
$CONFIG['proxyuserpwd'] = getenv('PROXY_USER_PASSWORD');
|
$CONFIG['proxyuserpwd'] = getenv('PROXY_USER_PASSWORD');
|
||||||
}
|
}
|
||||||
if (getenv('NO_PROXY') !== false) {
|
if (getenv('NO_PROXY')) {
|
||||||
$CONFIG['proxyexclude'] = explode(',', getenv('NO_PROXY'));
|
$CONFIG['proxyexclude'] = explode(',', getenv('NO_PROXY'));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,13 +9,13 @@ if (getenv('REDIS_HOST')) {
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
if (getenv('REDIS_HOST_PORT') !== false) {
|
if (getenv('REDIS_HOST_PORT')) {
|
||||||
$CONFIG['redis']['port'] = (int) getenv('REDIS_HOST_PORT');
|
$CONFIG['redis']['port'] = (int) getenv('REDIS_HOST_PORT');
|
||||||
} elseif (getenv('REDIS_HOST')[0] != '/') {
|
} elseif (getenv('REDIS_HOST')[0] != '/') {
|
||||||
$CONFIG['redis']['port'] = 6379;
|
$CONFIG['redis']['port'] = 6379;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getenv('REDIS_DB_INDEX') !== false) {
|
if (getenv('REDIS_DB_INDEX')) {
|
||||||
$CONFIG['redis']['dbindex'] = (int) getenv('REDIS_DB_INDEX');
|
$CONFIG['redis']['dbindex'] = (int) getenv('REDIS_DB_INDEX');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue