From 8332672e4a965d30333f335c32dd4ec862f7a07a Mon Sep 17 00:00:00 2001
From: clickkiddie <clickkiddie@github.com>
Date: Fri, 26 Jul 2019 12:53:37 +0000
Subject: [PATCH 1/6] Added support for docker environment variables
 NEXTCLOUD_OVERWRITEPROTOCOL, NEXTCLOUD_OVERWRITEHOST,
 NEXTCLOUD_OVERWRITEWEBROOT

Signed-off-by: clickkiddie <clickkiddie@github.com>
Signed-off-by: clickkiddie <44850680+clickkiddie@users.noreply.github.com>
---
 15.0/apache/entrypoint.sh     | 12 ++++++++++++
 15.0/fpm-alpine/entrypoint.sh | 12 ++++++++++++
 15.0/fpm/entrypoint.sh        | 12 ++++++++++++
 16.0/apache/entrypoint.sh     | 12 ++++++++++++
 16.0/fpm-alpine/entrypoint.sh | 12 ++++++++++++
 16.0/fpm/entrypoint.sh        | 12 ++++++++++++
 17.0/apache/entrypoint.sh     | 12 ++++++++++++
 17.0/fpm-alpine/entrypoint.sh | 12 ++++++++++++
 17.0/fpm/entrypoint.sh        | 12 ++++++++++++
 README.md                     |  5 +++++
 docker-entrypoint.sh          | 12 ++++++++++++
 11 files changed, 125 insertions(+)

diff --git a/15.0/apache/entrypoint.sh b/15.0/apache/entrypoint.sh
index 9514d881f..2347f3304 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 9514d881f..2347f3304 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 9514d881f..2347f3304 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 9514d881f..2347f3304 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 9514d881f..2347f3304 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 9514d881f..2347f3304 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 9514d881f..2347f3304 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 9514d881f..2347f3304 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 9514d881f..2347f3304 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 68f92833c..e935c300a 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 9514d881f..2347f3304 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!"

From da8df4d0c038e46f3c21946b9649eaf73c2ad55f Mon Sep 17 00:00:00 2001
From: clickkiddie <clickkiddie@github.com>
Date: Fri, 26 Jul 2019 12:56:48 +0000
Subject: [PATCH 2/6] fixed typo in README.md

Signed-off-by: clickkiddie <clickkiddie@github.com>
Signed-off-by: clickkiddie <44850680+clickkiddie@users.noreply.github.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e935c300a..d572b76a7 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ 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:
+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)

From 8baa54f16a72bb7a111ae3daf018dea89953a0a0 Mon Sep 17 00:00:00 2001
From: clickkiddie <clickkiddie@github.com>
Date: Wed, 7 Aug 2019 18:34:07 +0000
Subject: [PATCH 3/6] -added trusted_proxies -enabled setting reverse proxy
 configuration after installatio

Signed-off-by: clickkiddie <clickkiddie@github.com>
Signed-off-by: clickkiddie <44850680+clickkiddie@users.noreply.github.com>
---
 15.0/apache/entrypoint.sh     | 53 +++++++++++++++++++++--------------
 15.0/fpm-alpine/entrypoint.sh | 53 +++++++++++++++++++++--------------
 15.0/fpm/entrypoint.sh        | 53 +++++++++++++++++++++--------------
 16.0/apache/entrypoint.sh     | 53 +++++++++++++++++++++--------------
 16.0/fpm-alpine/entrypoint.sh | 53 +++++++++++++++++++++--------------
 16.0/fpm/entrypoint.sh        | 53 +++++++++++++++++++++--------------
 17.0/apache/entrypoint.sh     | 53 +++++++++++++++++++++--------------
 17.0/fpm-alpine/entrypoint.sh | 53 +++++++++++++++++++++--------------
 17.0/fpm/entrypoint.sh        | 53 +++++++++++++++++++++--------------
 README.md                     |  7 +++--
 docker-entrypoint.sh          | 53 +++++++++++++++++++++--------------
 11 files changed, 324 insertions(+), 213 deletions(-)

diff --git a/15.0/apache/entrypoint.sh b/15.0/apache/entrypoint.sh
index 2347f3304..878369c27 100755
--- a/15.0/apache/entrypoint.sh
+++ b/15.0/apache/entrypoint.sh
@@ -116,27 +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
-					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!"
                 fi
