From 8911a4ba50ea943cea8e517987c58bd0dbe976dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20Mar=C3=B3y?= <andras@maroy.hu>
Date: Wed, 8 Apr 2020 21:24:51 +0200
Subject: [PATCH] Merge reverse proxy configs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: András Maróy <andras@maroy.hu>
---
 .config/reverse-proxy.config.php              | 30 +++++++++----------
 .config/reverse_proxy.config.php              | 11 -------
 16.0/apache/config/reverse-proxy.config.php   | 30 +++++++++----------
 16.0/apache/config/reverse_proxy.config.php   | 11 -------
 .../config/reverse-proxy.config.php           | 30 +++++++++----------
 .../config/reverse_proxy.config.php           | 11 -------
 16.0/fpm/config/reverse-proxy.config.php      | 30 +++++++++----------
 16.0/fpm/config/reverse_proxy.config.php      | 11 -------
 17.0/apache/config/reverse-proxy.config.php   | 30 +++++++++----------
 17.0/apache/config/reverse_proxy.config.php   | 11 -------
 .../config/reverse-proxy.config.php           | 30 +++++++++----------
 .../config/reverse_proxy.config.php           | 11 -------
 17.0/fpm/config/reverse-proxy.config.php      | 30 +++++++++----------
 17.0/fpm/config/reverse_proxy.config.php      | 11 -------
 18.0/apache/config/reverse-proxy.config.php   | 30 +++++++++----------
 18.0/apache/config/reverse_proxy.config.php   | 11 -------
 .../config/reverse-proxy.config.php           | 30 +++++++++----------
 .../config/reverse_proxy.config.php           | 11 -------
 18.0/fpm/config/reverse-proxy.config.php      | 30 +++++++++----------
 18.0/fpm/config/reverse_proxy.config.php      | 11 -------
 20 files changed, 150 insertions(+), 260 deletions(-)
 delete mode 100644 .config/reverse_proxy.config.php
 delete mode 100644 16.0/apache/config/reverse_proxy.config.php
 delete mode 100644 16.0/fpm-alpine/config/reverse_proxy.config.php
 delete mode 100644 16.0/fpm/config/reverse_proxy.config.php
 delete mode 100644 17.0/apache/config/reverse_proxy.config.php
 delete mode 100644 17.0/fpm-alpine/config/reverse_proxy.config.php
 delete mode 100644 17.0/fpm/config/reverse_proxy.config.php
 delete mode 100644 18.0/apache/config/reverse_proxy.config.php
 delete mode 100644 18.0/fpm-alpine/config/reverse_proxy.config.php
 delete mode 100644 18.0/fpm/config/reverse_proxy.config.php

diff --git a/.config/reverse-proxy.config.php b/.config/reverse-proxy.config.php
index 75ab44e6..74046c17 100644
--- a/.config/reverse-proxy.config.php
+++ b/.config/reverse-proxy.config.php
@@ -1,35 +1,35 @@
 <?php
