From 02025a70ff267972054e28c2818cde446bb98e48 Mon Sep 17 00:00:00 2001
From: Ryan Trauntvein <djdefi@users.noreply.github.com>
Date: Mon, 11 Jun 2018 22:26:38 -0700
Subject: [PATCH 1/2] TRUSTED_PROXIES env

---
 entrypoint.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index bc7ef32a..0feb9bc3 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -132,6 +132,8 @@ initialize_system() {
   NEXMO_SMS_FROM=${NEXMO_SMS_FROM:-Cachet}
 
   PHP_MAX_CHILDREN=${PHP_MAX_CHILDREN:-5}
+  
+  TRUSTED_PROXIES=${TRUSTED_PROXIES:-}
 
   # configure env file
 
@@ -180,7 +182,9 @@ initialize_system() {
   sed 's,{{NEXMO_SMS_FROM}},'"${NEXMO_SMS_FROM}"',g' -i /var/www/html/.env
 
   sed 's,{{PHP_MAX_CHILDREN}},'"${PHP_MAX_CHILDREN}"',g' -i /etc/php7/php-fpm.d/www.conf
-
+  
+  sed 's,{{TRUSTED_PROXIES}},'"${TRUSTED_PROXIES}"',g' -i /var/www/html/.env
+  
   if [[ "${APP_KEY}" == null ]]; then
     keygen="$(php artisan key:generate)"
     appkey=$(echo "${keygen}" | grep -oP '(?<=\[).*(?=\])')

From 2fe7bc9d51a9201387241240d19493c966a60457 Mon Sep 17 00:00:00 2001
From: Ryan Trauntvein <djdefi@users.noreply.github.com>
Date: Mon, 11 Jun 2018 22:28:11 -0700
Subject: [PATCH 2/2] Update .env.docker

---
 conf/.env.docker | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/.env.docker b/conf/.env.docker
index 54fc3253..c3d7a751 100644
--- a/conf/.env.docker
+++ b/conf/.env.docker
@@ -45,3 +45,5 @@ GITHUB_TOKEN="{{GITHUB_TOKEN}}"
 NEXMO_KEY="{{NEXMO_KEY}}"
 NEXMO_SECRET="{{NEXMO_SECRET}}"
 NEXMO_SMS_FROM="{{NEXMO_SMS_FROM}}"
+
+TRUSTED_PROXIES="{{TRUSTED_PROXIES}}"