diff --git a/15.0/apache/entrypoint.sh b/15.0/apache/entrypoint.sh index 9514d881..2347f330 100755 --- a/15.0/apache/entrypoint.sh +++ b/15.0/apache/entrypoint.sh @@ -124,6 +124,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP 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_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 else echo "running web-based installer on first connect!" diff --git a/15.0/fpm-alpine/entrypoint.sh b/15.0/fpm-alpine/entrypoint.sh index 9514d881..2347f330 100755 --- a/15.0/fpm-alpine/entrypoint.sh +++ b/15.0/fpm-alpine/entrypoint.sh @@ -124,6 +124,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP 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_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 else echo "running web-based installer on first connect!" diff --git a/15.0/fpm/entrypoint.sh b/15.0/fpm/entrypoint.sh index 9514d881..2347f330 100755 --- a/15.0/fpm/entrypoint.sh +++ b/15.0/fpm/entrypoint.sh @@ -124,6 +124,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP 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_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 else echo "running web-based installer on first connect!" diff --git a/16.0/apache/entrypoint.sh b/16.0/apache/entrypoint.sh index 9514d881..2347f330 100755 --- a/16.0/apache/entrypoint.sh +++ b/16.0/apache/entrypoint.sh @@ -124,6 +124,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP 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_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 else echo "running web-based installer on first connect!" diff --git a/16.0/fpm-alpine/entrypoint.sh b/16.0/fpm-alpine/entrypoint.sh index 9514d881..2347f330 100755 --- a/16.0/fpm-alpine/entrypoint.sh +++ b/16.0/fpm-alpine/entrypoint.sh @@ -124,6 +124,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP 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_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 else echo "running web-based installer on first connect!" diff --git a/16.0/fpm/entrypoint.sh b/16.0/fpm/entrypoint.sh index 9514d881..2347f330 100755 --- a/16.0/fpm/entrypoint.sh +++ b/16.0/fpm/entrypoint.sh @@ -124,6 +124,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP 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_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 else echo "running web-based installer on first connect!" diff --git a/17.0/apache/entrypoint.sh b/17.0/apache/entrypoint.sh index 9514d881..2347f330 100755 --- a/17.0/apache/entrypoint.sh +++ b/17.0/apache/entrypoint.sh @@ -124,6 +124,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP 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_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 else echo "running web-based installer on first connect!" diff --git a/17.0/fpm-alpine/entrypoint.sh b/17.0/fpm-alpine/entrypoint.sh index 9514d881..2347f330 100755 --- a/17.0/fpm-alpine/entrypoint.sh +++ b/17.0/fpm-alpine/entrypoint.sh @@ -124,6 +124,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP 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_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 else echo "running web-based installer on first connect!" diff --git a/17.0/fpm/entrypoint.sh b/17.0/fpm/entrypoint.sh index 9514d881..2347f330 100755 --- a/17.0/fpm/entrypoint.sh +++ b/17.0/fpm/entrypoint.sh @@ -124,6 +124,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP 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_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 else echo "running web-based installer on first connect!" diff --git a/README.md b/README.md index 68f92833..e935c300 100644 --- a/README.md +++ b/README.md @@ -133,6 +133,11 @@ 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/13/admin_manual/configuration_server/reverse_proxy_configuration.html) can be achieved using: +- `NEXTCLOUD_OVERWRITEPROTOCOL` (not set by default) Optional overwrite protocol (e.g. https) +- `NEXTCLOUD_OVERWRITEHOST` (not set by default) Optional overwrite host (e.g. nextcloud.examle.com) +- `NEXTCLOUD_OVERWRITEWEBROOT` (not set by default) Optional overwrite webroot (e.g. /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 9514d881..2347f330 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -124,6 +124,18 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP 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_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 else echo "running web-based installer on first connect!"