@@ -154,4 +133,36 @@ 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
+
 exec "$@"
diff --git a/15.0/fpm-alpine/entrypoint.sh b/15.0/fpm-alpine/entrypoint.sh
index 2347f3304..878369c27 100755
--- a/15.0/fpm-alpine/entrypoint.sh
+++ b/15.0/fpm-alpine/entrypoint.sh
@@ -116,27 +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
-					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!"
                 fi
@@ -154,4 +133,36 @@ 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
+
 exec "$@"
diff --git a/15.0/fpm/entrypoint.sh b/15.0/fpm/entrypoint.sh
index 2347f3304..878369c27 100755
--- a/15.0/fpm/entrypoint.sh
+++ b/15.0/fpm/entrypoint.sh
@@ -116,27 +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
-					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!"
                 fi
@@ -154,4 +133,36 @@ 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
+
 exec "$@"
diff --git a/16.0/apache/entrypoint.sh b/16.0/apache/entrypoint.sh
index 2347f3304..878369c27 100755
--- a/16.0/apache/entrypoint.sh
+++ b/16.0/apache/entrypoint.sh
@@ -116,27 +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
-					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!"
                 fi
@@ -154,4 +133,36 @@ 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
+
 exec "$@"
diff --git a/16.0/fpm-alpine/entrypoint.sh b/16.0/fpm-alpine/entrypoint.sh
index 2347f3304..878369c27 100755
--- a/16.0/fpm-alpine/entrypoint.sh
+++ b/16.0/fpm-alpine/entrypoint.sh
@@ -116,27 +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
-					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!"
                 fi
@@ -154,4 +133,36 @@ 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
+
 exec "$@"
diff --git a/16.0/fpm/entrypoint.sh b/16.0/fpm/entrypoint.sh
index 2347f3304..878369c27 100755
--- a/16.0/fpm/entrypoint.sh
+++ b/16.0/fpm/entrypoint.sh
@@ -116,27 +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
-					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!"
                 fi
@@ -154,4 +133,36 @@ 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
+
 exec "$@"
diff --git a/17.0/apache/entrypoint.sh b/17.0/apache/entrypoint.sh
index 2347f3304..878369c27 100755
--- a/17.0/apache/entrypoint.sh
+++ b/17.0/apache/entrypoint.sh
@@ -116,27 +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
-					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!"
                 fi
@@ -154,4 +133,36 @@ 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
+
 exec "$@"
diff --git a/17.0/fpm-alpine/entrypoint.sh b/17.0/fpm-alpine/entrypoint.sh
index 2347f3304..878369c27 100755
--- a/17.0/fpm-alpine/entrypoint.sh
+++ b/17.0/fpm-alpine/entrypoint.sh
@@ -116,27 +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
-					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!"
                 fi
@@ -154,4 +133,36 @@ 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
+
 exec "$@"
diff --git a/17.0/fpm/entrypoint.sh b/17.0/fpm/entrypoint.sh
index 2347f3304..878369c27 100755
--- a/17.0/fpm/entrypoint.sh
+++ b/17.0/fpm/entrypoint.sh
@@ -116,27 +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
-					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!"
                 fi
@@ -154,4 +133,36 @@ 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
+
 exec "$@"
diff --git a/README.md b/README.md
index d572b76a7..94503b560 100644
--- a/README.md
+++ b/README.md
@@ -134,9 +134,10 @@ 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)
+- `NEXTCLOUD_TRUSTED_PROXIES` (not set by default) set 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)
 
 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
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 2347f3304..878369c27 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -116,27 +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
-					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!"
                 fi
@@ -154,4 +133,36 @@ 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
+
 exec "$@"

From b1134946ca8bbaceca20f6af1a2f150f17437bba Mon Sep 17 00:00:00 2001
From: clickkiddie <clickkiddie@github.com>
Date: Sun, 13 Oct 2019 11:04:43 +0000
Subject: [PATCH 4/6] added overwrite.cli.url

