gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Kyle Hall 2022-10-24 10:58:59 -04:00 committed by Tomas Cohen Arazi
parent e8b2a5b7b6
commit 8d5cbcadd5
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/scripts/koha-z3950-responder vendored
View File

@ -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}"

5
etc/koha-conf.xml
View File

@ -281,10 +281,5 @@
<do_not_remove_cookie>KohaOpacLanguage</do_not_remove_cookie>
-->
<!-- See z3950_responder.pl for available options. The options -c, -u and -p are already passed automatically by koha-z3950-responder -->
<!--
<z3950_responder_options>--add-item-status k -t 5</z3950_responder_options>
-->
</config>
</yazgfs>

5
etc/z3950/config.xml
View File

@ -1,4 +1,9 @@
<yazgfs>
<!-- See z3950_responder.pl for available options. The options -c, -u and -p are already passed automatically by koha-z3950-responder -->
<!--
<z3950_responder_options>--add-item-status k -t 5</z3950_responder_options>
-->
<listen id="public">tcp:@:2100</listen>
<server>
<cql2rpn>pqf.properties</cql2rpn>