From bfac05e0721ce74638ed853b107dfeecc1bf2725 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Thu, 13 Jun 2019 13:46:25 -0400
Subject: [PATCH] Bug 23068: Allow the list of proxy IPs to be set in the
 koha-conf.xml file

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 debian/scripts/koha-plack              | 3 +++
 debian/templates/koha-conf-site.xml.in | 5 +++++
 etc/koha-conf.xml                      | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/debian/scripts/koha-plack b/debian/scripts/koha-plack
index b14bac5f9f..eeb26a99cf 100755
--- a/debian/scripts/koha-plack
+++ b/debian/scripts/koha-plack
@@ -85,6 +85,9 @@ start_plack()
     PLACK_WORKERS=$(run_safe_xmlstarlet $instancename plack_workers)
     [ -z $PLACK_WORKERS ] && PLACK_WORKERS="2"
 
+    KOHA_TRUSTED_PROXIES=$(run_safe_xmlstarlet $instancename koha_trusted_proxies)
+    [ -z $KOHA_TRUSTED_PROXIES ] && KOHA_TRUSTED_PROXIES=""
+
     instance_user="${instancename}-koha"
 
     environment="deployment"
diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index e9e562439d..6694cc76ee 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -345,6 +345,11 @@ __END_SRU_PUBLICSERVER__
  <plack_max_requests>50</plack_max_requests>
  <plack_workers>2</plack_workers>
 
+ <!-- Configuration for X-Forwarded-For -->
+ <!--
+ <koha_trusted_proxies>1.2.3.4 2.3.4.5 3.4.5.6</koha_trusted_proxies>
+ -->
+
  <!-- Elasticsearch Configuration -->
  <elasticsearch>
      <server>localhost:9200</server>
diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index fc7c7cfead..1f9342dd6e 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -161,6 +161,11 @@ __PAZPAR2_TOGGLE_XML_POST__
  <plack_max_requests>50</plack_max_requests>
  <plack_workers>2</plack_workers>
 
+ <!-- Configuration for X-Forwarded-For -->
+ <!--
+ <koha_trusted_proxies>1.2.3.4 2.3.4.5 3.4.5.6</koha_trusted_proxies>
+ -->
+
  <!-- Elasticsearch Configuration -->
  <elasticsearch>
      <server>localhost:9200</server>
-- 
2.20.1