From 2b2bd3c6aa4d736a71902d555bf93b7f8b973c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20Mar=C3=B3y?= <andras@maroy.hu>
Date: Sun, 5 Apr 2020 15:16:49 +0200
Subject: [PATCH] Add default values for reverse proxy config from environment
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                | 10 ++++++++++
 16.0/apache/config/reverse-proxy.config.php     | 10 ++++++++++
 16.0/fpm-alpine/config/reverse-proxy.config.php | 10 ++++++++++
 16.0/fpm/config/reverse-proxy.config.php        | 10 ++++++++++
 17.0/apache/config/reverse-proxy.config.php     | 10 ++++++++++
 17.0/fpm-alpine/config/reverse-proxy.config.php | 10 ++++++++++
 17.0/fpm/config/reverse-proxy.config.php        | 10 ++++++++++
 18.0/apache/config/reverse-proxy.config.php     | 10 ++++++++++
 18.0/fpm-alpine/config/reverse-proxy.config.php | 10 ++++++++++
 18.0/fpm/config/reverse-proxy.config.php        | 10 ++++++++++
 10 files changed, 100 insertions(+)

diff --git a/.config/reverse-proxy.config.php b/.config/reverse-proxy.config.php
index ab77c82d..26342782 100644
--- a/.config/reverse-proxy.config.php
+++ b/.config/reverse-proxy.config.php
@@ -1,20 +1,30 @@
 <?php
 if (getenv('OVERWRITEHOST')) {
   $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+} else {
+  $CONFIG['overwritehost'] = '';
 }
 
 if (getenv('OVERWRITEPROTOCOL')) {
   $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+} else {
+  $CONFIG['overwriteprotocol'] = '';
 }
 
 if (getenv('OVERWRITEWEBROOT')) {
   $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+} else {
+  $CONFIG['overwritewebroot'] = '';
 }
 
 if (getenv('OVERWRITECONDADDR')) {
   $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+} else {
+  $CONFIG['overwritecondaddr'] = '';
 }
 
 if (getenv('TRUSTED_PROXIES')) {
   $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+} else {
+  $CONFIG['trusted_proxies'] = [];
 }
diff --git a/16.0/apache/config/reverse-proxy.config.php b/16.0/apache/config/reverse-proxy.config.php
index ab77c82d..26342782 100644
--- a/16.0/apache/config/reverse-proxy.config.php
+++ b/16.0/apache/config/reverse-proxy.config.php
@@ -1,20 +1,30 @@
 <?php
 if (getenv('OVERWRITEHOST')) {
   $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+} else {
+  $CONFIG['overwritehost'] = '';
 }
 
 if (getenv('OVERWRITEPROTOCOL')) {
   $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+} else {
+  $CONFIG['overwriteprotocol'] = '';
 }
 
 if (getenv('OVERWRITEWEBROOT')) {
   $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+} else {
+  $CONFIG['overwritewebroot'] = '';
 }
 
 if (getenv('OVERWRITECONDADDR')) {
   $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+} else {
+  $CONFIG['overwritecondaddr'] = '';
 }
 
 if (getenv('TRUSTED_PROXIES')) {
   $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+} else {
+  $CONFIG['trusted_proxies'] = [];
 }
diff --git a/16.0/fpm-alpine/config/reverse-proxy.config.php b/16.0/fpm-alpine/config/reverse-proxy.config.php
index ab77c82d..26342782 100644
--- a/16.0/fpm-alpine/config/reverse-proxy.config.php
+++ b/16.0/fpm-alpine/config/reverse-proxy.config.php
@@ -1,20 +1,30 @@
 <?php
 if (getenv('OVERWRITEHOST')) {
   $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+} else {
+  $CONFIG['overwritehost'] = '';
 }
 
 if (getenv('OVERWRITEPROTOCOL')) {
   $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+} else {
+  $CONFIG['overwriteprotocol'] = '';
 }
 
 if (getenv('OVERWRITEWEBROOT')) {
   $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+} else {
+  $CONFIG['overwritewebroot'] = '';
 }
 
 if (getenv('OVERWRITECONDADDR')) {
   $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+} else {
+  $CONFIG['overwritecondaddr'] = '';
 }
 
 if (getenv('TRUSTED_PROXIES')) {
   $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+} else {
+  $CONFIG['trusted_proxies'] = [];
 }
