eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 06:26:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

move trusted_proxies to entrypoint

Browse source 
Signed-off-by: szaimen <szaimen@e.mail.de>
This commit is contained in:
szaimen 2022-02-22 13:26:48 +01:00
parent 11edcfe142
commit e955b0a96f
3 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Containers/nextcloud/config/reverse-proxy.config.php
View file

@ -18,8 +18,3 @@ $overwriteCondAddr = getenv('OVERWRITECONDADDR');
if ($overwriteCondAddr) { if ($overwriteCondAddr) {
$CONFIG['overwritecondaddr'] = $overwriteCondAddr; $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
} }
$trustedProxies = getenv('TRUSTED_PROXIES');
if ($trustedProxies) {
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
}

1
Containers/nextcloud/entrypoint.sh
View file

@ -250,6 +250,7 @@ elif [ "$(php /var/www/html/occ config:app:get notify_push enabled)" = "no" ]; t
else else
php /var/www/html/occ app:update notify_push php /var/www/html/occ app:update notify_push
fi fi
php /var/www/html/occ config:system:set trusted_proxies 0 --value="127.0.0.1"
php /var/www/html/occ config:app:set notify_push base_endpoint --value="https://$NC_DOMAIN/push" php /var/www/html/occ config:app:set notify_push base_endpoint --value="https://$NC_DOMAIN/push"
# Collabora # Collabora

1
php/containers.json
View file

@ -114,7 +114,6 @@
"NEXTCLOUD_DATA_DIR=/mnt/ncdata", "NEXTCLOUD_DATA_DIR=/mnt/ncdata",
"OVERWRITEHOST=%NC_DOMAIN%", "OVERWRITEHOST=%NC_DOMAIN%",
"OVERWRITEPROTOCOL=https", "OVERWRITEPROTOCOL=https",
"TRUSTED_PROXIES=127.0.0.1",
"TURN_SECRET=%TURN_SECRET%", "TURN_SECRET=%TURN_SECRET%",
"SIGNALING_SECRET=%SIGNALING_SECRET%", "SIGNALING_SECRET=%SIGNALING_SECRET%",
"AIO_URL=%AIO_URL%" "AIO_URL=%AIO_URL%"