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

Revert "helm chart - allow to add additional trusted domain"

Browse source
This commit is contained in:
Simon L 2024-02-01 13:23:33 +01:00 • committed by GitHub
parent 59d5f839b0
commit 533b8785b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 2 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Containers/apache/Caddyfile
View file

@ -14,7 +14,6 @@
}
}
https://{$ADDITIONAL_TRUSTED_DOMAIN}:443,
{$PROTOCOL}://{$NC_DOMAIN}:{$APACHE_PORT} {
# Collabora

6
Containers/apache/start.sh
View file

@ -51,12 +51,6 @@ else
fi
echo "$CADDYFILE" > /tmp/Caddyfile
# Remove additional domain if not given
if [ -z "$ADDITIONAL_TRUSTED_DOMAIN" ]; then
CADDYFILE="$(sed '/ADDITIONAL_TRUSTED_DOMAIN/d' /tmp/Caddyfile)"
fi
echo "$CADDYFILE" > /tmp/Caddyfile
# Fix the Caddyfile format
caddy fmt --overwrite /tmp/Caddyfile

3
Containers/nextcloud/entrypoint.sh
View file

@ -528,9 +528,6 @@ php /var/www/html/occ config:system:set trusted_proxies 1 --value="::1"
if [ -n "$ADDITIONAL_TRUSTED_PROXY" ]; then
php /var/www/html/occ config:system:set trusted_proxies 2 --value="$ADDITIONAL_TRUSTED_PROXY"
fi
if [ -n "$ADDITIONAL_TRUSTED_DOMAIN" ]; then
php /var/www/html/occ config:system:set trusted_domains 2 --value="$ADDITIONAL_TRUSTED_DOMAIN"
fi
php /var/www/html/occ config:app:set notify_push base_endpoint --value="https://$NC_DOMAIN/push"
# Collabora