diff --git a/16.0/fpm/config/reverse-proxy.config.php b/16.0/fpm/config/reverse-proxy.config.php
index ab77c82d..26342782 100644
--- a/16.0/fpm/config/reverse-proxy.config.php
+++ b/16.0/fpm/config/reverse-proxy.config.php
@@ -1,20 +1,30 @@
 <?php
 if (getenv('OVERWRITEHOST')) {
   $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+} else {
+  $CONFIG['overwritehost'] = '';
 }
 
 if (getenv('OVERWRITEPROTOCOL')) {
   $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+} else {
+  $CONFIG['overwriteprotocol'] = '';
 }
 
 if (getenv('OVERWRITEWEBROOT')) {
   $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+} else {
+  $CONFIG['overwritewebroot'] = '';
 }
 
 if (getenv('OVERWRITECONDADDR')) {
   $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+} else {
+  $CONFIG['overwritecondaddr'] = '';
 }
 
 if (getenv('TRUSTED_PROXIES')) {
   $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+} else {
+  $CONFIG['trusted_proxies'] = [];
 }
diff --git a/17.0/apache/config/reverse-proxy.config.php b/17.0/apache/config/reverse-proxy.config.php
index ab77c82d..26342782 100644
--- a/17.0/apache/config/reverse-proxy.config.php
+++ b/17.0/apache/config/reverse-proxy.config.php
@@ -1,20 +1,30 @@
 <?php
 if (getenv('OVERWRITEHOST')) {
   $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+} else {
+  $CONFIG['overwritehost'] = '';
 }
 
 if (getenv('OVERWRITEPROTOCOL')) {
   $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+} else {
+  $CONFIG['overwriteprotocol'] = '';
 }
 
 if (getenv('OVERWRITEWEBROOT')) {
   $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+} else {
+  $CONFIG['overwritewebroot'] = '';
 }
 
 if (getenv('OVERWRITECONDADDR')) {
   $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+} else {
+  $CONFIG['overwritecondaddr'] = '';
 }
 
 if (getenv('TRUSTED_PROXIES')) {
   $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+} else {
+  $CONFIG['trusted_proxies'] = [];
 }
diff --git a/17.0/fpm-alpine/config/reverse-proxy.config.php b/17.0/fpm-alpine/config/reverse-proxy.config.php
index ab77c82d..26342782 100644
--- a/17.0/fpm-alpine/config/reverse-proxy.config.php
+++ b/17.0/fpm-alpine/config/reverse-proxy.config.php
@@ -1,20 +1,30 @@
 <?php
 if (getenv('OVERWRITEHOST')) {
   $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+} else {
+  $CONFIG['overwritehost'] = '';
 }
 
 if (getenv('OVERWRITEPROTOCOL')) {
   $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+} else {
+  $CONFIG['overwriteprotocol'] = '';
 }
 
 if (getenv('OVERWRITEWEBROOT')) {
   $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+} else {
+  $CONFIG['overwritewebroot'] = '';
 }
 
 if (getenv('OVERWRITECONDADDR')) {
   $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+} else {
+  $CONFIG['overwritecondaddr'] = '';
 }
 
 if (getenv('TRUSTED_PROXIES')) {
   $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+} else {
+  $CONFIG['trusted_proxies'] = [];
 }
diff --git a/17.0/fpm/config/reverse-proxy.config.php b/17.0/fpm/config/reverse-proxy.config.php
index ab77c82d..26342782 100644
--- a/17.0/fpm/config/reverse-proxy.config.php
+++ b/17.0/fpm/config/reverse-proxy.config.php
@@ -1,20 +1,30 @@
 <?php
 if (getenv('OVERWRITEHOST')) {
   $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+} else {
+  $CONFIG['overwritehost'] = '';
 }
 
 if (getenv('OVERWRITEPROTOCOL')) {
   $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+} else {
+  $CONFIG['overwriteprotocol'] = '';
 }
 
 if (getenv('OVERWRITEWEBROOT')) {
   $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+} else {
+  $CONFIG['overwritewebroot'] = '';
 }
 
 if (getenv('OVERWRITECONDADDR')) {
   $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+} else {
+  $CONFIG['overwritecondaddr'] = '';
 }
 
 if (getenv('TRUSTED_PROXIES')) {
   $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+} else {
+  $CONFIG['trusted_proxies'] = [];
 }
