aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-03-15 19:05:09 +01:00
Code Activity

Add trusted proxies configuration by env var

Browse source 
Solves #800 for external proxy

Signed-off-by: Armin Friedl <dev@friedl.net>
This commit is contained in:
Armin Friedl 2019-11-04 16:05:00 +01:00
parent ec394822aa
commit 80ab393998
No known key found for this signature in database
GPG key ID: 48C726EEE7FBCBC8
19 changed files with 171 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
15.0-rc/apache/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
15.0-rc/fpm-alpine/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
15.0-rc/fpm/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
15.0/apache/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
15.0/fpm-alpine/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
15.0/fpm/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
16.0-rc/apache/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
16.0-rc/fpm-alpine/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
16.0-rc/fpm/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
16.0/apache/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
16.0/fpm-alpine/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
16.0/fpm/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
17.0-rc/apache/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
17.0-rc/fpm-alpine/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
17.0-rc/fpm/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
17.0/apache/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
17.0/fpm-alpine/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
17.0/fpm/entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi

9
docker-entrypoint.sh
View file

@ -125,6 +125,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
done done
fi fi
if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then
echo "setting trusted proxies…"
NC_TRUSTED_PROXIES_IDX=1
for PROXY in $NEXTCLOUD_TRUSTED_PROXIES ; do
PROXY=$(echo "$PROXY" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
run_as "php /var/www/html/occ config:system:set trusted_proxies $NC_TRUSTED_PROXIES_IDX --value=$PROXY"
NC_TRUSTED_PROXIES_IDX=$(($NC_TRUSTED_PROXIES_IDX+1))
done
fi
else else
echo "running web-based installer on first connect!" echo "running web-based installer on first connect!"
fi fi