From 63438ef792fdedd4ceb80664d22391aca21f6bd1 Mon Sep 17 00:00:00 2001
From: kesselb <mail@danielkesselberg.de>
Date: Mon, 6 Apr 2020 22:44:58 +0200
Subject: 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>
---
 17.0/apache/config/reverse_proxy.config.php     | 11 +++++++++++
 17.0/apache/entrypoint.sh                       |  6 ++++++
 17.0/fpm-alpine/config/reverse_proxy.config.php | 11 +++++++++++
 17.0/fpm-alpine/entrypoint.sh                   |  6 ++++++
 17.0/fpm/config/reverse_proxy.config.php        | 11 +++++++++++
 17.0/fpm/entrypoint.sh                          |  6 ++++++
 6 files changed, 51 insertions(+)
 create mode 100644 17.0/apache/config/reverse_proxy.config.php
 create mode 100644 17.0/fpm-alpine/config/reverse_proxy.config.php
 create mode 100644 17.0/fpm/config/reverse_proxy.config.php

(limited to '17.0')

diff --git a/17.0/apache/config/reverse_proxy.config.php b/17.0/apache/config/reverse_proxy.config.php
new file mode 100644
index 00000000..26a8bff3
--- /dev/null
+++ b/17.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/17.0/apache/entrypoint.sh b/17.0/apache/entrypoint.sh
index 2510743e..07b44d61 100755
--- a/17.0/apache/entrypoint.sh
+++ b/17.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/17.0/fpm-alpine/config/reverse_proxy.config.php b/17.0/fpm-alpine/config/reverse_proxy.config.php
new file mode 100644
index 00000000..26a8bff3
--- /dev/null
+++ b/17.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/17.0/fpm-alpine/entrypoint.sh b/17.0/fpm-alpine/entrypoint.sh
index 2510743e..07b44d61 100755
--- a/17.0/fpm-alpine/entrypoint.sh
+++ b/17.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/17.0/fpm/config/reverse_proxy.config.php b/17.0/fpm/config/reverse_proxy.config.php
new file mode 100644
index 00000000..26a8bff3
--- /dev/null
+++ b/17.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/17.0/fpm/entrypoint.sh b/17.0/fpm/entrypoint.sh
index 2510743e..07b44d61 100755
--- a/17.0/fpm/entrypoint.sh
+++ b/17.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
 
-- 
cgit v1.2.3