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

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

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

1
Containers/apache/Caddyfile
View file

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

6
Containers/apache/start.sh
View file

@ -51,6 +51,12 @@ 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