From a0d999282985b00f41e86dc6fcd3c09f81882411 Mon Sep 17 00:00:00 2001 From: Kyle M Hall 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 --- debian/scripts/koha-plack | 4 ++++ debian/templates/koha-conf-site.xml.in | 5 +++++ etc/koha-conf.xml | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/debian/scripts/koha-plack b/debian/scripts/koha-plack index b14bac5f9f..dc89dbae48 100755 --- a/debian/scripts/koha-plack +++ b/debian/scripts/koha-plack @@ -85,6 +85,10 @@ 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="" + export 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__ 50 2 + + + localhost:9200 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__ 50 2 + + + localhost:9200 -- 2.20.1 (Apple Git-117)