diff --git a/18.0/apache/config/reverse-proxy.config.php b/18.0/apache/config/reverse-proxy.config.php
index ab77c82d..26342782 100644
--- a/18.0/apache/config/reverse-proxy.config.php
+++ b/18.0/apache/config/reverse-proxy.config.php
@@ -1,20 +1,30 @@
 <?php
 if (getenv('OVERWRITEHOST')) {
   $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+} else {
+  $CONFIG['overwritehost'] = '';
 }
 
 if (getenv('OVERWRITEPROTOCOL')) {
   $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+} else {
+  $CONFIG['overwriteprotocol'] = '';
 }
 
 if (getenv('OVERWRITEWEBROOT')) {
   $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+} else {
+  $CONFIG['overwritewebroot'] = '';
 }
 
 if (getenv('OVERWRITECONDADDR')) {
   $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+} else {
+  $CONFIG['overwritecondaddr'] = '';
 }
 
 if (getenv('TRUSTED_PROXIES')) {
   $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+} else {
+  $CONFIG['trusted_proxies'] = [];
 }
diff --git a/18.0/fpm-alpine/config/reverse-proxy.config.php b/18.0/fpm-alpine/config/reverse-proxy.config.php
index ab77c82d..26342782 100644
--- a/18.0/fpm-alpine/config/reverse-proxy.config.php
+++ b/18.0/fpm-alpine/config/reverse-proxy.config.php
@@ -1,20 +1,30 @@
 <?php
 if (getenv('OVERWRITEHOST')) {
   $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+} else {
+  $CONFIG['overwritehost'] = '';
 }
 
 if (getenv('OVERWRITEPROTOCOL')) {
   $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+} else {
+  $CONFIG['overwriteprotocol'] = '';
 }
 
 if (getenv('OVERWRITEWEBROOT')) {
   $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+} else {
+  $CONFIG['overwritewebroot'] = '';
 }
 
 if (getenv('OVERWRITECONDADDR')) {
   $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+} else {
+  $CONFIG['overwritecondaddr'] = '';
 }
 
 if (getenv('TRUSTED_PROXIES')) {
   $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+} else {
+  $CONFIG['trusted_proxies'] = [];
 }
diff --git a/18.0/fpm/config/reverse-proxy.config.php b/18.0/fpm/config/reverse-proxy.config.php
index ab77c82d..26342782 100644
--- a/18.0/fpm/config/reverse-proxy.config.php
+++ b/18.0/fpm/config/reverse-proxy.config.php
@@ -1,20 +1,30 @@
 <?php
 if (getenv('OVERWRITEHOST')) {
   $CONFIG['overwritehost'] = getenv('OVERWRITEHOST');
+} else {
+  $CONFIG['overwritehost'] = '';
 }
 
 if (getenv('OVERWRITEPROTOCOL')) {
   $CONFIG['overwriteprotocol'] = getenv('OVERWRITEPROTOCOL');
+} else {
+  $CONFIG['overwriteprotocol'] = '';
 }
 
 if (getenv('OVERWRITEWEBROOT')) {
   $CONFIG['overwritewebroot'] = getenv('OVERWRITEWEBROOT');
+} else {
+  $CONFIG['overwritewebroot'] = '';
 }
 
 if (getenv('OVERWRITECONDADDR')) {
   $CONFIG['overwritecondaddr'] = getenv('OVERWRITECONDADDR');
+} else {
+  $CONFIG['overwritecondaddr'] = '';
 }
 
 if (getenv('TRUSTED_PROXIES')) {
   $CONFIG['trusted_proxies'] = explode(',', getenv('TRUSTED_PROXIES'));
+} else {
+  $CONFIG['trusted_proxies'] = [];
 }