Attachment 142522 Details for Bug 25716 – Bug 25716: (QA follow-up) Move additional options to etc/z3950/config.xml

[patch] Bug 25716: (QA follow-up) Move additional options to etc/z3950/config.xml

Bug-25716-QA-follow-up-Move-additional-options-to-.patch (text/plain), 2.38 KB, created by Kyle M Hall (khall) on 2022-10-24 15:08:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2022-10-24 15:08:04 UTC

Size: 2.38 KB

patch

obsolete

>From 3f4254e91ba8984e6af2ce14505a2ca32e5fdcfc Mon Sep 17 00:00:00 2001
>From: Kyle Hall <kyle@bywatersolutions.com>
>Date: Mon, 24 Oct 2022 10:58:59 -0400
>Subject: [PATCH] Bug 25716: (QA follow-up) Move additional options to
> etc/z3950/config.xml
>
>This followup moves the configuration to the z3950 etc file, either the
>default and or the custom file is used as per the existing script code.
>
>In addition, the options and be set using an environment variable named Z3950_ADDITIONAL_OPTS.
>---
> debian/scripts/koha-z3950-responder | 4 +++-
> etc/koha-conf.xml                   | 5 -----
> etc/z3950/config.xml                | 5 +++++
> 3 files changed, 8 insertions(+), 6 deletions(-)
>
>diff --git a/debian/scripts/koha-z3950-responder b/debian/scripts/koha-z3950-responder
>index 0f5dea3782..d8ac7e3526 100755
>--- a/debian/scripts/koha-z3950-responder
>+++ b/debian/scripts/koha-z3950-responder
>@@ -110,7 +110,9 @@ start_z3950()
>     if ! is_z3950_running ${instancename}; then
>         export KOHA_CONF="/etc/koha/sites/${instancename}/koha-conf.xml"
> 
>-        Z3950_ADDITIONAL_OPTS="$( xmlstarlet sel -t -v 'yazgfs/config/z3950_responder_options' $KOHA_CONF || true )"
>+        if [[ ! $Z3950_ADDITIONAL_OPTS ]]; then
>+            Z3950_ADDITIONAL_OPTS="$( xmlstarlet sel -t -v 'yazgfs/config/z3950_responder_options' "$CONFIGDIR/config.xml" || true )"
>+        fi
> 
>         log_daemon_msg "Starting Z39.50/SRU daemon for ${instancename}"
> 
>diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
>index 69f8acb05d..3e5623cb96 100644
>--- a/etc/koha-conf.xml
>+++ b/etc/koha-conf.xml
>@@ -281,10 +281,5 @@
>      <do_not_remove_cookie>KohaOpacLanguage</do_not_remove_cookie>
>  -->
> 
>- 
>- 
>-
> </config>
> </yazgfs>
>diff --git a/etc/z3950/config.xml b/etc/z3950/config.xml
>index 7433851f8b..ceae0a9c6f 100644
>--- a/etc/z3950/config.xml
>+++ b/etc/z3950/config.xml
>@@ -1,4 +1,9 @@
> <yazgfs>
>+ 
>+ 
>+
>   <listen id="public">tcp:@:2100</listen>
>   <server>
>     <cql2rpn>pqf.properties</cql2rpn>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 25716: 105767 | 114166 | 120178 | 125095 | 125096 | 125481 | 125482 | 142520 | 142521 | 142522 | 142577