Bugzilla – Attachment 55054 Details for
Bug 17228
Make two versions of SIPconfig.xml identical
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17228 - Make two versions of SIPconfig.xml identical
Bug-17228---Make-two-versions-of-SIPconfigxml-iden.patch (text/plain), 4.90 KB, created by
Magnus Enger
on 2016-08-31 09:10:45 UTC
(
hide
)
Description:
Bug 17228 - Make two versions of SIPconfig.xml identical
Filename:
MIME Type:
Creator:
Magnus Enger
Created:
2016-08-31 09:10:45 UTC
Size:
4.90 KB
patch
obsolete
>From 4d0188f1ecc13e96ff78987583a673de3d7662e4 Mon Sep 17 00:00:00 2001 >From: Magnus Enger <magnus@libriotech.no> >Date: Wed, 31 Aug 2016 10:47:43 +0200 >Subject: [PATCH] Bug 17228 - Make two versions of SIPconfig.xml identical >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Several bugs have made changes to etc/SIPconfig.xml but not >updated debian/templates/SIPconfig.xml. This means that an admin >using the Debian packages who enables SIP2 for a site and looks at >/etc/koha/sites/<instance>/SIPconfig.xml will not see an up-to-date >version of that file, with the risk of missing possible config >opportunities. > >Since debian/templates/SIPconfig.xml contains no placeholders or >other magic stuff related to the Debian packaging, this patch simply >copies etc/SIPconfig.xml to debian/templates/SIPconfig.xml > >To test: >$Â diff etc/SIPconfig.xml debian/templates/SIPconfig.xml >There should be no difference between the files >--- > debian/templates/SIPconfig.xml | 49 ++++++++++++++++++++++++++---------------- > 1 file changed, 31 insertions(+), 18 deletions(-) > >diff --git a/debian/templates/SIPconfig.xml b/debian/templates/SIPconfig.xml >index 82bb187..40e495e 100644 >--- a/debian/templates/SIPconfig.xml >+++ b/debian/templates/SIPconfig.xml >@@ -17,7 +17,7 @@ > > <listeners> > <!-- vestigial HTTP, never implemented: just use the OPAC! >- <service >+ <service > port="0:8080/tcp" > transport="http" > protocol="NCIP/1.0" /> >@@ -32,16 +32,29 @@ > port="127.0.0.1:6001/tcp" > transport="RAW" > protocol="SIP/2.00" >+ client_timeout="600" > timeout="60" /> >+<!--- client_timeout times out active connections which have not received >+ input from the client. Many persistent connections will send a status request >+ every 5-7 mins so setting this to less than that will add instability to the connection >+ if explicitly set to zero, no timeout is applied to the connection. >+ NB the parameter timeout applies to the login process only and should be set to a lower value >+ to time out failed connections >+--> > </listeners> > > <accounts> >- <login id="term1" password="term1" delimiter="|" error-detect="enabled" institution="CPL" /> >- <login id="koha" password="koha" delimiter="|" error-detect="enabled" institution="kohalibrary" /> >- <login id="koha2" password="koha" institution="kohalibrary2" /> >+ <login id="term1" password="term1" delimiter="|" error-detect="enabled" institution="CPL" encoding="ascii" checked_in_ok="1" /> >+ <login id="koha" password="koha" delimiter="|" error-detect="enabled" institution="kohalibrary" encoding="utf8" /> >+ <login id="koha2" password="koha" institution="kohalibrary2" terminator="CR" /> > <login id="lpl-sc" password="1234" institution="LPL" /> > <login id="lpl-sc-beacock" password="xyzzy" >- delimiter="|" error-detect="enabled" institution="LPL" /> >+ delimiter="|" error-detect="enabled" institution="LPL" >+ send_patron_home_library_in_af="1" >+ av_field_template="[% accountline.description %] [% accountline.amountoutstanding | format('%.2f') %]" > >+ <screen_msg_regex find="Greetings from Koha." replace="Welcome to your library!" /> >+ <screen_msg_regex find="Invalid patron barcode." replace="Barcode not found, are you sure this is your library card?" /> >+ </login> > </accounts> > > <!-- >@@ -54,31 +67,31 @@ in our case "ILS". > <institutions> > <institution id="MAIN" implementation="ILS" parms=""> > <policy checkin="true" renewal="true" checkout="true" >- status_update="false" offline="false" >- timeout="100" >- retries="5" /> >+ status_update="false" offline="false" >+ timeout="100" >+ retries="5" /> > </institution> > <institution id="CPL" implementation="ILS" parms=""> > <policy checkin="true" renewal="true" checkout="true" >- status_update="false" offline="false" >- timeout="25" >- retries="5" /> >+ status_update="false" offline="false" >+ timeout="25" >+ retries="5" /> > </institution> > <institution id="kohalibrary" implementation="ILS" parms=""> > <policy checkin="true" renewal="false" checkout="true" >- status_update="false" offline="false" >- timeout="100" >- retries="5" /> >+ status_update="false" offline="false" >+ timeout="100" >+ retries="5" /> > </institution> > <institution id="kohalibrary2" implementation="ILS" parms=""> > <policy checkin="true" renewal="false" checkout="true" >- timeout="100" >- retries="3" /> >+ timeout="100" >+ retries="3" /> > </institution> > <institution id="LPL" implementation="ILS"> > <policy checkin="true" renewal="false" checkout="true" >- timeout="100" >- retries="5" /> >+ timeout="100" >+ retries="5" /> > </institution> > </institutions> > </acsconfig> >-- >2.7.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17228
:
55051
|
55052
|
55053
|
55054
|
55090
|
55106
|
55107
|
157677