aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-04-25 04:40:55 +02:00
Code Activity

Expose reverse proxy related configuration as environment variables (#1048)

Browse source 
* Expose reverse proxy related configuration as environment variables

Signed-off-by: András Maróy <andras@maroy.hu>

* Update README.md

Co-Authored-By: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: András Maróy <andras@maroy.hu>

* Update README.md

Co-Authored-By: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: András Maróy <andras@maroy.hu>

* Add default values for reverse proxy config from environment

Signed-off-by: András Maróy <andras@maroy.hu>

* Change reverse proxy default values to null

Signed-off-by: András Maróy <andras@maroy.hu>

* Store environment variables in vars in reverse-proxy config

Signed-off-by: András Maróy <andras@maroy.hu>

* Merge reverse proxy configs

Signed-off-by: András Maróy <andras@maroy.hu>

* Move overwrite parameters to reverse proxy section in the readme

Signed-off-by: András Maróy <andras@maroy.hu>

* Add reverse proxy config to 19.0-beta images

Signed-off-by: András Maróy <andras@maroy.hu>

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

Signed-off-by: András Maróy <andras@maroy.hu>

Co-authored-by: J0WI <J0WI@users.noreply.github.com>
This commit is contained in:
András Maróy 2020-04-16 17:54:48 +02:00 • committed by GitHub
parent 815298f5de
commit 6d2390726f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 338 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

25
17.0/fpm/config/reverse-proxy.config.php Normal file
View file

@ -0,0 +1,25 @@
<?php
$overwriteHost = getenv('OVERWRITEHOST');
if ($overwriteHost) {
$CONFIG['overwritehost'] = $overwriteHost;
}
$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
if ($overwriteProtocol) {
$CONFIG['overwriteprotocol'] = $overwriteProtocol;
}
$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
if ($overwriteWebRoot) {
$CONFIG['overwritewebroot'] = $overwriteWebRoot;
}
$overwriteCondAddr = getenv('OVERWRITECONDADDR');
if ($overwriteCondAddr) {
$CONFIG['overwritecondaddr'] = $overwriteCondAddr;
}
$trustedProxies = getenv('TRUSTED_PROXIES');
if ($trustedProxies) {
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
}

11
17.0/fpm/config/reverse_proxy.config.php
View file

@ -1,11 +0,0 @@
<?php
$trustedProxies = getenv('TRUSTED_PROXIES');
if ($trustedProxies) {
$trustedProxies = array_filter(array_map('trim', explode(' ', $trustedProxies)));
} else {
$trustedProxies = null;
}
$CONFIG['trusted_proxies'] = $trustedProxies;