[open-ils-commits] [GIT] Evergreen ILS branch tags/rel_2_10_11 created. 0ce159e3c039fc220d01e92ef32f2ee884affa51
Evergreen Git
git at git.evergreen-ils.org
Wed Apr 19 15:25:23 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, tags/rel_2_10_11 has been created
at 0ce159e3c039fc220d01e92ef32f2ee884affa51 (commit)
- Log -----------------------------------------------------------------
commit 0ce159e3c039fc220d01e92ef32f2ee884affa51
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Wed Apr 19 14:32:25 2017 -0400
Bumping version numbers and adding Changelog
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/ChangeLog b/ChangeLog
index 1f72b2c..d8ae490 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,581 @@
-Evergreen doesn't keep a GNU-style ChangeLog except in release tarballs.
-Those seeking a change log are encouraged to run 'git log -v', or read
-it online at: http://git.evergreen-ils.org/?p=Evergreen.git;a=log
+commit b01ca85655e3a0272a21883e7d600aa422c0ce53
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Wed Apr 19 14:28:11 2017 -0400
+
+ update upgrade instructions for 2.10.11
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+19 18 docs/installation/server_upgrade.txt
+
+commit 5bcd0af9c6962f4aaa04f607db44b78d85a3b4f8
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Wed Apr 19 14:23:24 2017 -0400
+
+ 2.10.10-2.10.11 schema update
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+45 0 Open-ILS/src/sql/Pg/version-upgrade/2.10.10-2.10.11-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.10.10-2.10.11-upgrade-db.sql
+
+commit cadabc997aaf3c28dfacce4c66f317433f58ac35
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Wed Apr 19 12:09:14 2017 -0400
+
+ Docs: Release notes for the 2.10.11 maintenance release
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+69 14 docs/RELEASE_NOTES_2_10.adoc
+
+commit c7a6edbd764f6510d6edeb613c01150e46d7336a
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Tue Apr 18 11:06:03 2017 -0400
+
+ LP#1670407 Add tests for xact_finish close/re-open
+
+ Since this bug came about due to negative balance changes (and it was
+ easier), this commit extends the existing negative balances test suite
+ to include basic tests for checking both xact_finish conditions.
+
+ One of these tests fails without the fix from the previous commit.
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+11 1 Open-ILS/src/perlmods/live_t/09-lp1198465_neg_balances.t
+
+commit 5acf9948104430631d3607b604024a72d85d2986
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Tue Mar 28 14:15:44 2017 -0400
+
+ LP#1670407 Lost checkin re-opens transaction
+
+ Avoid re-closing a circulation that was re-opened during checkin because
+ it acquired a non-zero balance. This is typically caused by, for
+ example, voiding a lost item fee during checkin and/or generating
+ overdues for lost-then-found items.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+
+24 6 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+
+commit 1ef608808fbb5266b801a618d0f8bc4757f350be
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Tue Mar 28 07:23:46 2017 -0400
+
+ Docs: adding more to the config.tt2 variable list
+
+ Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
+
+2 1 docs/opac/new_skin_customizations.txt
+
+commit 5c1ca0067e0ef5dca154f31d5aa74dd274c29912
+Author: Jane Sandberg <sandbej at linnbenton.edu>
+Date: Mon Mar 27 23:14:36 2017 -0400
+
+ Docs: adding to the list of config.tt2 variables
+
+3 0 docs/opac/new_skin_customizations.txt
+
+commit 9f9d890bd0ca6912fe2f0465c31601ec381add12
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Wed Mar 22 09:58:39 2017 -0400
+
+ LP#1675025: Docs: mention that Vandelay can load MARCXML
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+ Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+3 3 docs/cataloging/batch_importing_MARC.txt
+
+commit 210240837a7c040d73016fdfdc80e54dd1620685
+Author: Ben Shum <ben at evergreener.net>
+Date: Tue Mar 21 09:37:48 2017 -0400
+
+ Docs: README to include Debian for changing ownership of /var/lock/apache2
+
+ Minor tweak to also include Debian among distributions where it might
+ be necessary to change ownership of /var/lock/apache2 to opensrf user.
+ Previously this had been Ubuntu only issue, but has since been encountered
+ during new Debian installations.
+
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+1 1 docs/installation/server_installation.txt
+
+commit 403becfc04b6a130db5d4ed12bfc234303753668
+Author: Remington Steed <rjs7 at calvin.edu>
+Date: Thu Sep 29 14:55:41 2016 -0400
+
+ LP#1586567 Always return Fund Years sorted descending
+
+ Currently, fund year selectors in Acq interfaces (at least Acq Admin ->
+ Funds, and Acq -> Load MARC Order Records) show the fund years in
+ database order. This commit adds a descending sort to the perl function
+ that retrieves fund years for those interfaces. It also removes the
+ unsuccessful attempt at sorting that was present in the dojo code.
+
+ Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+ Signed-off-by: Dawn Dale <ddale at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+5 2 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Financials.pm
+0 1 Open-ILS/web/js/ui/default/acq/financial/list_funds.js
+0 1 Open-ILS/web/js/ui/default/acq/picklist/upload.js
+
+commit 0c9754c15a5fafbad6818f84a58b6565e51cde72
+Author: Christine Morgan <cmorgan at noblenet.org>
+Date: Wed Mar 1 11:12:02 2017 -0500
+
+ lp1629016: Hide List Option In Staff Client
+
+ This will hide the option to add to Lists when in the staff client.
+
+ Signed-off-by: Christine Morgan <cmorgan at noblenet.org>
+ Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+ Conflicts:
+ Open-ILS/src/templates/opac/parts/record/summary.tt2
+
+3 1 Open-ILS/src/templates/opac/parts/record/summary.tt2
+2 0 Open-ILS/src/templates/opac/parts/result/table.tt2
+
+commit c532b0a376be74859824b211685b99e99102a7b5
+Author: Jason Etheridge <jason at esilibrary.com>
+Date: Wed Nov 2 14:28:08 2016 -0400
+
+ lp1261835 stop colliding bill UI refreshes
+
+ for want of promises in Angular :)
+
+ population of the bill list in this implementation is asynchronous, but the rest
+ of the refresh action is not, and it's sadly being invoked multiple times. There
+ are different ways to fix this, but using a semaphore seems to work.
+
+ Signed-off-by: Jason Etheridge <jason at esilibrary.com>
+ Signed-off-by: Dawn Dale <ddale at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+15 8 Open-ILS/xul/staff_client/server/patron/bill2.js
+
+commit 1021ba646946027a5cafc816945d138c919f9d0d
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Wed Nov 2 14:35:16 2016 -0400
+
+ LP#1175293 Use filtered fund dropdown in funding source interface
+
+ The exising interface for allocating to funds from a funding source
+ view lists all funds by code only. Since many (most?) orgs reuse
+ fund codes year to year, you eventually end up with a bunch of
+ dupes you cannot tell apart.
+
+ Let's "borrow" an AutoFieldWidget to do the heavy lifting of creating
+ a filtered list of active funds, and include the year for further
+ user validation.
+
+ This is inspired by a few other fund dropdowns, but may not be the
+ best overall solution.
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+3 14 Open-ILS/src/templates/acq/funding_source/view.tt2
+15 0 Open-ILS/web/js/ui/default/acq/financial/view_funding_source.js
+
+commit db460bd97d5ede6d911baf8c28a182e2e1e8c0c8
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Tue Feb 28 11:33:25 2017 -0500
+
+ LP#1668682 Checkout holds fullfill ignores expire time
+
+ Checking out a hold-captured item for a hold whose expire time is in the
+ past, but has not yet been canceled by the hold targeter, now marks the
+ hold as fulfilled.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 5 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+
+commit 7d92425baffa8a09e2cf4441aa4f273040c43d40
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Sat Mar 11 23:05:15 2017 -0500
+
+ LP#1442276: Stamp schema upgrade for corrupted XSL output
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+1 1 Open-ILS/src/sql/Pg/002.schema.config.sql
+43 0 Open-ILS/src/sql/Pg/upgrade/1030.function.oils_xslt_process_utf8_fix.sql
+0 43 Open-ILS/src/sql/Pg/upgrade/xxxx.function.oils_xslt_process_utf8_fix
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/1030.function.oils_xslt_process_utf8_fix.sql
+ delete mode 100644 Open-ILS/src/sql/Pg/upgrade/xxxx.function.oils_xslt_process_utf8_fix
+
+commit b0b78a31e0be2854f7acea15524ce0a9013eb76c
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Fri Mar 10 22:53:18 2017 -0500
+
+ LP#1442276: Upgrade script for Encoding UTF8 output
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+43 0 Open-ILS/src/sql/Pg/upgrade/xxxx.function.oils_xslt_process_utf8_fix
+ create mode 100644 Open-ILS/src/sql/Pg/upgrade/xxxx.function.oils_xslt_process_utf8_fix
+
+commit 1ef57ea57c1109822f092e8f03bfa051783effdc
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Sun Mar 5 11:45:12 2017 -0500
+
+ LP#1442276 output_as_chars() instead of toString
+
+ The SuperCat transform methods for records retrieved by record ID or ISBN call
+ toString on the XSLT output object, which results in a byte string and thus
+ corrupted output. Instead, call output_as_chars() on the stylesheet object to
+ generate a character string and avoid corruption.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+4 2 Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm
+
+commit 4f2604a7209613cc01acca1db91a79e2fe247803
+Author: Dan Scott <dan at coffeecode.net>
+Date: Fri Mar 3 16:03:30 2017 -0500
+
+ LP#1442276 pgTAP test for oils_xslt_process
+
+ In moving from the deprecated XML::LibXSLT::output_string() to output_as_chars(),
+ add a regression test to ensure that we do not suffer from corrputed encoding
+ output in the future.
+
+ We test both the case where an output encoding has been explicitly declared,
+ as well as the case where an output encoding has not been explicitly declared.
+ It was this subtle difference that was causing the problem with output_string().
+
+ Signed-off-by: Dan Scott <dan at coffeecode.net>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+45 0 Open-ILS/src/sql/Pg/t/regress/lp1442276_oils_xslt_encoding.pg
+ create mode 100644 Open-ILS/src/sql/Pg/t/regress/lp1442276_oils_xslt_encoding.pg
+
+commit f6203116e2623d9be0be8be6b0e6143e574179b3
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Fri Mar 3 01:40:19 2017 -0500
+
+ LP#1442276 Prevent corrupted Unicode chars in MARCTXT and RIS
+
+ The MARCTXT and RIS feeds use the deprecated XML::LibXSLT::output_string()
+ method which, depending on the stylesheet, generated either a byte string
+ or characters. Using output_as_bytes() ensures it is always a byte string
+ and avoids the resulting MARCTXT and RIS output from corrupting Unicode
+ characters.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+2 2 Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat/Feed.pm
+
+commit 5f796d1a6eb6e7fc902e3465981aabef63ad0934
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Fri Mar 3 01:26:53 2017 -0500
+
+ LP#1442276 Encode UTF8 output of XSLT transforms
+
+ The XML::LibXSLT::output_string() method was deprecated in favour of
+ output_as_bytes() and output_as_chars(). The latter always generates
+ UTF8 output as characters, which is what we need, while output_string()
+ behaviour depended on the stylesheet.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 1 Open-ILS/src/sql/Pg/002.functions.config.sql
+
+commit 6b07dc757f3fc30f0f39db54b1d5d5ebed40b988
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Mon Feb 27 12:32:45 2017 -0500
+
+ LP#1576435 Inactive patron search propagation rapair
+
+ Fix a small code thinko in the propagation of the 'inactive' flag
+ for patron-editor duplicate patron searches.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 1 Open-ILS/web/js/ui/default/staff/circ/patron/app.js
+
+commit a6da6d0936114d278561360f9756cd6a5ac60248
+Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
+Date: Fri May 27 13:10:29 2016 -0700
+
+ LP#1576435: Include inactive patrons on patron reg duplicate search in web client
+
+ Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 1 Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+12 0 Open-ILS/web/js/ui/default/staff/circ/patron/app.js
+
+commit dda300f6946bbc6198715629c451495d641bb463
+Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
+Date: Sat Apr 23 19:12:27 2016 -0700
+
+ LP#1576435: Force "Include inactive patrons?" on patron reg duplicate search
+
+ In the XUL client, duplicate patron checking in the patron registration
+ interface now includes inactive patrons (see LP#1217052). However, if
+ you click on the link "Found X patron(s) with the same name," the
+ resulting patron search does not always include inactive patrons by
+ default (instead, the value of the "Include inactive patrons?" checkbox
+ is cached from your last patron search, as usual).
+
+ To prevent user confusion in this scenario, this commit forces the
+ linked patron search in the XUL client to always include inactive
+ patrons.
+
+ Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 0 Open-ILS/web/js/ui/default/actor/user/register.js
+10 1 Open-ILS/xul/staff_client/server/patron/search_form.js
+
+commit b969b551afc8253f97c3a85b1b7783e857f70dc8
+Author: Terran McCanna <tmccanna at georgialibraries.org>
+Date: Mon Jun 6 13:38:32 2016 -0400
+
+ LP#1528647 Self-check only accepts user name value if regex for barcode
+ not set up
+
+ The original fix only worked if password was not required for self-check.
+ This fix allows it to work when password is required as well.
+
+ Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+6 2 Open-ILS/web/js/dojo/openils/User.js
+
+commit 0d68ad7807620f6040b9dc5a644ad94a2e8c0ed2
+Author: Bob Wicksall <bwicksall at pls-net.org>
+Date: Mon Jun 6 13:35:28 2016 -0400
+
+ LP#1528647 Self-check only accepts user name value if regex
+ for barcode not set up
+
+ This fix allows a patron to log into the self-check interface with either
+ a barcode or a user name.
+
+ Written by: Bob Wicksall <bwicksall at pls-net.org>
+
+ Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+5 1 Open-ILS/web/js/ui/default/circ/selfcheck/selfcheck.js
+
+commit 5cd40451fab07c436957aac5cbc103630d8a2afe
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Wed Feb 22 11:29:21 2017 -0500
+
+ LP1584891: Export MARC holdings with UTF8 subfields
+
+ The --items option of marc_export adds a new MARC 852 field with a
+ number of subfields that it retrieves from the database. If those
+ subfields (such as call number, copy location, etc) contain Unicode
+ characters, then we need to decode the incoming UTF8 characters
+ when adding the subfield values to avoid corrupting the MARC.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+
+8 7 Open-ILS/src/support-scripts/marc_export.in
+
+commit 0716d6172ebcd7f57c298eab8e48cd21fe299de2
+Author: Dan Wells <dbw2 at calvin.edu>
+Date: Tue Aug 30 21:50:19 2016 -0400
+
+ LP#1618624 Fix thinko in adjust-to-zero
+
+ It appears that this test was written for an 'unless' instead of
+ an 'if'. 'if' seems just as natural here, so let's go that route.
+
+ This should prevent us from closing circulations prematurely, and
+ also close them when we need to.
+
+ Signed-off-by: Dan Wells <dbw2 at calvin.edu>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Money.pm
+
+commit 91308bd5fcc0e6631cc477b858daffe1145cff6e
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Fri Mar 3 14:48:56 2017 -0500
+
+ Docs: trivial typo
+
+ s/retriving/retrieving/
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+1 1 docs/installation/server_installation.txt
+
+commit 5f6a1bb64afe8de6d286456fd1b45ea7760a8da1
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Fri Feb 24 18:04:29 2017 -0500
+
+ LP#1667835: avoid edi_fetcher.pl crash upon fetching zero-length file
+
+ This patch fixes an issue that could cause edi_fetcher.pl to crash
+ if the EDI partner supplies a zero-length file for Net::FTP to
+ download; such files are now skipped.
+
+ Testing would entail setting up an FTP server that contains a
+ zero-length file, then setting up an EDI remote account and
+ using edi_fetcher.pl to try to retrieve the file.
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+ Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+11 0 Open-ILS/src/perlmods/lib/OpenILS/Utils/RemoteAccount.pm
+
+commit edf891c6431208b15d4bfbc1f10563d525a44f1f
+Author: Jonathan Schatz <jonathan.schatz at bc.libraries.coop>
+Date: Thu Nov 3 01:51:12 2016 -0700
+
+ Replace the 'broken cover' image asset with an actually transparent single-pixel PNG.
+ Useful for fallback to a placeholder cover.
+
+ Signed-off-by: Jonathan Schatz <jonathan.schatz at bc.libraries.coop>
+ Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
+ Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+- - Open-ILS/web/opac/images/blank.png
+
+commit 0d65cb2498bc12da7f956fb75a1b69f5b71ac47c
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Mon Feb 27 10:09:09 2017 -0500
+
+ LP#1371772: update normalization library info URLs
+
+ This patch follows up on the previous patch by adjusting
+ the normalization of URLs when the lib.prefer_external_url
+ library setting is set to true.
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+1 1 Open-ILS/src/templates/opac/parts/library_name_link.tt2
+
+commit bfa959111f8503bad9c6176337ab3a82db645df9
+Author: Jason Boyer <jboyer at library.in.gov>
+Date: Mon Feb 13 16:59:01 2017 -0500
+
+ LP1371772: Correct Escape of Library Info URL
+
+ Using the url filter in TT2 causes named anchors to
+ be escaped in such a way that urls including them
+ will likely return a 404. Since the url is being
+ used in an html document, the html filter is
+ sufficient and allows the url to work as intended.
+
+ Signed-off-by: Jason Boyer <jboyer at library.in.gov>
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+1 1 Open-ILS/src/templates/opac/parts/library/core_info.tt2
+
+commit 9b691ffa235da8c7028ee28d16f4fd1d72697e88
+Author: Michele Morgan <mmorgan at noblenet.org>
+Date: Tue Feb 7 13:21:48 2017 -0500
+
+ LP#1661754 - Prevent staff users from marking a Long Overdue item Lost
+
+ Prevents circulations that are already Lost or Long Overdue from being
+ marked Lost or Long Overdue. Avoiding patrons being billed twice for the
+ same item.
+
+ Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+3 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm
+
+commit e9373ffd2c4d97d3063d9e0b29941d77d54892a4
+Author: Bill Erickson <berickxx at gmail.com>
+Date: Tue Feb 14 10:53:54 2017 -0500
+
+ LP#1662902: do not re-download EDI files that failed parsing
+
+ Avoid fetching and creating edi_message entries for EDI messages that
+ the system cannot parse.
+
+ In the event parsing failed due to a temporary condition (e.g. Ruby
+ translator was not running), messages can be reprocessed by either
+ deleting the offending edi_message row or setting its status to 'retry'.
+
+ See previous commit ("LP#1662902: do not re-download EDI files that
+ failed processing") for a more detailed explanation.
+
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/EDI.pm
+
+commit 4b9ca1e9e0e68de271fa5e3e0b9663c32c230070
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Thu Feb 9 12:24:35 2017 -0500
+
+ LP#1662902: do not re-download EDI files that failed processing
+
+ At present, the EDI fetcher ignores files (as determined by file
+ name and EDI account details) that were already successfully
+ processed. With this patch, ones that failed processing (e.g.,
+ acq.edi_message.state = 'proc_error') previously are ignored
+ as well.
+
+ This is because most processing errors reflect conditions that
+ require some sort of manual intervention on the part of the materials
+ vendor or the Evergreen user; having edi_fetcher.pl simply redownload
+ and attempt to process the file has no effect other than causing
+ the acq.edi_message table to grow.
+
+ With this patch, the appearance of rows in acq.edi_message whose
+ state is 'proc_error' should be taken as a signal to the Evergreen
+ admin to investigate and resolve whatever issue caused the
+ message to not be processed; after doing that, removing the
+ acq.edi_message rows will allow the file to be downloaded again
+ (assuming it's still available on the file server).
+
+ To test
+ -------
+ [1] Arrange to create or simulate an EDI message that failed
+ processing.
+ [2] Run edi_fetcher.pl to have it attempt to download the
+ failed message in step #1; verify that the file is
+ /not/ downloaded again and that no additonal acq.edi_message
+ rows are created for it.
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+ Signed-off-by: Bill Erickson <berickxx at gmail.com>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/EDI.pm
+
+commit 364c3fa7dddaff6c1252eb5f7aa09691a0289e70
+Author: Galen Charlton <gmc at equinoxinitiative.org>
+Date: Thu Feb 16 17:03:45 2017 -0500
+
+ update upgrade instructions for 2.10.10
+
+ Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
+
+19 18 docs/installation/server_upgrade.txt
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index d750216..f32a5ac 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
@@ -7,7 +7,7 @@ use OpenILS::Utils::Fieldmapper;
sub ils_version {
# version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0
# For branches, format is "x-y"
- return "HEAD";
+ return "2-10-11";
}
__PACKAGE__->register_method(
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index a711c4e..f934d87 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,6 +92,7 @@ CREATE TRIGGER no_overlapping_deps
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1030', :eg_version); -- dbs/kmlussier
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.10.11', :eg_version);
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html
index 7b2b3f5..a0c01a3 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/about.html
+++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html
@@ -1,7 +1,7 @@
<html><head><script></script></head><body onload="var x = document.getElementById('version'); var version ='/xul/server/'.split(/\//)[2]; if (version == 'server') { version = 'versionless debug build'; } x.appendChild(document.createTextNode(version));">
<h1 style="text-decoration: underline">Evergreen</h1>
<p>Target Server ID: <span id="version"></span></p>
-<p>$HeadURL$</p>
+<p>http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_10_11</p>
<h2>What is Evergreen?</h2>
<blockquote>
<p>
diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
index 0613a13..2c27f44 100644
--- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
+++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
@@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main");
pref("open-ils.enable_join_tabs", true);
// We'll use this one to help brand some build information into the client, and rely on subversion keywords
-pref("open-ils.repository.headURL","$HeadURL$");
+pref("open-ils.repository.headURL","http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_10_11");
pref("open-ils.repository.author","$Author$");
pref("open-ils.repository.revision","$Revision$");
pref("open-ils.repository.date","$Date$");
diff --git a/Open-ILS/xul/staff_client/windowssetup.nsi b/Open-ILS/xul/staff_client/windowssetup.nsi
index a954357..07050a7 100644
--- a/Open-ILS/xul/staff_client/windowssetup.nsi
+++ b/Open-ILS/xul/staff_client/windowssetup.nsi
@@ -3,7 +3,7 @@
; HM NIS Edit Wizard helper defines
; Old versions of makensis don't like this, moved to Makefile
;!define /file PRODUCT_VERSION "client/VERSION"
-!define PRODUCT_TAG "Master"
+!define PRODUCT_TAG "2.10"
!define PRODUCT_INSTALL_TAG "${PRODUCT_TAG}"
!define UI_IMAGESET "beta"
;!define UI_IMAGESET "release"
diff --git a/README b/README
deleted file mode 120000
index b57451a..0000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-docs/installation/server_installation.txt
\ No newline at end of file
diff --git a/README b/README
new file mode 100644
index 0000000..e3e1481
--- /dev/null
+++ b/README
@@ -0,0 +1,748 @@
+Installing the Evergreen server
+===============================
+:toc:
+:numbered:
+
+Preamble: referenced user accounts
+----------------------------------
+
+In subsequent sections, we will refer to a number of different accounts, as
+follows:
+
+ * Linux user accounts:
+ ** The *user* Linux account is the account that you use to log onto the
+ Linux system as a regular user.
+ ** The *root* Linux account is an account that has system administrator
+ privileges. On Debian and Fedora you can switch to this account from
+ your *user* account by issuing the `su -` command and entering the
+ password for the *root* account when prompted. On Ubuntu you can switch
+ to this account from your *user* account using the `sudo su -` command
+ and entering the password for your *user* account when prompted.
+ ** The *opensrf* Linux account is an account that you create when installing
+ OpenSRF. You can switch to this account from the *root* account by
+ issuing the `su - opensrf` command.
+ ** The *postgres* Linux account is created automatically when you install
+ the PostgreSQL database server. You can switch to this account from the
+ *root* account by issuing the `su - postgres` command.
+ * PostgreSQL user accounts:
+ ** The *evergreen* PostgreSQL account is a superuser account that you will
+ create to connect to the PostgreSQL database server.
+ * Evergreen administrator account:
+ ** The *egadmin* Evergreen account is an administrator account for
+ Evergreen that you will use to test connectivity and configure your
+ Evergreen instance.
+
+Preamble: developer instructions
+--------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/egdownloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, must perform one step before they
+can proceed with the `./configure` step.
+
+As the *user* Linux account, issue the following command in the Evergreen
+source directory to generate the configure script and Makefiles:
+
+[source, bash]
+------------------------------------------------------------------------------
+autoreconf -i
+------------------------------------------------------------------------------
+
+Installing prerequisites
+------------------------
+
+ * **PostgreSQL**: Version 9.3 is recommended. The minimum supported version
+ is 9.1.
+ * **Linux**: Evergreen 2.8 has been tested on Debian Jessie (8.0),
+ Debian Wheezy (7.0), Ubuntu Trusty Tahr (14.04),
+ Ubuntu Precise Pangolin (12.04), and Fedora.
+ If you are running an older version of these distributions, you may want
+ to upgrade before upgrading Evergreen. For instructions on upgrading these
+ distributions, visit the Debian, Ubuntu or Fedora websites.
+ * **OpenSRF**: The minimum supported version of OpenSRF is 2.4.0.
+
+
+Evergreen has a number of prerequisite packages that must be installed
+before you can successfully configure, compile, and install Evergreen.
+
+1. Begin by installing the most recent version of OpenSRF (2.4.0 or later).
+ You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/
+2. On some distributions, it is necessary to install PostgreSQL 9.1+ from external
+ repositories.
++
+ * Debian Wheezy and Jessie Ubuntu Precise and Trusty comes with
+ PostgreSQL 9.1+, so no additional steps are required.
+ * Fedora 19 and 20 come with PostgreSQL 9.2+, so no additional steps are required.
++
+3. On Debian and Ubuntu, run `aptitude update` as the *root* Linux account to
+ retrieve the new packages from the backports repository.
+4. Issue the following commands as the *root* Linux account to install
+ prerequisites using the `Makefile.install` prerequisite installer,
+ substituting `debian-jessie`, `debian-wheezy`, `fedora`,
+ `ubuntu-trusty`, or `ubuntu-precise` for <osname> below:
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>
+------------------------------------------------------------------------------
++
+5. Add the libdbi-libdbd libraries to the system dynamic library path by
+ issuing the following commands as the *root* Linux account:
++
+[NOTE]
+You should skip this step if installing on Ubuntu Precise, Trusty or Debian Jessie. The ubuntu
+and Debian Jessie targets use libdbd-pgsql from packages.
++
+.Debian Wheezy
+[source, bash]
+------------------------------------------------------------------------------
+echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf
+ldconfig
+------------------------------------------------------------------------------
++
+.Fedora
+[source, bash]
+------------------------------------------------------------------------------
+echo "/usr/lib64/dbd" > /etc/ld.so.conf.d/eg.conf
+ldconfig
+------------------------------------------------------------------------------
+
+6. OPTIONAL: Developer additions
++
+To perform certain developer tasks from a Git source code checkout,
+additional packages may be required. As the *root* Linux account:
++
+ * To install packages needed for retrieving and managing web dependencies,
+ use the <osname>-developer Makefile.install target. Currently,
+ this is only needed for building and installing the (preview) browser
+ staff client.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-developer
+------------------------------------------------------------------------------
++
+ * To install packages required for building Evergreen release bundles, use
+ the <osname>-packager Makefile.install target.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-packager
+------------------------------------------------------------------------------
+
+Optional: Extra steps for browser-based staff client
+----------------------------------------------------
+
+[NOTE]
+Skip this entire section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/downloads
+
+[NOTE]
+You make skip the subsection `Install dependencies for browser-based staff client'
+if you are installing on either Debian Jessie or Ubuntu Trusty and you have
+installed the `Optional: Developer Additions' described above. You will still
+need to do the steps in `Install files for browser-based staff client' below.
+
+Install dependencies for browser-based staff client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Install Node.js. For more information see also:
+ https://github.com/joyent/node/wiki/installation[Node.js Installation]
++
+[source,sh]
+------------------------------------------------------------------------------
+# Go to a temporary directory
+cd /tmp
+
+# Clone the code and checkout the necessary version
+git clone https://github.com/joyent/node.git
+cd node
+git checkout -b v0.10.28 v0.10.28
+
+# set -j to the number of CPU cores on the server + 1
+./configure && make -j2 && sudo make install
+
+# update packages
+% sudo npm update
+------------------------------------------------------------------------------
++
+2. Install Grunt CLI
++
+[source,sh]
+------------------------------------------------------------------------------
+% sudo npm install -g grunt-cli
+------------------------------------------------------------------------------
++
+3. Install Bower
++
+[source,sh]
+------------------------------------------------------------------------------
+% sudo npm install -g bower
+------------------------------------------------------------------------------
+
+Install files for browser-based staff client
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Building, Testing, Minification: The remaining steps all take place within
+ the staff JS web root:
++
+[source,sh]
+------------------------------------------------------------------------------
+cd $EVERGREEN_ROOT/Open-ILS/web/js/ui/default/staff/
+------------------------------------------------------------------------------
++
+2. Install Project-local Dependencies. npm inspects the 'package.json' file
+ for dependencies and fetches them from the Node package network.
++
+[source,sh]
+------------------------------------------------------------------------------
+npm install # fetch Grunt dependencies
+bower install # fetch JS dependencies
+------------------------------------------------------------------------------
++
+3. Run the build script.
++
+[source,sh]
+------------------------------------------------------------------------------
+# build, run tests, concat+minify
+grunt all
+------------------------------------------------------------------------------
+
+
+Configuration and compilation instructions
+------------------------------------------
+
+For the time being, we are still installing everything in the `/openils/`
+directory. From the Evergreen source directory, issue the following commands as
+the *user* Linux account to configure and build Evergreen:
+
+[source, bash]
+------------------------------------------------------------------------------
+PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
+make
+------------------------------------------------------------------------------
+
+These instructions assume that you have also installed OpenSRF under `/openils/`.
+If not, please adjust PATH as needed so that the Evergreen `configure` script
+can find `osrf_config`.
+
+Installation instructions
+-------------------------
+
+1. Once you have configured and compiled Evergreen, issue the following
+ command as the *root* Linux account to install Evergreen, build the server
+ portion of the staff client, and copy example configuration files to
+ `/openils/conf`.
+ Change the value of the `STAFF_CLIENT_STAMP_ID` variable to match the version
+ of the staff client that you will use to connect to the Evergreen server.
++
+[source, bash]
+------------------------------------------------------------------------------
+make STAFF_CLIENT_STAMP_ID=rel_2_10_11 install
+------------------------------------------------------------------------------
++
+2. The server portion of the staff client expects `http://hostname/xul/server`
+ to resolve. Issue the following commands as the *root* Linux account to
+ create a symbolic link pointing to the `server` subdirectory of the server
+ portion of the staff client that we just built using the staff client ID
+ 'rel_name':
++
+[source, bash]
+------------------------------------------------------------------------------
+cd /openils/var/web/xul
+ln -sf rel_name/server server
+------------------------------------------------------------------------------
+
+Change ownership of the Evergreen files
+---------------------------------------
+
+All files in the `/openils/` directory and subdirectories must be owned by the
+`opensrf` user. Issue the following command as the *root* Linux account to
+change the ownership on the files:
+
+[source, bash]
+------------------------------------------------------------------------------
+chown -R opensrf:opensrf /openils
+------------------------------------------------------------------------------
+
+Additional Instructions for Developers
+--------------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/egdownloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, need to install the Dojo Toolkit
+set of JavaScript libraries. The appropriate version of Dojo is included in
+Evergreen release tarballs. Developers should install the Dojo 1.3.3 version
+of Dojo by issuing the following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz
+tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz
+cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/.
+------------------------------------------------------------------------------
+
+
+Configure the Apache Web server
+-------------------------------
+
+. Use the example configuration files in `Open-ILS/examples/apache/` (for
+Apache versions below 2.4) or `Open-ILS/examples/apache_24/` (for Apache
+versions 2.4 or greater) to configure your Web server for the Evergreen
+catalog, staff client, Web services, and administration interfaces. Issue the
+following commands as the *root* Linux account:
++
+.Debian Wheezy and Ubuntu Precise
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/
+cp Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/
+cp Open-ILS/examples/apache/eg_startup /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------
++
+.Ubuntu Trusty and Debian Jessie
+[source,bash]
+------------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf /etc/apache2/sites-available/eg.conf
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/apache2/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------------
++
+.Fedora
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf /etc/httpd/conf.d/
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/httpd/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup /etc/httpd/
+# Now set up SSL
+mkdir /etc/httpd/ssl
+cd /etc/httpd/ssl
+------------------------------------------------------------------------------
++
+. The `openssl` command cuts a new SSL key for your Apache server. For a
+production server, you should purchase a signed SSL certificate, but you can
+just use a self-signed certificate and accept the warnings in the staff client
+and browser during testing and development. Create an SSL key for the Apache
+server by issuing the following command as the *root* Linux account:
++
+[source,bash]
+------------------------------------------------------------------------------
+openssl req -new -x509 -days 365 -nodes -out server.crt -keyout server.key
+------------------------------------------------------------------------------
++
+. As the *root* Linux account, edit the `eg.conf` file that you copied into
+place.
+ a. To enable access to the offline upload / execute interface from any
+ workstation on any network, make the following change (and note that
+ you *must* secure this for a production instance):
+ * (Apache 2.2): Replace `Allow from 10.0.0.0/8` with `Allow from all`
+ * (Apache 2.4): Replace `Require host 10.0.0.0/8` with `Require all granted`
+ b. (Fedora): Change references from the non-existent `/etc/apache2/` directory
+ to `/etc/httpd/`.
+. Change the user for the Apache server.
+ * (Debian and Ubuntu): As the *root* Linux account, edit
+ `/etc/apache2/envvars`. Change `export APACHE_RUN_USER=www-data` to
+ `export APACHE_RUN_USER=opensrf`.
+ * (Fedora): As the *root* Linux account , edit `/etc/httpd/conf/httpd.conf`.
+ Change `User apache` to `User opensrf`.
+. As the *root* Linux account, configure Apache with KeepAlive settings
+ appropriate for Evergreen. Higher values can improve the performance of a
+ single client by allowing multiple requests to be sent over the same TCP
+ connection, but increase the risk of using up all available Apache child
+ processes and memory.
+ * (Debian and Ubuntu): Edit `/etc/apache2/apache2.conf`.
+ a. Change `KeepAliveTimeout` to `1`.
+ b. Change `MaxKeepAliveRequests` to `100`.
+ * (Fedora): Edit `/etc/httpd/conf/httpd.conf`.
+ a. Change `KeepAliveTimeout` to `1`.
+ b. Change `MaxKeepAliveRequests` to `100`.
+. As the *root* Linux account, configure the prefork module to start and keep
+ enough Apache servers available to provide quick responses to clients without
+ running out of memory. The following settings are a good starting point for a
+ site that exposes the default Evergreen catalogue to the web:
++
+.Debian Wheezy, Ubuntu Precise (`/etc/apache2/apache2.conf`) and Fedora (`/etc/httpd/conf/httpd.conf`)
+[source,bash]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+ StartServers 15
+ MinSpareServers 5
+ MaxSpareServers 15
+ MaxClients 75
+ MaxRequestsPerChild 500
+</IfModule>
+------------------------------------------------------------------------------
++
+.Ubuntu Trusty, Debian Jessie (`/etc/apache2/mods-available/mpm_prefork.conf`)
+[source,bash]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+ StartServers 15
+ MinSpareServers 5
+ MaxSpareServers 15
+ MaxRequestWorkers 75
+ MaxConnectionsPerChild 500
+</IfModule>
+------------------------------------------------------------------------------
++
+. (Ubuntu Trusty, Debian Jessie) As the *root* user,
+ enable the mpm_prefork module:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dismod mpm_event
+a2enmod mpm_prefork
+------------------------------------------------------------------------------
++
+. (Fedora): As the *root* Linux account, edit the `/etc/httpd/eg_vhost.conf`
+ file to change references from the non-existent `/etc/apache2/` directory
+ to `/etc/httpd/`.
+. (Debian Wheezy and Ubuntu Precise): As the *root* Linux account, enable the Evergreen site:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite default # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+(Ubuntu Trusty, Debian Jessie):
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite 000-default # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+. (Debian and Ubuntu): As the *root* Linux account, enable Apache to write
+ to the lock directory; this is currently necessary because Apache
+ is running as the `opensrf` user:
++
+[source,bash]
+------------------------------------------------------------------------------
+chown opensrf /var/lock/apache2
+------------------------------------------------------------------------------
+
+Learn more about additional Apache options in the following sections:
+
+ * <<_apache_rewrite_tricks,Apache Rewrite Tricks>>
+ * <<_apache_access_handler_perl_module,Apache Access Handler Perl Module>>
+
+Configure OpenSRF for the Evergreen application
+-----------------------------------------------
+There are a number of example OpenSRF configuration files in `/openils/conf/`
+that you can use as a template for your Evergreen installation. Issue the
+following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+cp -b /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml
+cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml
+------------------------------------------------------------------------------
+
+When you installed OpenSRF, you created four Jabber users on two
+separate domains and edited the `opensrf_core.xml` file accordingly. Please
+refer back to the OpenSRF README and, as the *opensrf* Linux account, edit the
+Evergreen version of the `opensrf_core.xml` file using the same Jabber users
+and domains as you used while installing and testing OpenSRF.
+
+[NOTE]
+The `-b` flag tells the `cp` command to create a backup version of the
+destination file. The backup version of the destination file has a tilde (`~`)
+appended to the file name, so if you have forgotten the Jabber users and
+domains, you can retrieve the settings from the backup version of the files.
+
+`eg_db_config`, described in <<_creating_the_evergreen_database,Creating the Evergreen
+database>>, sets the database connection information in `opensrf.xml` for you.
+
+Configure action triggers for the Evergreen application
+-------------------------------------------------------
+_Action Triggers_ provide hooks for the system to perform actions when a given
+event occurs; for example, to generate reminder or overdue notices, the
+`checkout.due` hook is processed and events are triggered for potential actions
+if there is no checkin time.
+
+To enable the default set of hooks, issue the following command as the
+*opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+cp -b /openils/conf/action_trigger_filters.json.example /openils/conf/action_trigger_filters.json
+------------------------------------------------------------------------------
+
+For more information about configuring and using action triggers, see
+<<_notifications_action_triggers,Notifications / Action Triggers>>.
+
+Creating the Evergreen database
+-------------------------------
+
+Setting up the PostgreSQL server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For production use, most libraries install the PostgreSQL database server on a
+dedicated machine. Therefore, by default, the `Makefile.install` prerequisite
+installer does *not* install the PostgreSQL 9 database server that is required
+by every Evergreen system. You can install the packages required by Debian or
+Ubuntu on the machine of your choice using the following commands as the
+*root* Linux account:
+
+.(Debian / Ubuntu / Fedora) Installing PostgreSQL server packages
+
+Each OS build target provides the postgres server installation packages
+required for each operating system. To install Postgres server packages,
+use the make target 'postgres-server-<OSTYPE>'. Choose the most appropriate
+command below based on your operating system.
+
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-jessie
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-precise
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-trusty
+make -f Open-ILS/src/extras/Makefile.install postgres-server-fedora
+------------------------------------------------------------------------------
+
+.(Fedora) Postgres initialization
+
+Installing Postgres on Fedora also requires you to initialize the PostgreSQL
+cluster and start the service. Issue the following commands as the *root* user:
+
+[source, bash]
+------------------------------------------------------------------------------
+postgresql-setup initdb
+systemctl start postgresql
+------------------------------------------------------------------------------
+
+For a standalone PostgreSQL server, install the following Perl modules for your
+distribution as the *root* Linux account:
+
+.(Ubuntu Precise)
+[source,bash]
+---------------------------------------------------------------------------------
+cpan Rose::URI
+---------------------------------------------------------------------------------
+
+.(Debian "wheezy" and Ubuntu Trusty)
+No extra modules required for these distributions.
+
+.(Fedora)
+[source, bash]
+------------------------------------------------------------------------------
+cpan Rose::URI
+------------------------------------------------------------------------------
+
+You need to create a PostgreSQL superuser to create and access the database.
+Issue the following command as the *postgres* Linux account to create a new
+PostgreSQL superuser named `evergreen`. When prompted, enter the new user's
+password:
+
+[source, bash]
+------------------------------------------------------------------------------
+createuser -s -P evergreen
+------------------------------------------------------------------------------
+
+.Enabling connections to the PostgreSQL database
+
+Your PostgreSQL database may be configured by default to prevent connections,
+for example, it might reject attempts to connect via TCP/IP or from other
+servers. To enable TCP/IP connections from localhost, check your `pg_hba.conf`
+file, found in the `/etc/postgresql/` directory on Debian and Ubuntu, and in
+the `/var/lib/pgsql/data/` directory on Fedora. A simple way to enable TCP/IP
+connections from localhost to all databases with password authentication, which
+would be suitable for a test install of Evergreen on a single server, is to
+ensure the file contains the following entries _before_ any "host ... ident"
+entries:
+
+------------------------------------------------------------------------------
+host all all ::1/128 md5
+host all all 127.0.0.1/32 md5
+------------------------------------------------------------------------------
+
+When you change the `pg_hba.conf` file, you will need to reload PostgreSQL to
+make the changes take effect. For more information on configuring connectivity
+to PostgreSQL, see
+http://www.postgresql.org/docs/devel/static/auth-pg-hba-conf.html
+
+Creating the Evergreen database and schema
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Once you have created the *evergreen* PostgreSQL account, you also need to
+create the database and schema, and configure your configuration files to point
+at the database server. Issue the following command as the *root* Linux account
+from inside the Evergreen source directory, replacing <user>, <password>,
+<hostname>, <port>, and <dbname> with the appropriate values for your
+PostgreSQL database (where <user> and <password> are for the *evergreen*
+PostgreSQL account you just created), and replace <admin-user> and <admin-pass>
+with the values you want for the *egadmin* Evergreen administrator account:
+
+[source, bash]
+------------------------------------------------------------------------------
+perl Open-ILS/src/support-scripts/eg_db_config --update-config \
+ --service all --create-database --create-schema --create-offline \
+ --user <user> --password <password> --hostname <hostname> --port <port> \
+ --database <dbname> --admin-user <admin-user> --admin-pass <admin-pass>
+------------------------------------------------------------------------------
+
+This creates the database and schema and configures all of the services in
+your `/openils/conf/opensrf.xml` configuration file to point to that database.
+It also creates the configuration files required by the Evergreen `cgi-bin`
+administration scripts, and sets the user name and password for the *egadmin*
+Evergreen administrator account to your requested values.
+
+You can get a complete set of options for `eg_db_config` by passing the
+`--help` parameter.
+
+Loading sample data
+~~~~~~~~~~~~~~~~~~~
+If you add the `--load-all-sample` parameter to the `eg_db_config` command,
+a set of authority and bibliographic records, call numbers, copies, staff
+and regular users, and transactions will be loaded into your target
+database. This sample dataset is commonly referred to as the _concerto_
+sample data, and can be useful for testing out Evergreen functionality and
+for creating problem reports that developers can easily recreate with their
+own copy of the _concerto_ sample data.
+
+Creating the database on a remote server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In a production instance of Evergreen, your PostgreSQL server should be
+installed on a dedicated server.
+
+PostgreSQL 9.1 and later
+^^^^^^^^^^^^^^^^^^^^^^^^
+To create the database instance on a remote database server running PostgreSQL
+9.1 or later, simply use the `--create-database` flag on `eg_db_config`.
+
+Starting Evergreen
+------------------
+1. As the *root* Linux account, start the `memcached` and `ejabberd` services
+(if they aren't already running):
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/ejabberd start
+/etc/init.d/memcached start
+------------------------------------------------------------------------------
++
+2. As the *opensrf* Linux account, start Evergreen. The `-l` flag in the
+following command is only necessary if you want to force Evergreen to treat the
+hostname as `localhost`; if you configured `opensrf.xml` using the real
+hostname of your machine as returned by `perl -ENet::Domain 'print
+Net::Domain::hostfqdn() . "\n";'`, you should not use the `-l` flag.
++
+[source, bash]
+------------------------------------------------------------------------------
+osrf_control -l --start-all
+------------------------------------------------------------------------------
++
+ ** If you receive the error message `bash: osrf_control: command not found`,
+ then your environment variable `PATH` does not include the `/openils/bin`
+ directory; this should have been set in the *opensrf* Linux account's
+ `.bashrc` configuration file. To manually set the `PATH` variable, edit the
+ configuration file `~/.bashrc` as the *opensrf* Linux account and add the
+ following line:
++
+[source, bash]
+------------------------------------------------------------------------------
+export PATH=$PATH:/openils/bin
+------------------------------------------------------------------------------
++
+3. As the *opensrf* Linux account, generate the Web files needed by the staff
+ client and catalogue and update the organization unit proximity (you need to do
+ this the first time you start Evergreen, and after that each time you change the library org unit configuration.
+):
++
+[source, bash]
+------------------------------------------------------------------------------
+autogen.sh
+------------------------------------------------------------------------------
++
+4. As the *root* Linux account, restart the Apache Web server:
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/apache2 restart
+------------------------------------------------------------------------------
++
+If the Apache Web server was running when you started the OpenSRF services, you
+might not be able to successfully log in to the OPAC or staff client until the
+Apache Web server is restarted.
+
+Testing connections to Evergreen
+--------------------------------
+
+Once you have installed and started Evergreen, test your connection to
+Evergreen via `srfsh`. As the *opensrf* Linux account, issue the following
+commands to start `srfsh` and try to log onto the Evergreen server using the
+*egadmin* Evergreen administrator user name and password that you set using the
+`eg_db_config` command:
+
+[source, bash]
+------------------------------------------------------------------------------
+/openils/bin/srfsh
+srfsh% login <admin-user> <admin-pass>
+------------------------------------------------------------------------------
+
+You should see a result like:
+
+ Received Data: "250bf1518c7527a03249858687714376"
+ ------------------------------------
+ Request Completed Successfully
+ Request Time in seconds: 0.045286
+ ------------------------------------
+
+ Received Data: {
+ "ilsevent":0,
+ "textcode":"SUCCESS",
+ "desc":" ",
+ "pid":21616,
+ "stacktrace":"oils_auth.c:304",
+ "payload":{
+ "authtoken":"e5f9827cc0f93b503a1cc66bee6bdd1a",
+ "authtime":420
+ }
+
+ }
+
+ ------------------------------------
+ Request Completed Successfully
+ Request Time in seconds: 1.336568
+ ------------------------------------
+[[install-troubleshooting-1]]
+If this does not work, it's time to do some troubleshooting.
+
+ * As the *opensrf* Linux account, run the `settings-tester.pl` script to see
+ if it finds any system configuration problems. The script is found at
+ `Open-ILS/src/support-scripts/settings-tester.pl` in the Evergreen source
+ tree.
+ * Follow the steps in the http://evergreen-ils.org/dokuwiki/doku.php?id=troubleshooting:checking_for_errors[troubleshooting guide].
+ * If you have faithfully followed the entire set of installation steps
+ listed here, you are probably extremely close to a working system.
+ Gather your configuration files and log files and contact the
+ http://evergreen-ils.org/communicate/mailing-lists/[Evergreen development
+mailing list] for assistance before making any drastic changes to your system
+ configuration.
+
+Getting help
+------------
+
+Need help installing or using Evergreen? Join the mailing lists at
+http://evergreen-ils.org/communicate/mailing-lists/ or contact us on the Freenode
+IRC network on the #evergreen channel.
+
+License
+-------
+This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
+Unported License. To view a copy of this license, visit
+http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
+Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
diff --git a/configure.ac b/configure.ac
index 74e6b3b..7f6aa27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@
export PATH=${PATH}:/usr/sbin
AC_PREREQ(2.61)
-AC_INIT(Open-ILS, trunk, open-ils-dev at list.georgialibraries.org)
-AM_INIT_AUTOMAKE([OpenILS], [trunk])
+AC_INIT(Open-ILS, 2.10.11, open-ils-dev at list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [2.10.11])
AC_REVISION($Revision: 0.1 $)
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar])
-----------------------------------------------------------------------
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list