Signed-off-by: clickkiddie <clickkiddie@github.com>
Signed-off-by: clickkiddie <44850680+clickkiddie@users.noreply.github.com>
---
 15.0/apache/entrypoint.sh     | 4 ++++
 15.0/fpm-alpine/entrypoint.sh | 4 ++++
 15.0/fpm/entrypoint.sh        | 4 ++++
 16.0/apache/entrypoint.sh     | 4 ++++
 16.0/fpm-alpine/entrypoint.sh | 4 ++++
 16.0/fpm/entrypoint.sh        | 4 ++++
 17.0/apache/entrypoint.sh     | 4 ++++
 17.0/fpm-alpine/entrypoint.sh | 4 ++++
 17.0/fpm/entrypoint.sh        | 4 ++++
 README.md                     | 1 +
 docker-entrypoint.sh          | 4 ++++
 11 files changed, 41 insertions(+)

diff --git a/15.0/apache/entrypoint.sh b/15.0/apache/entrypoint.sh
index 878369c27..35d6887e7 100755
--- a/15.0/apache/entrypoint.sh
+++ b/15.0/apache/entrypoint.sh
@@ -164,5 +164,9 @@ 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 878369c27..35d6887e7 100755
--- a/15.0/fpm-alpine/entrypoint.sh
+++ b/15.0/fpm-alpine/entrypoint.sh
@@ -164,5 +164,9 @@ 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 878369c27..35d6887e7 100755
--- a/15.0/fpm/entrypoint.sh
+++ b/15.0/fpm/entrypoint.sh
@@ -164,5 +164,9 @@ 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 878369c27..35d6887e7 100755
--- a/16.0/apache/entrypoint.sh
+++ b/16.0/apache/entrypoint.sh
@@ -164,5 +164,9 @@ 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 878369c27..35d6887e7 100755
--- a/16.0/fpm-alpine/entrypoint.sh
+++ b/16.0/fpm-alpine/entrypoint.sh
@@ -164,5 +164,9 @@ 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 878369c27..35d6887e7 100755
--- a/16.0/fpm/entrypoint.sh
+++ b/16.0/fpm/entrypoint.sh
@@ -164,5 +164,9 @@ 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 878369c27..35d6887e7 100755
--- a/17.0/apache/entrypoint.sh
+++ b/17.0/apache/entrypoint.sh
@@ -164,5 +164,9 @@ 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 878369c27..35d6887e7 100755
--- a/17.0/fpm-alpine/entrypoint.sh
+++ b/17.0/fpm-alpine/entrypoint.sh
@@ -164,5 +164,9 @@ 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 878369c27..35d6887e7 100755
--- a/17.0/fpm/entrypoint.sh
+++ b/17.0/fpm/entrypoint.sh
@@ -164,5 +164,9 @@ 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 94503b560..132aa78e2 100644
--- a/README.md
+++ b/README.md
@@ -138,6 +138,7 @@ Reverse proxy configuration according to [Admin Manual](https://docs.nextcloud.c
 - `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
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 878369c27..35d6887e7 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -164,5 +164,9 @@ 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 "$@"

From 8824885556ae015803d0af8d363bd752249c2f71 Mon Sep 17 00:00:00 2001
From: clickkiddie <44850680+clickkiddie@users.noreply.github.com>
Date: Sun, 27 Oct 2019 20:51:59 +0100
Subject: [PATCH 5/6] Update README.md

Co-Authored-By: kesselb <mail@danielkesselberg.de>
Signed-off-by: clickkiddie <44850680+clickkiddie@users.noreply.github.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 132aa78e2..df981a0de 100644
--- a/README.md
+++ b/README.md
@@ -134,7 +134,7 @@ 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_TRUSTED_PROXIES` (not set by default) set trusted_proxies  (e.g. 172.0.0.0/24)
+- `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)

From 13acb4228db982287a0d5716a9cf8172d0ebd0a1 Mon Sep 17 00:00:00 2001
From: clickkiddie <44850680+clickkiddie@users.noreply.github.com>
Date: Sun, 27 Oct 2019 20:52:09 +0100
Subject: [PATCH 6/6] Update README.md

Co-Authored-By: kesselb <mail@danielkesselberg.de>
Signed-off-by: clickkiddie <44850680+clickkiddie@users.noreply.github.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index df981a0de..e89e7e76d 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ 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:
+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)