From 8b4bb96e531e9dfec30ad98081212edab4b1e786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20Mar=C3=B3y?= <andras@maroy.hu>
Date: Sat, 11 Apr 2020 17:43:16 +0200
Subject: [PATCH] Add reverse proxy config to 19.0-beta images
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>
---
 .../apache/config/reverse-proxy.config.php    | 35 +++++++++++++++++++
 .../apache/config/reverse_proxy.config.php    | 11 ------
 .../config/reverse-proxy.config.php           | 35 +++++++++++++++++++
 .../config/reverse_proxy.config.php           | 11 ------
 19.0-beta/fpm/config/reverse-proxy.config.php | 35 +++++++++++++++++++
 19.0-beta/fpm/config/reverse_proxy.config.php | 11 ------
 6 files changed, 105 insertions(+), 33 deletions(-)
 create mode 100644 19.0-beta/apache/config/reverse-proxy.config.php
 delete mode 100644 19.0-beta/apache/config/reverse_proxy.config.php
 create mode 100644 19.0-beta/fpm-alpine/config/reverse-proxy.config.php
 delete mode 100644 19.0-beta/fpm-alpine/config/reverse_proxy.config.php
 create mode 100644 19.0-beta/fpm/config/reverse-proxy.config.php
 delete mode 100644 19.0-beta/fpm/config/reverse_proxy.config.php

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