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

Merge pull request #3181 from nextcloud/enh/2933/fix-trusted-proxies

Browse source 
fix notify-push trusted proxies
This commit is contained in:
Simon L 2023-08-17 12:06:00 +02:00 • committed by GitHub
commit 5bbec81ff8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Containers/apache/Dockerfile
View file

@ -30,6 +30,7 @@ RUN set -ex; \
tzdata \ tzdata \
ca-certificates \ ca-certificates \
openssl \ openssl \
bind-tools \
netcat-openbsd; \ netcat-openbsd; \
\ \
sed -i \ sed -i \

8
Containers/apache/start.sh
View file

@ -17,6 +17,12 @@ while ! nc -z "$NEXTCLOUD_HOST" 9000; do
sleep 5 sleep 5
done done
# Get ipv4-address of Apache
IPv4_ADDRESS="$(dig nextcloud-aio-apache A +short | head -1)"
# Bring it in CIDR notation
# shellcheck disable=SC2001
IPv4_ADDRESS="$(echo "$IPv4_ADDRESS" | sed 's|[0-9]\+$|1/32|')"
if [ -z "$APACHE_PORT" ]; then if [ -z "$APACHE_PORT" ]; then
export APACHE_PORT="443" export APACHE_PORT="443"
fi fi
@ -41,7 +47,7 @@ echo "$CADDYFILE" > /tmp/Caddyfile
if [ "$APACHE_PORT" != '443' ]; then if [ "$APACHE_PORT" != '443' ]; then
CADDYFILE="$(sed 's|# trusted_proxies placeholder|trusted_proxies static private_ranges|' /tmp/Caddyfile)" CADDYFILE="$(sed 's|# trusted_proxies placeholder|trusted_proxies static private_ranges|' /tmp/Caddyfile)"
else else
CADDYFILE="$(sed 's|trusted_proxies.*private_ranges|# trusted_proxies placeholder|' /tmp/Caddyfile)" CADDYFILE="$(sed "s|# trusted_proxies placeholder|trusted_proxies static $IPv4_ADDRESS|" /tmp/Caddyfile)"
fi fi
echo "$CADDYFILE" > /tmp/Caddyfile echo "$CADDYFILE" > /tmp/Caddyfile