-$overwritehost = getenv('OVERWRITEHOST');
-if ($overwritehost) {
-  $CONFIG['overwritehost'] = $overwritehost;
+$overwriteHost = getenv('OVERWRITEHOST');
+if ($overwriteHost) {
+  $CONFIG['overwritehost'] = $overwriteHost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
-if ($overwriteprotocol) {
-  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
+$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteProtocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteProtocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-$overwritewebroot = getenv('OVERWRITEWEBROOT');
-if ($overwritewebroot) {
-  $CONFIG['overwritewebroot'] = $overwritewebroot;
+$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
+if ($overwriteWebRoot) {
+  $CONFIG['overwritewebroot'] = $overwriteWebRoot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-$overwritecondaddr = getenv('OVERWRITECONDADDR');
-if ($overwritecondaddr) {
-  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
+$overwriteCondAddr = getenv('OVERWRITECONDADDR');
+if ($overwriteCondAddr) {
+  $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-$trusted_proxies = getenv('TRUSTED_PROXIES');
-if ($trusted_proxies) {
-  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
+$trustedProxies = getenv('TRUSTED_PROXIES');
+if ($trustedProxies) {
+  $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/.config/reverse_proxy.config.php b/.config/reverse_proxy.config.php
deleted file mode 100644
index 26a8bff3..00000000
--- a/.config/reverse_proxy.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/config/reverse-proxy.config.php b/16.0/apache/config/reverse-proxy.config.php
index 75ab44e6..74046c17 100644
--- a/16.0/apache/config/reverse-proxy.config.php
+++ b/16.0/apache/config/reverse-proxy.config.php
@@ -1,35 +1,35 @@
 <?php
-$overwritehost = getenv('OVERWRITEHOST');
-if ($overwritehost) {
-  $CONFIG['overwritehost'] = $overwritehost;
+$overwriteHost = getenv('OVERWRITEHOST');
+if ($overwriteHost) {
+  $CONFIG['overwritehost'] = $overwriteHost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
-if ($overwriteprotocol) {
-  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
+$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteProtocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteProtocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-$overwritewebroot = getenv('OVERWRITEWEBROOT');
-if ($overwritewebroot) {
-  $CONFIG['overwritewebroot'] = $overwritewebroot;
+$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
+if ($overwriteWebRoot) {
+  $CONFIG['overwritewebroot'] = $overwriteWebRoot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-$overwritecondaddr = getenv('OVERWRITECONDADDR');
-if ($overwritecondaddr) {
-  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
+$overwriteCondAddr = getenv('OVERWRITECONDADDR');
+if ($overwriteCondAddr) {
+  $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-$trusted_proxies = getenv('TRUSTED_PROXIES');
-if ($trusted_proxies) {
-  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
+$trustedProxies = getenv('TRUSTED_PROXIES');
+if ($trustedProxies) {
+  $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/16.0/apache/config/reverse_proxy.config.php b/16.0/apache/config/reverse_proxy.config.php
deleted file mode 100644
index 26a8bff3..00000000
--- a/16.0/apache/config/reverse_proxy.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/config/reverse-proxy.config.php b/16.0/fpm-alpine/config/reverse-proxy.config.php
index 75ab44e6..74046c17 100644
--- a/16.0/fpm-alpine/config/reverse-proxy.config.php
+++ b/16.0/fpm-alpine/config/reverse-proxy.config.php
@@ -1,35 +1,35 @@
 <?php
-$overwritehost = getenv('OVERWRITEHOST');
-if ($overwritehost) {
-  $CONFIG['overwritehost'] = $overwritehost;
+$overwriteHost = getenv('OVERWRITEHOST');
+if ($overwriteHost) {
+  $CONFIG['overwritehost'] = $overwriteHost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
-if ($overwriteprotocol) {
-  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
+$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteProtocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteProtocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-$overwritewebroot = getenv('OVERWRITEWEBROOT');
-if ($overwritewebroot) {
-  $CONFIG['overwritewebroot'] = $overwritewebroot;
+$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
+if ($overwriteWebRoot) {
+  $CONFIG['overwritewebroot'] = $overwriteWebRoot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-$overwritecondaddr = getenv('OVERWRITECONDADDR');
-if ($overwritecondaddr) {
-  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
+$overwriteCondAddr = getenv('OVERWRITECONDADDR');
+if ($overwriteCondAddr) {
+  $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-$trusted_proxies = getenv('TRUSTED_PROXIES');
-if ($trusted_proxies) {
-  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
+$trustedProxies = getenv('TRUSTED_PROXIES');
+if ($trustedProxies) {
+  $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/16.0/fpm-alpine/config/reverse_proxy.config.php b/16.0/fpm-alpine/config/reverse_proxy.config.php
deleted file mode 100644
index 26a8bff3..00000000
--- a/16.0/fpm-alpine/config/reverse_proxy.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/config/reverse-proxy.config.php b/16.0/fpm/config/reverse-proxy.config.php
index 75ab44e6..74046c17 100644
--- a/16.0/fpm/config/reverse-proxy.config.php
+++ b/16.0/fpm/config/reverse-proxy.config.php
@@ -1,35 +1,35 @@
 <?php
-$overwritehost = getenv('OVERWRITEHOST');
-if ($overwritehost) {
-  $CONFIG['overwritehost'] = $overwritehost;
+$overwriteHost = getenv('OVERWRITEHOST');
+if ($overwriteHost) {
+  $CONFIG['overwritehost'] = $overwriteHost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
-if ($overwriteprotocol) {
-  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
+$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteProtocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteProtocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-$overwritewebroot = getenv('OVERWRITEWEBROOT');
-if ($overwritewebroot) {
-  $CONFIG['overwritewebroot'] = $overwritewebroot;
+$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
+if ($overwriteWebRoot) {
+  $CONFIG['overwritewebroot'] = $overwriteWebRoot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-$overwritecondaddr = getenv('OVERWRITECONDADDR');
-if ($overwritecondaddr) {
-  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
+$overwriteCondAddr = getenv('OVERWRITECONDADDR');
+if ($overwriteCondAddr) {
+  $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-$trusted_proxies = getenv('TRUSTED_PROXIES');
-if ($trusted_proxies) {
-  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
+$trustedProxies = getenv('TRUSTED_PROXIES');
+if ($trustedProxies) {
+  $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/16.0/fpm/config/reverse_proxy.config.php b/16.0/fpm/config/reverse_proxy.config.php
deleted file mode 100644
index 26a8bff3..00000000
--- a/16.0/fpm/config/reverse_proxy.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/config/reverse-proxy.config.php b/17.0/apache/config/reverse-proxy.config.php
index 75ab44e6..74046c17 100644
--- a/17.0/apache/config/reverse-proxy.config.php
+++ b/17.0/apache/config/reverse-proxy.config.php
@@ -1,35 +1,35 @@
 <?php
-$overwritehost = getenv('OVERWRITEHOST');
-if ($overwritehost) {
-  $CONFIG['overwritehost'] = $overwritehost;
+$overwriteHost = getenv('OVERWRITEHOST');
+if ($overwriteHost) {
+  $CONFIG['overwritehost'] = $overwriteHost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
-if ($overwriteprotocol) {
-  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
+$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteProtocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteProtocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-$overwritewebroot = getenv('OVERWRITEWEBROOT');
-if ($overwritewebroot) {
-  $CONFIG['overwritewebroot'] = $overwritewebroot;
+$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
+if ($overwriteWebRoot) {
+  $CONFIG['overwritewebroot'] = $overwriteWebRoot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-$overwritecondaddr = getenv('OVERWRITECONDADDR');
-if ($overwritecondaddr) {
-  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
+$overwriteCondAddr = getenv('OVERWRITECONDADDR');
+if ($overwriteCondAddr) {
+  $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-$trusted_proxies = getenv('TRUSTED_PROXIES');
-if ($trusted_proxies) {
-  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
+$trustedProxies = getenv('TRUSTED_PROXIES');
+if ($trustedProxies) {
+  $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/17.0/apache/config/reverse_proxy.config.php b/17.0/apache/config/reverse_proxy.config.php
deleted file mode 100644
index 26a8bff3..00000000
--- a/17.0/apache/config/reverse_proxy.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/config/reverse-proxy.config.php b/17.0/fpm-alpine/config/reverse-proxy.config.php
index 75ab44e6..74046c17 100644
--- a/17.0/fpm-alpine/config/reverse-proxy.config.php
+++ b/17.0/fpm-alpine/config/reverse-proxy.config.php
@@ -1,35 +1,35 @@
 <?php
-$overwritehost = getenv('OVERWRITEHOST');
-if ($overwritehost) {
-  $CONFIG['overwritehost'] = $overwritehost;
+$overwriteHost = getenv('OVERWRITEHOST');
+if ($overwriteHost) {
+  $CONFIG['overwritehost'] = $overwriteHost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
-if ($overwriteprotocol) {
-  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
+$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteProtocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteProtocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-$overwritewebroot = getenv('OVERWRITEWEBROOT');
-if ($overwritewebroot) {
-  $CONFIG['overwritewebroot'] = $overwritewebroot;
+$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
+if ($overwriteWebRoot) {
+  $CONFIG['overwritewebroot'] = $overwriteWebRoot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-$overwritecondaddr = getenv('OVERWRITECONDADDR');
-if ($overwritecondaddr) {
-  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
+$overwriteCondAddr = getenv('OVERWRITECONDADDR');
+if ($overwriteCondAddr) {
+  $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-$trusted_proxies = getenv('TRUSTED_PROXIES');
-if ($trusted_proxies) {
-  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
+$trustedProxies = getenv('TRUSTED_PROXIES');
+if ($trustedProxies) {
+  $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/17.0/fpm-alpine/config/reverse_proxy.config.php b/17.0/fpm-alpine/config/reverse_proxy.config.php
deleted file mode 100644
index 26a8bff3..00000000
--- a/17.0/fpm-alpine/config/reverse_proxy.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/config/reverse-proxy.config.php b/17.0/fpm/config/reverse-proxy.config.php
index 75ab44e6..74046c17 100644
--- a/17.0/fpm/config/reverse-proxy.config.php
+++ b/17.0/fpm/config/reverse-proxy.config.php
@@ -1,35 +1,35 @@
 <?php
-$overwritehost = getenv('OVERWRITEHOST');
-if ($overwritehost) {
-  $CONFIG['overwritehost'] = $overwritehost;
+$overwriteHost = getenv('OVERWRITEHOST');
+if ($overwriteHost) {
+  $CONFIG['overwritehost'] = $overwriteHost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
-if ($overwriteprotocol) {
-  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
+$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteProtocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteProtocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-$overwritewebroot = getenv('OVERWRITEWEBROOT');
-if ($overwritewebroot) {
-  $CONFIG['overwritewebroot'] = $overwritewebroot;
+$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
+if ($overwriteWebRoot) {
+  $CONFIG['overwritewebroot'] = $overwriteWebRoot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-$overwritecondaddr = getenv('OVERWRITECONDADDR');
-if ($overwritecondaddr) {
-  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
+$overwriteCondAddr = getenv('OVERWRITECONDADDR');
+if ($overwriteCondAddr) {
+  $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-$trusted_proxies = getenv('TRUSTED_PROXIES');
-if ($trusted_proxies) {
-  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
+$trustedProxies = getenv('TRUSTED_PROXIES');
+if ($trustedProxies) {
+  $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/17.0/fpm/config/reverse_proxy.config.php b/17.0/fpm/config/reverse_proxy.config.php
deleted file mode 100644
index 26a8bff3..00000000
--- a/17.0/fpm/config/reverse_proxy.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/18.0/apache/config/reverse-proxy.config.php b/18.0/apache/config/reverse-proxy.config.php
index 75ab44e6..74046c17 100644
--- a/18.0/apache/config/reverse-proxy.config.php
+++ b/18.0/apache/config/reverse-proxy.config.php
@@ -1,35 +1,35 @@
 <?php
-$overwritehost = getenv('OVERWRITEHOST');
-if ($overwritehost) {
-  $CONFIG['overwritehost'] = $overwritehost;
+$overwriteHost = getenv('OVERWRITEHOST');
+if ($overwriteHost) {
+  $CONFIG['overwritehost'] = $overwriteHost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
-if ($overwriteprotocol) {
-  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
+$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteProtocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteProtocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-$overwritewebroot = getenv('OVERWRITEWEBROOT');
-if ($overwritewebroot) {
-  $CONFIG['overwritewebroot'] = $overwritewebroot;
+$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
+if ($overwriteWebRoot) {
+  $CONFIG['overwritewebroot'] = $overwriteWebRoot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-$overwritecondaddr = getenv('OVERWRITECONDADDR');
-if ($overwritecondaddr) {
-  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
+$overwriteCondAddr = getenv('OVERWRITECONDADDR');
+if ($overwriteCondAddr) {
+  $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-$trusted_proxies = getenv('TRUSTED_PROXIES');
-if ($trusted_proxies) {
-  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
+$trustedProxies = getenv('TRUSTED_PROXIES');
+if ($trustedProxies) {
+  $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/18.0/apache/config/reverse_proxy.config.php b/18.0/apache/config/reverse_proxy.config.php
deleted file mode 100644
index 26a8bff3..00000000
--- a/18.0/apache/config/reverse_proxy.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/18.0/fpm-alpine/config/reverse-proxy.config.php b/18.0/fpm-alpine/config/reverse-proxy.config.php
index 75ab44e6..74046c17 100644
--- a/18.0/fpm-alpine/config/reverse-proxy.config.php
+++ b/18.0/fpm-alpine/config/reverse-proxy.config.php
@@ -1,35 +1,35 @@
 <?php
-$overwritehost = getenv('OVERWRITEHOST');
-if ($overwritehost) {
-  $CONFIG['overwritehost'] = $overwritehost;
+$overwriteHost = getenv('OVERWRITEHOST');
+if ($overwriteHost) {
+  $CONFIG['overwritehost'] = $overwriteHost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
-if ($overwriteprotocol) {
-  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
+$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteProtocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteProtocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-$overwritewebroot = getenv('OVERWRITEWEBROOT');
-if ($overwritewebroot) {
-  $CONFIG['overwritewebroot'] = $overwritewebroot;
+$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
+if ($overwriteWebRoot) {
+  $CONFIG['overwritewebroot'] = $overwriteWebRoot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-$overwritecondaddr = getenv('OVERWRITECONDADDR');
-if ($overwritecondaddr) {
-  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
+$overwriteCondAddr = getenv('OVERWRITECONDADDR');
+if ($overwriteCondAddr) {
+  $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-$trusted_proxies = getenv('TRUSTED_PROXIES');
-if ($trusted_proxies) {
-  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
+$trustedProxies = getenv('TRUSTED_PROXIES');
+if ($trustedProxies) {
+  $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/18.0/fpm-alpine/config/reverse_proxy.config.php b/18.0/fpm-alpine/config/reverse_proxy.config.php
deleted file mode 100644
index 26a8bff3..00000000
--- a/18.0/fpm-alpine/config/reverse_proxy.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/18.0/fpm/config/reverse-proxy.config.php b/18.0/fpm/config/reverse-proxy.config.php
index 75ab44e6..74046c17 100644
--- a/18.0/fpm/config/reverse-proxy.config.php
+++ b/18.0/fpm/config/reverse-proxy.config.php
@@ -1,35 +1,35 @@
 <?php
-$overwritehost = getenv('OVERWRITEHOST');
-if ($overwritehost) {
-  $CONFIG['overwritehost'] = $overwritehost;
+$overwriteHost = getenv('OVERWRITEHOST');
+if ($overwriteHost) {
+  $CONFIG['overwritehost'] = $overwriteHost;
 } else {
   $CONFIG['overwritehost'] = null;
 }
 
-$overwriteprotocol = getenv('OVERWRITEPROTOCOL');
-if ($overwriteprotocol) {
-  $CONFIG['overwriteprotocol'] = $overwriteprotocol;
+$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteProtocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteProtocol;
 } else {
   $CONFIG['overwriteprotocol'] = null;
 }
 
-$overwritewebroot = getenv('OVERWRITEWEBROOT');
-if ($overwritewebroot) {
-  $CONFIG['overwritewebroot'] = $overwritewebroot;
+$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
+if ($overwriteWebRoot) {
+  $CONFIG['overwritewebroot'] = $overwriteWebRoot;
 } else {
   $CONFIG['overwritewebroot'] = null;
 }
 
-$overwritecondaddr = getenv('OVERWRITECONDADDR');
-if ($overwritecondaddr) {
-  $CONFIG['overwritecondaddr'] = $overwritecondaddr;
+$overwriteCondAddr = getenv('OVERWRITECONDADDR');
+if ($overwriteCondAddr) {
+  $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
 } else {
   $CONFIG['overwritecondaddr'] = null;
 }
 
-$trusted_proxies = getenv('TRUSTED_PROXIES');
-if ($trusted_proxies) {
-  $CONFIG['trusted_proxies'] = explode(',', $trusted_proxies);
+$trustedProxies = getenv('TRUSTED_PROXIES');
+if ($trustedProxies) {
+  $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
 } else {
   $CONFIG['trusted_proxies'] = null;
 }
diff --git a/18.0/fpm/config/reverse_proxy.config.php b/18.0/fpm/config/reverse_proxy.config.php
deleted file mode 100644
index 26a8bff3..00000000
--- a/18.0/fpm/config/reverse_proxy.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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