From 13977c4c5c5a095ab943068bb798255aa08ca0ce Mon Sep 17 00:00:00 2001 From: naramski Date: Fri, 26 Oct 2018 19:44:49 +0200 Subject: [PATCH] Add two parameters when Nextcloud is behind a proxy --- 14.0/apache/entrypoint.sh | 10 ++++++++++ 14.0/fpm-alpine/entrypoint.sh | 10 ++++++++++ 14.0/fpm/entrypoint.sh | 10 ++++++++++ README.md | 5 +++++ 4 files changed, 35 insertions(+) diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/entrypoint.sh index 045227e8..cf9ffbf7 100755 --- a/14.0/apache/entrypoint.sh +++ b/14.0/apache/entrypoint.sh @@ -127,6 +127,16 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi 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_OVERWRITEPROTOCOL+x}" ]; then + echo "setting overwriteprotocol…" + run_as "php /var/www/html/occ config:system:set overwriteprotocol --value=$NEXTCLOUD_OVERWRITEPROTOCOL" + fi + fi exec "$@" diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh index 045227e8..cf9ffbf7 100755 --- a/14.0/fpm-alpine/entrypoint.sh +++ b/14.0/fpm-alpine/entrypoint.sh @@ -127,6 +127,16 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi 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_OVERWRITEPROTOCOL+x}" ]; then + echo "setting overwriteprotocol…" + run_as "php /var/www/html/occ config:system:set overwriteprotocol --value=$NEXTCLOUD_OVERWRITEPROTOCOL" + fi + fi exec "$@" diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh index 045227e8..cf9ffbf7 100755 --- a/14.0/fpm/entrypoint.sh +++ b/14.0/fpm/entrypoint.sh @@ -127,6 +127,16 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP fi 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_OVERWRITEPROTOCOL+x}" ]; then + echo "setting overwriteprotocol…" + run_as "php /var/www/html/occ config:system:set overwriteprotocol --value=$NEXTCLOUD_OVERWRITEPROTOCOL" + fi + fi exec "$@" diff --git a/README.md b/README.md index 0d712c01..4dcab644 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,12 @@ The install and update script is only triggered when a default command is used ( - `NEXTCLOUD_UPDATE` (default: _0_) +If Nextcloud fails to automatically detect the hostname, protocol or webroot you can use the overwrite parameters inside the config/config.php. +- `NEXTCLOUD_OVERWRITEHOST` The overwritehost parameter is used to set the hostname of the proxy. You can also specify a port. +- `NEXTCLOUD_OVERWRITEPROTOCOL` The overwriteprotocol parameter is used to set the protocol of the proxy. You can choose between the two options http and https. + +These two parameters are available in v14.0+ # Running this image with docker-compose The easiest way to get a fully featured and functional setup is using a `docker-compose` file. There are too many different possibilities to setup your system, so here are only some examples what you have to look for.