From 6d2390726fe7110b406c447d48aa345fc9d07122 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20Mar=C3=B3y?= <andras@maroy.hu>
Date: Thu, 16 Apr 2020 17:54:48 +0200
Subject: Expose reverse proxy related configuration as environment variables
 (#1048)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Expose reverse proxy related configuration as environment variables

Signed-off-by: András Maróy <andras@maroy.hu>

* Update README.md

Co-Authored-By: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: András Maróy <andras@maroy.hu>

* Update README.md

Co-Authored-By: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: András Maróy <andras@maroy.hu>

* Add default values for reverse proxy config from environment

Signed-off-by: András Maróy <andras@maroy.hu>

* Change reverse proxy default values to null

Signed-off-by: András Maróy <andras@maroy.hu>

* Store environment variables in vars in reverse-proxy config

Signed-off-by: András Maróy <andras@maroy.hu>

* Merge reverse proxy configs

Signed-off-by: András Maróy <andras@maroy.hu>

* Move overwrite parameters to reverse proxy section in the readme

Signed-off-by: András Maróy <andras@maroy.hu>

* Add reverse proxy config to 19.0-beta images

Signed-off-by: András Maróy <andras@maroy.hu>

* Remove default null from reverse proxy config to avoid breaking existing deployments

Signed-off-by: András Maróy <andras@maroy.hu>

Co-authored-by: J0WI <J0WI@users.noreply.github.com>
---
 .config/reverse-proxy.config.php | 25 +++++++++++++++++++++++++
 .config/reverse_proxy.config.php | 11 -----------
 2 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 .config/reverse-proxy.config.php
 delete mode 100644 .config/reverse_proxy.config.php

(limited to '.config')

diff --git a/.config/reverse-proxy.config.php b/.config/reverse-proxy.config.php
new file mode 100644
index 00000000..667be312
--- /dev/null
+++ b/.config/reverse-proxy.config.php
@@ -0,0 +1,25 @@
+<?php
+$overwriteHost = getenv('OVERWRITEHOST');
+if ($overwriteHost) {
+  $CONFIG['overwritehost'] = $overwriteHost;
+}
+
+$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteProtocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteProtocol;
+}
+
+$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
+if ($overwriteWebRoot) {
+  $CONFIG['overwritewebroot'] = $overwriteWebRoot;
+}
+
+$overwriteCondAddr = getenv('OVERWRITECONDADDR');
+if ($overwriteCondAddr) {
+  $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
+}
+
+$trustedProxies = getenv('TRUSTED_PROXIES');
+if ($trustedProxies) {
+  $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
+}
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
-- 
cgit v1.2.3