summaryrefslogtreecommitdiffstats
path: root/16.0
diff options
context:
space:
mode:
authorkesselb <mail@danielkesselberg.de>2020-04-06 22:44:58 +0200
committerGitHub <noreply@github.com>2020-04-06 20:44:58 +0000
commit63438ef792fdedd4ceb80664d22391aca21f6bd1 (patch)
tree8de06ae7850d3d7a45c38cc8fdec4ac83e69407f /16.0
parentefe3caebdcd0cf23553aedd8d0f56cea4a5053fa (diff)
Disable rewriteip for apache image (#1010)
* Disable rewrite ip for apache image Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de> * Run update.sh Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to '16.0')
-rw-r--r--16.0/apache/config/reverse_proxy.config.php11
-rwxr-xr-x16.0/apache/entrypoint.sh6
-rw-r--r--16.0/fpm-alpine/config/reverse_proxy.config.php11
-rwxr-xr-x16.0/fpm-alpine/entrypoint.sh6
-rw-r--r--16.0/fpm/config/reverse_proxy.config.php11
-rwxr-xr-x16.0/fpm/entrypoint.sh6
6 files changed, 51 insertions, 0 deletions
diff --git a/16.0/apache/config/reverse_proxy.config.php b/16.0/apache/config/reverse_proxy.config.php
new file mode 100644
index 00000000..26a8bff3
--- /dev/null
+++ b/16.0/apache/config/reverse_proxy.config.php
@@ -0,0 +1,11 @@
+<?php
+
+$trustedProxies = getenv('TRUSTED_PROXIES');
+
+if ($trustedProxies) {
+ $trustedProxies = array_filter(array_map('trim', explode(' ', $trustedProxies)));
+} else {
+ $trustedProxies = null;
+}
+
+$CONFIG['trusted_proxies'] = $trustedProxies; \ No newline at end of file
diff --git a/16.0/apache/entrypoint.sh b/16.0/apache/entrypoint.sh
index 2510743e..07b44d61 100755
--- a/16.0/apache/entrypoint.sh
+++ b/16.0/apache/entrypoint.sh
@@ -43,6 +43,12 @@ file_env() {
unset "$fileVar"
}
+if expr "$1" : "apache" 1>/dev/null; then
+ if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
+ a2disconf remoteip
+ fi
+fi
+
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
if [ -n "${REDIS_HOST+x}" ]; then
diff --git a/16.0/fpm-alpine/config/reverse_proxy.config.php b/16.0/fpm-alpine/config/reverse_proxy.config.php
new file mode 100644
index 00000000..26a8bff3
--- /dev/null
+++ b/16.0/fpm-alpine/config/reverse_proxy.config.php
@@ -0,0 +1,11 @@
+<?php
+
+$trustedProxies = getenv('TRUSTED_PROXIES');
+
+if ($trustedProxies) {
+ $trustedProxies = array_filter(array_map('trim', explode(' ', $trustedProxies)));
+} else {
+ $trustedProxies = null;
+}
+
+$CONFIG['trusted_proxies'] = $trustedProxies; \ No newline at end of file
diff --git a/16.0/fpm-alpine/entrypoint.sh b/16.0/fpm-alpine/entrypoint.sh
index 2510743e..07b44d61 100755
--- a/16.0/fpm-alpine/entrypoint.sh
+++ b/16.0/fpm-alpine/entrypoint.sh
@@ -43,6 +43,12 @@ file_env() {
unset "$fileVar"
}
+if expr "$1" : "apache" 1>/dev/null; then
+ if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
+ a2disconf remoteip
+ fi
+fi
+
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
if [ -n "${REDIS_HOST+x}" ]; then
diff --git a/16.0/fpm/config/reverse_proxy.config.php b/16.0/fpm/config/reverse_proxy.config.php
new file mode 100644
index 00000000..26a8bff3
--- /dev/null
+++ b/16.0/fpm/config/reverse_proxy.config.php
@@ -0,0 +1,11 @@
+<?php
+
+$trustedProxies = getenv('TRUSTED_PROXIES');
+
+if ($trustedProxies) {
+ $trustedProxies = array_filter(array_map('trim', explode(' ', $trustedProxies)));
+} else {
+ $trustedProxies = null;
+}
+
+$CONFIG['trusted_proxies'] = $trustedProxies; \ No newline at end of file
diff --git a/16.0/fpm/entrypoint.sh b/16.0/fpm/entrypoint.sh
index 2510743e..07b44d61 100755
--- a/16.0/fpm/entrypoint.sh
+++ b/16.0/fpm/entrypoint.sh
@@ -43,6 +43,12 @@ file_env() {
unset "$fileVar"
}
+if expr "$1" : "apache" 1>/dev/null; then
+ if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
+ a2disconf remoteip
+ fi
+fi
+
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
if [ -n "${REDIS_HOST+x}" ]; then