aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-06-17 08:34:48 +02:00
Code Activity

Remove default null from reverse proxy config to avoid breaking existing deployments

Browse source 
Signed-off-by: András Maróy <andras@maroy.hu>
This commit is contained in:
András Maróy 2020-04-12 09:04:43 +02:00
parent 8b4bb96e53
commit a4d2933547
14 changed files with 2 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

10
16.0/fpm/config/reverse-proxy.config.php
View file

@ -2,34 +2,24 @@
$overwriteHost = getenv('OVERWRITEHOST');
if ($overwriteHost) {
$CONFIG['overwritehost'] = $overwriteHost;
} else {
$CONFIG['overwritehost'] = null;
}
$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
if ($overwriteProtocol) {
$CONFIG['overwriteprotocol'] = $overwriteProtocol;
} else {
$CONFIG['overwriteprotocol'] = null;
}
$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
if ($overwriteWebRoot) {
$CONFIG['overwritewebroot'] = $overwriteWebRoot;
} else {
$CONFIG['overwritewebroot'] = null;
}
$overwriteCondAddr = getenv('OVERWRITECONDADDR');
if ($overwriteCondAddr) {
$CONFIG['overwritecondaddr'] = $overwriteCondAddr;
} else {
$CONFIG['overwritecondaddr'] = null;
}
$trustedProxies = getenv('TRUSTED_PROXIES');
if ($trustedProxies) {
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
} else {
$CONFIG['trusted_proxies'] = null;
}