diff --git a/15.0/apache/entrypoint.sh b/15.0/apache/entrypoint.sh index 9514d881f..35d6887e7 100755 --- a/15.0/apache/entrypoint.sh +++ b/15.0/apache/entrypoint.sh @@ -116,15 +116,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "installing of nextcloud failed!" exit 1 fi - if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then - echo "setting trusted domains…" - NC_TRUSTED_DOMAIN_IDX=1 - for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do - DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') - run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) - done - fi else echo "running web-based installer on first connect!" fi @@ -142,4 +133,40 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi fi +#settings in config.php: +if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then + echo "setting trusted domains…" + NC_TRUSTED_DOMAIN_IDX=1 + for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do + DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') + run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" + NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then + echo "setting trusted proxies…" + NC_TRUSTED_PROXY_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_PROXY_IDX --value=$PROXY" + NC_TRUSTED_PROXY_IDX=$(($NC_TRUSTED_PROXY_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_OVERWRITEPROTOCOL+x}" ]; then + echo "setting overwriteprotocol" + run_as "php /var/www/html/occ config:system:set overwriteprotocol --value=$NEXTCLOUD_OVERWRITEPROTOCOL" +fi +if [ -n "${NEXTCLOUD_OVERWRITEHOST+x}" ]; then + echo "setting overwritehost" + run_as "php /var/www/html/occ config:system:set overwritehost --value=$NEXTCLOUD_OVERWRITEHOST" +fi +if [ -n "${NEXTCLOUD_OVERWRITEWEBROOT+x}" ]; then + echo "setting overwritewebroot…" + run_as "php /var/www/html/occ config:system:set overwritewebroot --value=$NEXTCLOUD_OVERWRITEWEBROOT" +fi +if [ -n "${NEXTCLOUD_OVERWRITE_CLI_URL+x}" ]; then + echo "setting overwrite.cli.url" + run_as "php /var/www/html/occ config:system:set overwrite.cli.url --value=$NEXTCLOUD_OVERWRITE_CLI_URL" +fi + exec "$@" diff --git a/15.0/fpm-alpine/entrypoint.sh b/15.0/fpm-alpine/entrypoint.sh index 9514d881f..35d6887e7 100755 --- a/15.0/fpm-alpine/entrypoint.sh +++ b/15.0/fpm-alpine/entrypoint.sh @@ -116,15 +116,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "installing of nextcloud failed!" exit 1 fi - if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then - echo "setting trusted domains…" - NC_TRUSTED_DOMAIN_IDX=1 - for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do - DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') - run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) - done - fi else echo "running web-based installer on first connect!" fi @@ -142,4 +133,40 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi fi +#settings in config.php: +if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then + echo "setting trusted domains…" + NC_TRUSTED_DOMAIN_IDX=1 + for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do + DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') + run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" + NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then + echo "setting trusted proxies…" + NC_TRUSTED_PROXY_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_PROXY_IDX --value=$PROXY" + NC_TRUSTED_PROXY_IDX=$(($NC_TRUSTED_PROXY_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_OVERWRITEPROTOCOL+x}" ]; then + echo "setting overwriteprotocol" + run_as "php /var/www/html/occ config:system:set overwriteprotocol --value=$NEXTCLOUD_OVERWRITEPROTOCOL" +fi +if [ -n "${NEXTCLOUD_OVERWRITEHOST+x}" ]; then + echo "setting overwritehost" + run_as "php /var/www/html/occ config:system:set overwritehost --value=$NEXTCLOUD_OVERWRITEHOST" +fi +if [ -n "${NEXTCLOUD_OVERWRITEWEBROOT+x}" ]; then + echo "setting overwritewebroot…" + run_as "php /var/www/html/occ config:system:set overwritewebroot --value=$NEXTCLOUD_OVERWRITEWEBROOT" +fi +if [ -n "${NEXTCLOUD_OVERWRITE_CLI_URL+x}" ]; then + echo "setting overwrite.cli.url" + run_as "php /var/www/html/occ config:system:set overwrite.cli.url --value=$NEXTCLOUD_OVERWRITE_CLI_URL" +fi + exec "$@" diff --git a/15.0/fpm/entrypoint.sh b/15.0/fpm/entrypoint.sh index 9514d881f..35d6887e7 100755 --- a/15.0/fpm/entrypoint.sh +++ b/15.0/fpm/entrypoint.sh @@ -116,15 +116,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "installing of nextcloud failed!" exit 1 fi - if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then - echo "setting trusted domains…" - NC_TRUSTED_DOMAIN_IDX=1 - for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do - DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') - run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) - done - fi else echo "running web-based installer on first connect!" fi @@ -142,4 +133,40 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi fi +#settings in config.php: +if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then + echo "setting trusted domains…" + NC_TRUSTED_DOMAIN_IDX=1 + for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do + DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') + run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" + NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then + echo "setting trusted proxies…" + NC_TRUSTED_PROXY_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_PROXY_IDX --value=$PROXY" + NC_TRUSTED_PROXY_IDX=$(($NC_TRUSTED_PROXY_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_OVERWRITEPROTOCOL+x}" ]; then + echo "setting overwriteprotocol" + run_as "php /var/www/html/occ config:system:set overwriteprotocol --value=$NEXTCLOUD_OVERWRITEPROTOCOL" +fi +if [ -n "${NEXTCLOUD_OVERWRITEHOST+x}" ]; then + echo "setting overwritehost" + run_as "php /var/www/html/occ config:system:set overwritehost --value=$NEXTCLOUD_OVERWRITEHOST" +fi +if [ -n "${NEXTCLOUD_OVERWRITEWEBROOT+x}" ]; then + echo "setting overwritewebroot…" + run_as "php /var/www/html/occ config:system:set overwritewebroot --value=$NEXTCLOUD_OVERWRITEWEBROOT" +fi +if [ -n "${NEXTCLOUD_OVERWRITE_CLI_URL+x}" ]; then + echo "setting overwrite.cli.url" + run_as "php /var/www/html/occ config:system:set overwrite.cli.url --value=$NEXTCLOUD_OVERWRITE_CLI_URL" +fi + exec "$@" diff --git a/16.0/apache/entrypoint.sh b/16.0/apache/entrypoint.sh index 9514d881f..35d6887e7 100755 --- a/16.0/apache/entrypoint.sh +++ b/16.0/apache/entrypoint.sh @@ -116,15 +116,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "installing of nextcloud failed!" exit 1 fi - if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then - echo "setting trusted domains…" - NC_TRUSTED_DOMAIN_IDX=1 - for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do - DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') - run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) - done - fi else echo "running web-based installer on first connect!" fi @@ -142,4 +133,40 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi fi +#settings in config.php: +if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then + echo "setting trusted domains…" + NC_TRUSTED_DOMAIN_IDX=1 + for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do + DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') + run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" + NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then + echo "setting trusted proxies…" + NC_TRUSTED_PROXY_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_PROXY_IDX --value=$PROXY" + NC_TRUSTED_PROXY_IDX=$(($NC_TRUSTED_PROXY_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_OVERWRITEPROTOCOL+x}" ]; then + echo "setting overwriteprotocol" + run_as "php /var/www/html/occ config:system:set overwriteprotocol --value=$NEXTCLOUD_OVERWRITEPROTOCOL" +fi +if [ -n "${NEXTCLOUD_OVERWRITEHOST+x}" ]; then + echo "setting overwritehost" + run_as "php /var/www/html/occ config:system:set overwritehost --value=$NEXTCLOUD_OVERWRITEHOST" +fi +if [ -n "${NEXTCLOUD_OVERWRITEWEBROOT+x}" ]; then + echo "setting overwritewebroot…" + run_as "php /var/www/html/occ config:system:set overwritewebroot --value=$NEXTCLOUD_OVERWRITEWEBROOT" +fi +if [ -n "${NEXTCLOUD_OVERWRITE_CLI_URL+x}" ]; then + echo "setting overwrite.cli.url" + run_as "php /var/www/html/occ config:system:set overwrite.cli.url --value=$NEXTCLOUD_OVERWRITE_CLI_URL" +fi + exec "$@" diff --git a/16.0/fpm-alpine/entrypoint.sh b/16.0/fpm-alpine/entrypoint.sh index 9514d881f..35d6887e7 100755 --- a/16.0/fpm-alpine/entrypoint.sh +++ b/16.0/fpm-alpine/entrypoint.sh @@ -116,15 +116,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "installing of nextcloud failed!" exit 1 fi - if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then - echo "setting trusted domains…" - NC_TRUSTED_DOMAIN_IDX=1 - for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do - DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') - run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) - done - fi else echo "running web-based installer on first connect!" fi @@ -142,4 +133,40 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi fi +#settings in config.php: +if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then + echo "setting trusted domains…" + NC_TRUSTED_DOMAIN_IDX=1 + for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do + DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') + run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" + NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then + echo "setting trusted proxies…" + NC_TRUSTED_PROXY_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_PROXY_IDX --value=$PROXY" + NC_TRUSTED_PROXY_IDX=$(($NC_TRUSTED_PROXY_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_OVERWRITEPROTOCOL+x}" ]; then + echo "setting overwriteprotocol" + run_as "php /var/www/html/occ config:system:set overwriteprotocol --value=$NEXTCLOUD_OVERWRITEPROTOCOL" +fi +if [ -n "${NEXTCLOUD_OVERWRITEHOST+x}" ]; then + echo "setting overwritehost" + run_as "php /var/www/html/occ config:system:set overwritehost --value=$NEXTCLOUD_OVERWRITEHOST" +fi +if [ -n "${NEXTCLOUD_OVERWRITEWEBROOT+x}" ]; then + echo "setting overwritewebroot…" + run_as "php /var/www/html/occ config:system:set overwritewebroot --value=$NEXTCLOUD_OVERWRITEWEBROOT" +fi +if [ -n "${NEXTCLOUD_OVERWRITE_CLI_URL+x}" ]; then + echo "setting overwrite.cli.url" + run_as "php /var/www/html/occ config:system:set overwrite.cli.url --value=$NEXTCLOUD_OVERWRITE_CLI_URL" +fi + exec "$@" diff --git a/16.0/fpm/entrypoint.sh b/16.0/fpm/entrypoint.sh index 9514d881f..35d6887e7 100755 --- a/16.0/fpm/entrypoint.sh +++ b/16.0/fpm/entrypoint.sh @@ -116,15 +116,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "installing of nextcloud failed!" exit 1 fi - if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then - echo "setting trusted domains…" - NC_TRUSTED_DOMAIN_IDX=1 - for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do - DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') - run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) - done - fi else echo "running web-based installer on first connect!" fi @@ -142,4 +133,40 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi fi +#settings in config.php: +if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then + echo "setting trusted domains…" + NC_TRUSTED_DOMAIN_IDX=1 + for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do + DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') + run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" + NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then + echo "setting trusted proxies…" + NC_TRUSTED_PROXY_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_PROXY_IDX --value=$PROXY" + NC_TRUSTED_PROXY_IDX=$(($NC_TRUSTED_PROXY_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_OVERWRITEPROTOCOL+x}" ]; then + echo "setting overwriteprotocol" + run_as "php /var/www/html/occ config:system:set overwriteprotocol --value=$NEXTCLOUD_OVERWRITEPROTOCOL" +fi +if [ -n "${NEXTCLOUD_OVERWRITEHOST+x}" ]; then + echo "setting overwritehost" + run_as "php /var/www/html/occ config:system:set overwritehost --value=$NEXTCLOUD_OVERWRITEHOST" +fi +if [ -n "${NEXTCLOUD_OVERWRITEWEBROOT+x}" ]; then + echo "setting overwritewebroot…" + run_as "php /var/www/html/occ config:system:set overwritewebroot --value=$NEXTCLOUD_OVERWRITEWEBROOT" +fi +if [ -n "${NEXTCLOUD_OVERWRITE_CLI_URL+x}" ]; then + echo "setting overwrite.cli.url" + run_as "php /var/www/html/occ config:system:set overwrite.cli.url --value=$NEXTCLOUD_OVERWRITE_CLI_URL" +fi + exec "$@" diff --git a/17.0/apache/entrypoint.sh b/17.0/apache/entrypoint.sh index 9514d881f..35d6887e7 100755 --- a/17.0/apache/entrypoint.sh +++ b/17.0/apache/entrypoint.sh @@ -116,15 +116,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "installing of nextcloud failed!" exit 1 fi - if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then - echo "setting trusted domains…" - NC_TRUSTED_DOMAIN_IDX=1 - for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do - DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') - run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) - done - fi else echo "running web-based installer on first connect!" fi @@ -142,4 +133,40 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi fi +#settings in config.php: +if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then + echo "setting trusted domains…" + NC_TRUSTED_DOMAIN_IDX=1 + for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do + DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') + run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" + NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then + echo "setting trusted proxies…" + NC_TRUSTED_PROXY_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_PROXY_IDX --value=$PROXY" + NC_TRUSTED_PROXY_IDX=$(($NC_TRUSTED_PROXY_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_OVERWRITEPROTOCOL+x}" ]; then + echo "setting overwriteprotocol" + run_as "php /var/www/html/occ config:system:set overwriteprotocol --value=$NEXTCLOUD_OVERWRITEPROTOCOL" +fi +if [ -n "${NEXTCLOUD_OVERWRITEHOST+x}" ]; then + echo "setting overwritehost" + run_as "php /var/www/html/occ config:system:set overwritehost --value=$NEXTCLOUD_OVERWRITEHOST" +fi +if [ -n "${NEXTCLOUD_OVERWRITEWEBROOT+x}" ]; then + echo "setting overwritewebroot…" + run_as "php /var/www/html/occ config:system:set overwritewebroot --value=$NEXTCLOUD_OVERWRITEWEBROOT" +fi +if [ -n "${NEXTCLOUD_OVERWRITE_CLI_URL+x}" ]; then + echo "setting overwrite.cli.url" + run_as "php /var/www/html/occ config:system:set overwrite.cli.url --value=$NEXTCLOUD_OVERWRITE_CLI_URL" +fi + exec "$@" diff --git a/17.0/fpm-alpine/entrypoint.sh b/17.0/fpm-alpine/entrypoint.sh index 9514d881f..35d6887e7 100755 --- a/17.0/fpm-alpine/entrypoint.sh +++ b/17.0/fpm-alpine/entrypoint.sh @@ -116,15 +116,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "installing of nextcloud failed!" exit 1 fi - if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then - echo "setting trusted domains…" - NC_TRUSTED_DOMAIN_IDX=1 - for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do - DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') - run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) - done - fi else echo "running web-based installer on first connect!" fi @@ -142,4 +133,40 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi fi +#settings in config.php: +if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then + echo "setting trusted domains…" + NC_TRUSTED_DOMAIN_IDX=1 + for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do + DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') + run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" + NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then + echo "setting trusted proxies…" + NC_TRUSTED_PROXY_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_PROXY_IDX --value=$PROXY" + NC_TRUSTED_PROXY_IDX=$(($NC_TRUSTED_PROXY_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_OVERWRITEPROTOCOL+x}" ]; then + echo "setting overwriteprotocol" + run_as "php /var/www/html/occ config:system:set overwriteprotocol --value=$NEXTCLOUD_OVERWRITEPROTOCOL" +fi +if [ -n "${NEXTCLOUD_OVERWRITEHOST+x}" ]; then + echo "setting overwritehost" + run_as "php /var/www/html/occ config:system:set overwritehost --value=$NEXTCLOUD_OVERWRITEHOST" +fi +if [ -n "${NEXTCLOUD_OVERWRITEWEBROOT+x}" ]; then + echo "setting overwritewebroot…" + run_as "php /var/www/html/occ config:system:set overwritewebroot --value=$NEXTCLOUD_OVERWRITEWEBROOT" +fi +if [ -n "${NEXTCLOUD_OVERWRITE_CLI_URL+x}" ]; then + echo "setting overwrite.cli.url" + run_as "php /var/www/html/occ config:system:set overwrite.cli.url --value=$NEXTCLOUD_OVERWRITE_CLI_URL" +fi + exec "$@" diff --git a/17.0/fpm/entrypoint.sh b/17.0/fpm/entrypoint.sh index 9514d881f..35d6887e7 100755 --- a/17.0/fpm/entrypoint.sh +++ b/17.0/fpm/entrypoint.sh @@ -116,15 +116,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "installing of nextcloud failed!" exit 1 fi - if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then - echo "setting trusted domains…" - NC_TRUSTED_DOMAIN_IDX=1 - for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do - DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') - run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) - done - fi else echo "running web-based installer on first connect!" fi @@ -142,4 +133,40 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi fi +#settings in config.php: +if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then + echo "setting trusted domains…" + NC_TRUSTED_DOMAIN_IDX=1 + for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do + DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') + run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" + NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then + echo "setting trusted proxies…" + NC_TRUSTED_PROXY_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_PROXY_IDX --value=$PROXY" + NC_TRUSTED_PROXY_IDX=$(($NC_TRUSTED_PROXY_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_OVERWRITEPROTOCOL+x}" ]; then + echo "setting overwriteprotocol" + run_as "php /var/www/html/occ config:system:set overwriteprotocol --value=$NEXTCLOUD_OVERWRITEPROTOCOL" +fi +if [ -n "${NEXTCLOUD_OVERWRITEHOST+x}" ]; then + echo "setting overwritehost" + run_as "php /var/www/html/occ config:system:set overwritehost --value=$NEXTCLOUD_OVERWRITEHOST" +fi +if [ -n "${NEXTCLOUD_OVERWRITEWEBROOT+x}" ]; then + echo "setting overwritewebroot…" + run_as "php /var/www/html/occ config:system:set overwritewebroot --value=$NEXTCLOUD_OVERWRITEWEBROOT" +fi +if [ -n "${NEXTCLOUD_OVERWRITE_CLI_URL+x}" ]; then + echo "setting overwrite.cli.url" + run_as "php /var/www/html/occ config:system:set overwrite.cli.url --value=$NEXTCLOUD_OVERWRITE_CLI_URL" +fi + exec "$@" diff --git a/README.md b/README.md index 68f92833c..e89e7e76d 100644 --- a/README.md +++ b/README.md @@ -133,6 +133,13 @@ One or more trusted domains can be set through environment variable, too. They w - `NEXTCLOUD_TRUSTED_DOMAINS` (not set by default) Optional space-separated list of domains +Reverse proxy configuration according to [Admin Manual](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/reverse_proxy_configuration.html) can be achieved using: +- `NEXTCLOUD_TRUSTED_PROXIES` (not set by default) Optional space-separated list of trusted_proxies (e.g. 172.0.0.0/24) +- `NEXTCLOUD_OVERWRITEPROTOCOL` (not set by default) Optional overwriteprotocol (e.g. https) +- `NEXTCLOUD_OVERWRITEHOST` (not set by default) Optional overwritehost (e.g. nextcloud.examle.com) +- `NEXTCLOUD_OVERWRITEWEBROOT` (not set by default) Optional overwritewebroot (e.g. /cloud) +- `NEXTCLOUD_OVERWRITE_CLI_URL` (not set by default) Optional overwrite.cli.url (e.g. https://example.com/cloud) + The install and update script is only triggered when a default command is used (`apache-foreground` or `php-fpm`). If you use a custom command you have to enable the install / update with - `NEXTCLOUD_UPDATE` (default: _0_) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 9514d881f..35d6887e7 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -116,15 +116,6 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "installing of nextcloud failed!" exit 1 fi - if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then - echo "setting trusted domains…" - NC_TRUSTED_DOMAIN_IDX=1 - for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do - DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') - run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) - done - fi else echo "running web-based installer on first connect!" fi @@ -142,4 +133,40 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi fi +#settings in config.php: +if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then + echo "setting trusted domains…" + NC_TRUSTED_DOMAIN_IDX=1 + for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do + DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') + run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" + NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_TRUSTED_PROXIES+x}" ]; then + echo "setting trusted proxies…" + NC_TRUSTED_PROXY_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_PROXY_IDX --value=$PROXY" + NC_TRUSTED_PROXY_IDX=$(($NC_TRUSTED_PROXY_IDX+1)) + done +fi +if [ -n "${NEXTCLOUD_OVERWRITEPROTOCOL+x}" ]; then + echo "setting overwriteprotocol" + run_as "php /var/www/html/occ config:system:set overwriteprotocol --value=$NEXTCLOUD_OVERWRITEPROTOCOL" +fi +if [ -n "${NEXTCLOUD_OVERWRITEHOST+x}" ]; then + echo "setting overwritehost" + run_as "php /var/www/html/occ config:system:set overwritehost --value=$NEXTCLOUD_OVERWRITEHOST" +fi +if [ -n "${NEXTCLOUD_OVERWRITEWEBROOT+x}" ]; then + echo "setting overwritewebroot…" + run_as "php /var/www/html/occ config:system:set overwritewebroot --value=$NEXTCLOUD_OVERWRITEWEBROOT" +fi +if [ -n "${NEXTCLOUD_OVERWRITE_CLI_URL+x}" ]; then + echo "setting overwrite.cli.url" + run_as "php /var/www/html/occ config:system:set overwrite.cli.url --value=$NEXTCLOUD_OVERWRITE_CLI_URL" +fi + exec "$@"