From eb8a0ef2bf684726111b23a7d3f5bffd9d67ca4a Mon Sep 17 00:00:00 2001 From: Ben Shum Date: Wed, 17 Jun 2015 16:39:14 -0400 Subject: [PATCH] Bumping version numbers, adding Upgrade Script and Changelog Signed-off-by: Ben Shum --- ChangeLog | 920 ++++++++++++++++++++- Open-ILS/src/perlmods/lib/OpenILS/Application.pm | 2 +- Open-ILS/src/sql/Pg/002.schema.config.sql | 1 + .../Pg/version-upgrade/2.7.5-2.7.6-upgrade-db.sql | 35 + .../staff_client/chrome/content/main/about.html | 2 +- .../xul/staff_client/defaults/preferences/prefs.js | 2 +- Open-ILS/xul/staff_client/windowssetup.nsi | 2 +- README | 621 +++++++++++++- configure.ac | 4 +- 9 files changed, 1579 insertions(+), 10 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.7.5-2.7.6-upgrade-db.sql mode change 120000 => 100644 README diff --git a/ChangeLog b/ChangeLog index 1f72b2c73e..88d8efcee4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,917 @@ -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 cb9e46dce498d2f19ca64d482decedde9208e9c4 +Author: Ben Shum +Date: Wed Feb 4 14:42:16 2015 -0500 + + Bump OpenILS.pm version to 2.7.6 + + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/perlmods/lib/OpenILS.pm + +commit 871cbc482a04be9b822311dbf5298aa6a42cf9b6 +Author: Bill Erickson +Date: Wed Jun 17 13:27:05 2015 -0400 + + LP#1446816 HTML-escape notes in XUL patron alert page + + Avoid rendering HTML contained in patron messages, etc. in the XUL + patron stop-sign page. + + Thanks to Jason Etheridge, ESI for noting this problem and contributing + the original patch fix. + + Signed-off-by: Bill Erickson + Signed-off-by: Ben Shum + +3 3 Open-ILS/xul/staff_client/server/patron/display.js + +commit b39d4c20f0e03d03a0b33df7b7bf8cb5e94ab12a +Author: Ben Shum +Date: Mon Mar 2 21:40:47 2015 -0500 + + Remove alpha and RC scripts for 2.3-2.4 + + These were in the repository from the testing phase of 2.3-2.4 during the + 2.4 alpha/RC period. These script are not required and may be confusing if + run. Remove as unnecessary. + + Signed-off-by: Ben Shum + Signed-off-by: Jason Stephenson + +0 3997 Open-ILS/src/sql/Pg/version-upgrade/2.3-2.4.0RC-upgrade-db.sql +0 1677 Open-ILS/src/sql/Pg/version-upgrade/2.3-2.4.alpha1-upgrade-db.sql + delete mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.3-2.4.0RC-upgrade-db.sql + delete mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.3-2.4.alpha1-upgrade-db.sql + +commit 5e4f751913a6834b526e592250f2b9ddda350c71 +Author: Ben Shum +Date: Mon Mar 2 21:34:53 2015 -0500 + + LP#1205061: Add IF EXISTS to some DROP statements in 2.3-2.4 upgrade script + + To prevent potential issues, add IF EXISTS clauses to DROP statements in this + version upgrade script. + + Signed-off-by: Ben Shum + Signed-off-by: Jason Stephenson + +10 10 Open-ILS/src/sql/Pg/version-upgrade/2.3-2.4.0-upgrade-db.sql + +commit fbf0c630e449f7b54de6b68f2d95225fe649dc22 +Author: Josh Stompro +Date: Wed Jun 3 14:17:19 2015 -0500 + + Docs: LP#1387639 - Barcode Completion Documentation + + Signed-off-by: Josh Stompro + +254 0 docs/admin/lsa-barcode_completion.txt +- - docs/media/lsa-barcode_completion_accesspoints.png +- - docs/media/lsa-barcode_completion_admin.png +- - docs/media/lsa-barcode_completion_fields.png +- - docs/media/lsa-barcode_completion_multiple.png +4 0 docs/root.txt + create mode 100644 docs/admin/lsa-barcode_completion.txt + create mode 100644 docs/media/lsa-barcode_completion_accesspoints.png + create mode 100644 docs/media/lsa-barcode_completion_admin.png + create mode 100644 docs/media/lsa-barcode_completion_fields.png + create mode 100644 docs/media/lsa-barcode_completion_multiple.png + +commit 621a64f8e0b728373cd01f00e06e37122e7ee453 +Author: Josh Stompro +Date: Fri Jan 9 16:03:49 2015 -0600 + + Documentation LP1369203 - Removed formatting around image link to + re-enable the image. + + Signed-off-by: Josh Stompro + +0 2 docs/acquisitions/selection_lists_po.txt + +commit f229b7e3dc1063decfe0f1a91509eba5d66f39ce +Author: Jason Etheridge +Date: Tue Jun 16 12:30:38 2015 -0400 + + fix live_t/08-lp1366964-libdbi-error.t + + from this: + + opensrf@dev141:~/git/Evergreen/Open-ILS/src/perlmods/live_t (lp902255test)$ prove 08-lp1366964-libdbi-error.t + 08-lp1366964-libdbi-error.t .. # Tests libdbi transaction error reporting + 08-lp1366964-libdbi-error.t .. 1/2 + # Failed test 'CStoreEditor returns standard query error' + # at 08-lp1366964-libdbi-error.t line 31. + # got: 'DATABASE_UPDATE_FAILED' + # expected: 'DATABASE_QUERY_FAILED' + # Looks like you failed 1 test of 2. + 08-lp1366964-libdbi-error.t .. Dubious, test returned 1 (wstat 256, 0x100) + Failed 1/2 subtests + + Test Summary Report + ------------------- + 08-lp1366964-libdbi-error.t (Wstat: 256 Tests: 2 Failed: 1) + Failed test: 2 + Non-zero exit status: 1 + Files=1, Tests=2, 1 wallclock secs ( 0.02 usr 0.01 sys + 0.82 cusr 0.11 csys = 0.96 CPU) + Result: FAIL + + to this: + + opensrf@dev141:~/git/Evergreen/Open-ILS/src/perlmods/live_t (lp902255test)$ prove 08-lp1366964-libdbi-error.t + 08-lp1366964-libdbi-error.t .. # Tests libdbi transaction error reporting + 08-lp1366964-libdbi-error.t .. ok + All tests successful. + Files=1, Tests=2, 2 wallclock secs ( 0.02 usr 0.02 sys + 0.85 cusr 0.08 csys = 0.97 CPU) + Result: PASS + + Signed-off-by: Jason Etheridge + Signed-off-by: Mike Rylander + +3 3 Open-ILS/src/perlmods/live_t/08-lp1366964-libdbi-error.t + +commit 880c4f4a73caed2a20772ffcb83cb1e2ba9545fa +Author: Jason Stephenson +Date: Mon Jun 15 16:29:02 2015 -0400 + + LP 902255: Fix upgrade script. + + Run as-is, the upgrade script produces an error: + + ERROR: CREATE INDEX CONCURRENTLY cannot run inside a transaction block + + Following this conversation in IRC, it was decided to remove the keyword + CONCURRENTLY from the create index statement. + + http://irc.evergreen-ils.org/evergreen/2015-06-15#i_182857 + + Signed-off-by: Jason Stephenson + +1 1 Open-ILS/src/sql/Pg/upgrade/0920.schema.disallow-double-capture.sql + +commit 2ad95e80361cbad5791dcc69734673187cc1718f +Author: Jason Stephenson +Date: Mon Jun 15 15:22:09 2015 -0400 + + LP 902255: Stamping upgrade script + + Signed-off-by: Jason Stephenson + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +13 0 Open-ILS/src/sql/Pg/upgrade/0920.schema.disallow-double-capture.sql +0 13 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.disallow-double-capture.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0920.schema.disallow-double-capture.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.disallow-double-capture.sql + +commit 23c846c4c83541a41de267d92d72cb59e3537f57 +Author: Mike Rylander +Date: Fri Jun 12 14:29:02 2015 -0400 + + LP#902255: Use simple alert box + + Instead of the generic communication error dialog, we'll use + the simple yns_alert box instead. + + Signed-off-by: Mike Rylander + Signed-off-by: Kathy Lussier + Signed-off-by: Jason Stephenson + +7 1 Open-ILS/xul/staff_client/server/circ/util.js + +commit 3f2da158a2070c1cb722b4bb18d94794cf5116b6 +Author: Mike Rylander +Date: Thu Jun 11 08:49:21 2015 -0400 + + LP#902255: Correct "ILS Event at check in" logic + + In a classic case of "fix a bug to reveal another" it turn out that + there was a small logic bug hiding in the check in hold-capture code. + The result of this bug was that the wrong ILS Event object was being + returned when we ran into the double-scan hold-capture situation by + overwriting the correct one immediately after we construct it, which + in turn prevented the previous commit from working as designed. + + We now return the correct ILS Event immediately so that we can + properly detect the situation. Two birds with one branch. + + Signed-off-by: Mike Rylander + Signed-off-by: Kathy Lussier + Signed-off-by: Jason Stephenson + +1 1 Open-ILS/src/perlmods/lib/OpenILS/Utils/CStoreEditor.pm + +commit 8edddd734d7843cbb920c2376b094a9abfd4ee99 +Author: Mike Rylander +Date: Mon Jun 8 11:11:04 2015 -0400 + + LP#902255: Protect against hold double-capture + + When the staff client is in Fast Scan (async) mode, it is possible + to double-scan at checkin and cause two holds to be captured by the + same item. By creating a specially crafted unique index we ensure + that the database rejects this situation. + + This protection would cause unhandled errors in the staff client, so + we also register a new string to be displayed when this particular + situation occurs, alerting staff to the possible double-scan of a + barcode at checkin IFF they are using async mode. + + Signed-off-by: Mike Rylander + Signed-off-by: Kathy Lussier + Signed-off-by: Jason Stephenson + +1 0 Open-ILS/src/sql/Pg/090.schema.action.sql +13 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.disallow-double-capture.sql +6 2 Open-ILS/xul/staff_client/server/circ/util.js +1 0 Open-ILS/xul/staff_client/server/locale/en-US/circ.properties + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.disallow-double-capture.sql + +commit bdbe1543d647e2a708001873b5154be568744ef8 +Author: Ben Shum +Date: Wed Jun 10 20:57:29 2015 -0400 + + LP#1463145 - Debian Jessie needs libexcel-writer-xlsx-perl + + Without this package, attempts to run clark-kent.pl will fail on Debian Jessie. + + Also remove old libspreadsheet-writeexcel-perl package from pre-reqs as it is + no longer required. + + Signed-off-by: Ben Shum + Signed-off-by: Josh Stompro + Signed-off-by: Jason Stephenson + +1 1 Open-ILS/src/extras/install/Makefile.debian-jessie + +commit f2e5b8d0523687842656b82898dd1a111ac866f5 +Author: Adam Bowling +Date: Fri Jan 16 17:18:24 2015 -0500 + + LP#1365661 Found patrons with same name not opening + + This patch fixes the error, while registering a new patron + and clicking the link "Found {$0} patron(s) with the same + name" did not previously work in the staff client. + + To reproduce the bug, register a new patron with the name of an + existing patron. The little widget with the message described + above will appear. The message is a hyperlink, but nothing + appears to happen if you click it. The JavaScript console will + contain an error ReferenceError:js2JSON is not defined. + + After applying this patch, clicking the hyperlink does a search + for matching patrons as intended. The ReferenceError also + disappears. + + Signed-off-by: Adam Bowling + Signed-off-by: Terran McCanna + Signed-off-by: Jason Stephenson + +2 0 Open-ILS/xul/staff_client/server/index.xhtml + +commit 6f13a9314148d0f9eafbba3c4bf6f6e3c428cb86 +Author: Michael Peters +Date: Tue Jun 9 10:10:04 2015 -0400 + + LP#1154656 MARC Expert Search "Add Rows" adds duplicate row + + This patch changes the behavior of the "Add Search Row" link + (JavaScript function from simple.js "addExpertRow()") so that + we are always cloning the initial "empty" row instead of + potentially cloning a row -- by way of cloneNode() -- with user + input in place, and causing duplicate search rows. + + To reproduce the bug, go to Advanced Search, fill in all three + search fields with some text, click on Add Search Row. You wil + see that the Title search row along with the data in the text + box is duplicated and added to the search. + + After this patch, the new row should be added with an empty + text box. + + Signed-off-by: Michael Peters + Signed-off-by: Rashma Kumaran + Signed-off-by: Jason Stephenson + +7 1 Open-ILS/src/templates/opac/css/style.css.tt2 +21 6 Open-ILS/web/js/ui/default/opac/simple.js + +commit 4b1ef85b61439be7a4b5b2fba8d1dbe63f7e1e86 +Author: Chris Sharp +Date: Mon Apr 6 20:17:30 2015 -0400 + + LP#1342227 - Allow EDI Ruby dependency installation on Ubuntu 14.04 + + Create a script for Ubuntu 14.04 ruby installation and installation + for EDI dependencies. Remove 'rcov', which has been deprecated for + Ruby 1.9.1 and install Bill Erickson's GIR improvements. + + In the future we will need to remove this dependency altogether (see + bug 1373690), but for now, at least get it working on Ubuntu 14.04. + + Signed-off-by: Chris Sharp + Signed-off-by: Jason Stephenson + +16 0 Open-ILS/src/edi_translator/install-ubuntu-trusty.sh + create mode 100755 Open-ILS/src/edi_translator/install-ubuntu-trusty.sh + +commit 123c6c59a03eceb072602588eb27e2346fab9fdd +Author: blake +Date: Fri Apr 10 14:29:08 2015 -0500 + + LP1424646 Paid-For Long Overdue Items Still Appear in "Other/Special Circulations" Window + + Edited the query inside the fm_IDL.xml file + + Signed-off-by: blake + Signed-off-by: Chris Sharp + Signed-off-by: Jason Stephenson + +2 2 Open-ILS/examples/fm_IDL.xml + +commit 4d08b937c42e5ba9bf971c5b43176d9a0430f2c8 +Author: Remington Steed +Date: Wed Jun 10 17:07:43 2015 -0400 + + Docs LP#1371646: Add better screenshots + + This commit borrows two screenshots from the Sitka Evergreen Training + Manual to replace one in the Alternate Serial Control View section. + Thanks Sitka! + + Signed-off-by: Remington Steed + +- - docs/media/ascv-dist1.png +- - docs/media/ascv-dist2.png +4 1 docs/serials/D-subscription-ASCV.txt + create mode 100644 docs/media/ascv-dist1.png + create mode 100644 docs/media/ascv-dist2.png + +commit 08a50eb8252d6137a1bbe4b5c6c2c6c4864ae4a0 +Author: Chris Sharp +Date: Wed Apr 15 14:05:23 2015 -0400 + + LP1444623: Remove "Safe" CPAN dependency from Debian/Ubuntu Makefile.install files + + Following up on IRC discussion at http://irc.evergreen-ils.org/evergreen/2015-04-15#i_170386 + it was agreed that it is no longer necessary to install Safe from CPAN + since it is included in the standard Perl package. + + Signed-off-by: Chris Sharp + Signed-off-by: Ben Shum + + Conflicts: + Open-ILS/src/extras/install/Makefile.debian-jessie + +0 1 Open-ILS/src/extras/install/Makefile.debian-jessie +0 1 Open-ILS/src/extras/install/Makefile.debian-wheezy +0 1 Open-ILS/src/extras/install/Makefile.ubuntu-precise +0 1 Open-ILS/src/extras/install/Makefile.ubuntu-trusty + +commit e9b374148aca12bc4d293345f9cc6ac672e278d7 +Author: Jason Stephenson +Date: Sat Feb 15 12:56:58 2014 -0500 + + LP#638509: Handle COPY_STATUS_LOST and COPY_STATUS_LONG_OVERDUE in renewal. + + Modify Open-ILS/xul/staff_client/server/circ/util.js so that the + above events are available for override. + + Signed-off-by: Jason Stephenson + Signed-off-by: Kathy Lussier + Signed-off-by: Ben Shum + +11 1 Open-ILS/xul/staff_client/server/circ/util.js + +commit fa19decaa84fc68d9acd37ebc0f9311265dcabaa +Author: Jason Stephenson +Date: Sun Feb 2 15:59:34 2014 -0500 + + LP#638509: Remove the stop_fines checks from do_renew's circulation search. + + Signed-off-by: Jason Stephenson + Signed-off-by: Kathy Lussier + Signed-off-by: Ben Shum + +2 7 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm + +commit 79898fa7d583ba12b271545f332f3312147ac275 +Author: Blake Henderson +Date: Fri Apr 10 15:43:54 2015 -0500 + + LP1440148 Long overdue Items out TPAC OPAC display My Account + + Removed Long overdue circs from the total_out count + + Signed-off-by: Blake Henderson + Signed-off-by: Michele Morgan + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm + +commit 96149ee662f32b8a3fa2aa04fef44182d4029f10 +Author: Mike Rylander +Date: Wed Jun 10 14:17:37 2015 -0400 + + LP#1463973: Use dollar-quoting for report literals + + When inserting string literal into SQL for Clark, we quote + apostrophes with a backslash. That worked fine until Postgres + changed its default for the standard_conforming_strings GUC to "on" + after which it no longer worked fine. + + So, we will now use "dollar quoting" for string literals instead + in much the same way we do for our search queries. + + Test plan + --------- + + Pre-patch: Try to run a report where a string value is required as + a filter parameter, and include an apostrophe in that string. The + report will fail with an SQL error. + + Post-patch: Do the same, it will not fail. + + Signed-off-by: Mike Rylander + Signed-off-by: Angela Kilsdonk + Signed-off-by: Ben Shum + +19 57 Open-ILS/src/perlmods/lib/OpenILS/Reporter/SQLBuilder.pm + +commit 21c6ecd083590efd75e11d99d7118517c43da43d +Author: Chris Sharp +Date: Wed Apr 22 09:54:11 2015 -0400 + + LP#1446860 - Correct mistaken logic in previous fix. + + See https://bugs.launchpad.net/evergreen/+bug/1446860/comments/2 + for reference. The logic was not enforcing the "if the editing + staff member doesn't have permission to edit a user in this + permission group" check. This corrects that. + + Signed-off-by: Chris Sharp + Signed-off-by: Ben Shum + +1 1 Open-ILS/web/js/ui/default/actor/user/register.js + +commit f5ab4f203dec956f79643c5c35ce61a06ac4283b +Author: Chris Sharp +Date: Tue Apr 21 17:10:49 2015 -0400 + + LP#1446860 Staff were able to edit their own accounts. + + This change reverses what appears to be a thinko in the + original programming. If the editing user is the same + as the user being edited, disable the Save button. + + Signed-off-by: Chris Sharp + Signed-off-by: Ben Shum + +1 1 Open-ILS/web/js/ui/default/actor/user/register.js + +commit 045fd8040b157033d3836b2d0db6b31baf8394d2 +Author: Jeff Davis +Date: Thu Apr 16 08:58:17 2015 -0700 + + LP#1074096: Remove Bib Call Number from query type selector + + Signed-off-by: Jeff Davis + Signed-off-by: Michael Peters + Signed-off-by: Ben Shum + +1 2 Open-ILS/src/templates/opac/parts/qtype_selector.tt2 + +commit 81dcc693975e2cb2f96595da04db53a7250b358b +Author: Jason Etheridge +Date: Thu May 7 16:02:00 2015 -0400 + + LP#1452883: prevent staff client warnings w/ Google Analytics + + In particular, the Security Warning that goes "You have requested an encrypted + page that contains some unencrypted information..." + + Signed-off-by: Jason Etheridge + Signed-off-by: Josh Stompro + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/templates/opac/parts/goog_analytics.tt2 + +commit 68b765a8ed93e56767a55d1875ce5e276db653e6 +Author: Kathy Lussier +Date: Wed May 27 22:11:49 2015 -0400 + + LP#1403966: Remove publication-specific information from metarecord results page + + The records that make up a matarecord search result typically contain different + publication information. Therefore, we should remove the master record's + specific publication information from that search results page. + + Test plan + Prior to loading the patch, conduct a search on the Concerto dataset + for "brahms piano concerto no. 1" with "Group Formats and Editions" turned on. + In the brief view, you will see a call number and, in the more details view, you + will see publisher and physical description information. Run the same search + after loading the patch, and you will no longer see that information. + + Signed-off-by: Kathy Lussier + Signed-off-by: Andrea Neiman + Signed-off-by: Ben Shum + +6 2 Open-ILS/src/templates/opac/parts/result/table.tt2 + +commit ad9d7cfc8291908ed0b95cc1097ae31d25bd5805 +Author: Blake Henderson +Date: Mon Dec 8 15:52:15 2014 -0600 + + LP#1194860: You have permission to override some of the failed holds. appearing when it should not for patrons in the OPAC Edit + + A quick value check before assigning the override variable. + This should eliminate the OPAC showing the override option + for those who do not have the permission. + + Signed-off-by: Blake Henderson + Signed-off-by: Liam Whalen + Signed-off-by: Ben Shum + +8 2 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm + +commit 0b11647dd344028f6d1d16ab2837de35d38eee3c +Author: Josh Stompro +Date: Sun May 31 17:49:34 2015 -0500 + + LP#1456021 Enable apache modcgi during install for Debian Jessie + + Apache mod cgi isn't enabled when installing apache2.4 on Debian Jessie, + this causes the /updates/manualupdate.html to not be processed and + to just return the raw code of that script since it uses mod cgi. + + This adds 'cgi' to the list of apache modules to enable during the + dependency install. + + Signed-off-by: Josh Stompro + Signed-off-by: Ben Shum + +2 1 Open-ILS/src/extras/install/Makefile.debian-jessie + +commit cd2f59861465b53dc7b8a73a3d6e50ce56434e16 +Author: Josh Stompro +Date: Sun May 31 17:19:58 2015 -0500 + + LP#1457094 Switch to package libtemplate-plugin-posix-perl for Debian Jessie + + Debian Jessie includes a package for Template::Plugin::Posix that was + being installed via CPAN. This patch removes the CPAN install and adds + the Debian package. + + Signed-off-by: Josh Stompro + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/extras/install/Makefile.debian-jessie + +commit eb53c919b775e772b2d0a87c9e014ec8c49706ee +Author: Bradley Bonner +Date: Wed Jun 10 14:26:57 2015 -0700 + + LP#757533: adds scrollbars (when necessary) to the item status alternate view tab box. + + Signed-off-by: Bradley Bonner + Signed-off-by: Ben Shum + +1 1 Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul + +commit 08bd7ca10c0650182093041d5102767d59a33953 +Author: Dan Wells +Date: Wed Jun 10 15:05:13 2015 -0400 + + LP#1289486 Stamping upgrade for dropping acq audit fkey + + Signed-off-by: Dan Wells + +0 7 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.drop-acq-audit-fkey.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.drop-acq-audit-fkey.sql + +commit a6f6e95a6b99dbc3bf42892595a90d81c936cb39 +Author: Mike Rylander +Date: Mon Jun 8 17:30:52 2015 -0400 + + LP#1289486: Remove blocking constraint from audit table + + The ACQ lineitem audit table was augmented with an fkey pointing + to the queued record that was related to the line item. That's + bad because there are also triggers which attempt to manage that + table. Hilarity ensues. We should not have an fkey on an audit + table, so, we now remove that. + + In order to test this, first attempt to delete an ACQ queue and + have that fail. Apply the DB change, attempt again, and have it + succeed. + + Signed-off-by: Mike Rylander + Signed-off-by: Dan Wells + +7 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.drop-acq-audit-fkey.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.drop-acq-audit-fkey.sql + +commit 391ddad07e79ed771babcfa202a5a03e17fd9989 +Author: Dan Wells +Date: Wed Jun 10 15:05:13 2015 -0400 + + LP#1289486 Stamping upgrade for dropping acq audit fkey + + Signed-off-by: Dan Wells + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +7 0 Open-ILS/src/sql/Pg/upgrade/0919.schema.drop-acq-audit-fkey.sql +0 7 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.drop-acq-audit-fkey.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0919.schema.drop-acq-audit-fkey.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.drop-acq-audit-fkey.sql + +commit eeec8b1a6904c5e72e161a769a1f53ef16bb78e2 +Author: Mike Rylander +Date: Mon Jun 8 17:30:52 2015 -0400 + + LP#1289486: Remove blocking constraint from audit table + + The ACQ lineitem audit table was augmented with an fkey pointing + to the queued record that was related to the line item. That's + bad because there are also triggers which attempt to manage that + table. Hilarity ensues. We should not have an fkey on an audit + table, so, we now remove that. + + In order to test this, first attempt to delete an ACQ queue and + have that fail. Apply the DB change, attempt again, and have it + succeed. + + Signed-off-by: Mike Rylander + Signed-off-by: Dan Wells + +7 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.drop-acq-audit-fkey.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.drop-acq-audit-fkey.sql + +commit 5b94c682cb8566657c25ed9c5eb21bbc6240ea1e +Author: Dan Wells +Date: Wed Jun 10 14:29:27 2015 -0400 + + LP#1447168 Stamping upgrade script for index on ash record + + Signed-off-by: Dan Wells + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +9 0 Open-ILS/src/sql/Pg/upgrade/0918.schema.index_ash_record.sql +0 9 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.index_ash_record.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0918.schema.index_ash_record.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.index_ash_record.sql + +commit e5dc093112134490c0a361c67e2b070ec44683c4 +Author: Galen Charlton +Date: Wed Apr 22 13:43:19 2015 +0000 + + LP#1447168: add an index on authority.simple_heading.record + + This index is needed so that full table scans on ash aren't + needed during authority record reingest. + + Signed-off-by: Galen Charlton + Signed-off-by: Dan Wells + +1 0 Open-ILS/src/sql/Pg/011.schema.authority.sql +9 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.index_ash_record.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.index_ash_record.sql + +commit 7d1059b138566375106da1acf9db700a85fccef8 +Author: Jane Sandberg +Date: Tue May 19 17:13:05 2015 -0400 + + Docs: General improvements to EDI docs + + Signed-off-by: Remington Steed + +25 5 docs/admin/acquisitions_admin.txt + +commit f66d71e1156dc32e81a8d1fd3113bf06048b57ec +Author: Jane Sandberg +Date: Sun May 17 12:32:21 2015 -0400 + + Docs: Added hard due dates docs + + Signed-off-by: Yamil Suarez + +31 0 docs/admin_initial_setup/hard_due_dates.txt +4 0 docs/root.txt + create mode 100644 docs/admin_initial_setup/hard_due_dates.txt + +commit e11f4d93c4c0b970b94583f482089daa3c98bd5f +Author: Ben Shum +Date: Mon Mar 2 21:49:55 2015 -0500 + + LP#1125270: Add a DROP FUNCTION for actor.usr_purge_data + + Apparently this caused problems on upgrading from 2.0 to 2.1 back in the day, + and adding a DROP FUNCTION ahead of the CREATE dealt with the situation. + + Signed-off-by: Ben Shum + Signed-off-by: Galen Charlton + +2 0 Open-ILS/src/sql/Pg/version-upgrade/2.0-2.1-upgrade-db.sql + +commit c09d72c1173b92913f550e1b7190791acc516c57 +Author: Terran McCanna +Date: Fri May 15 10:02:17 2015 -0700 + + LP1406317: Stray Semicolons in OPAC Browse + + Fixed display issue where semicolons were appearing at the end of + each result in browse title screen. Semicolon had been placed outside + of a bracket rather than inside a bracket. Moved semicolon to inside + bracket to correct. + + URL of page showing error: + https://my-library/eg/opac/browse?blimit=10&qtype=title&bterm=m&locg=1 + + Signed-off-by: Terran McCanna + Signed-off-by: Galen Charlton + +1 1 Open-ILS/src/templates/opac/browse.tt2 + +commit 2d66e9bf9626c2f0bef57686abbbfc28f79775b5 +Author: Jason Stephenson +Date: Wed May 13 13:51:35 2015 -0400 + + LP#800706: Stamping upgrade script + + Signed-off-by: Jason Stephenson + + Conflicts: + Open-ILS/src/sql/Pg/002.schema.config.sql + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +9 0 Open-ILS/src/sql/Pg/upgrade/0917.schema.index-record-in-sre.sql +0 9 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.index-record-in-sre.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0917.schema.index-record-in-sre.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.index-record-in-sre.sql + +commit 96879d4bfb2ebb1375441025d1027322f5b89e5d +Author: Galen Charlton +Date: Tue May 12 16:02:09 2015 -0400 + + LP#800706: add regression test + + Signed-off-by: Galen Charlton + Signed-off-by: Jason Stephenson + +7 0 Open-ILS/src/sql/Pg/t/regress/lp800706_ser_indexes_record.pg + create mode 100644 Open-ILS/src/sql/Pg/t/regress/lp800706_ser_indexes_record.pg + +commit 619a1707585da5c0add76085e696a00d63103886 +Author: Galen Charlton +Date: Tue May 12 15:27:07 2015 -0400 + + LP#800706: add index to serial.record_entry.record + + This patch adds index on the record column of serial.record_entry, + which can improve performance when displaying record details pages + in databases that have a large number MFHDs. + + Signed-off-by: Galen Charlton + Signed-off-by: Jason Stephenson + +1 0 Open-ILS/src/sql/Pg/210.schema.serials.sql +9 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.index-record-in-sre.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.index-record-in-sre.sql + +commit e77a803e77adee8ef1ac03899159addf6328bcdf +Author: Ben Shum +Date: Fri May 8 22:10:19 2015 -0400 + + LP#1445150: Symlink for 000.english.pg94.fts-config.sql + + We need this so that the eg_db_config script can make the Evergreen + database with PostgreSQL 9.4 systems. + + Signed-off-by: Ben Shum + +1 0 Open-ILS/src/sql/Pg/000.english.pg94.fts-config.sql + create mode 120000 Open-ILS/src/sql/Pg/000.english.pg94.fts-config.sql + +commit 330459eb1ccc41e4901535749ed392e5fcafbcea +Author: Josh Stompro +Date: Thu Apr 30 09:37:50 2015 -0500 + + LP#1445182 Changed Debian Jessie dependency install to use packages for dbi dbd-pgsql. + + Signed-off-by: Josh Stompro + Signed-off-by: Ben Shum + + Conflicts: + Open-ILS/src/extras/install/Makefile.debian-jessie + +3 2 Open-ILS/src/extras/install/Makefile.debian-jessie +3 3 docs/installation/server_installation.txt + +commit aaaad5b7138b872799b7cb417472c79a52109e08 +Author: Josh Stompro +Date: Thu Apr 16 11:21:13 2015 -0500 + + LP#1362260 - Email::Sender/libemail-send-perl change in Jessie + + libemail-send-perl no longer exists in Debian Jessie. Change + Makefile.debian-jessie to install cpan version instead of + debian package. + + Signed-off-by: Josh Stompro + Signed-off-by: Ben Shum + +2 2 Open-ILS/src/extras/install/Makefile.debian-jessie + +commit 3b68241e587f7d6c4c36e05b3fb52e1984df5a77 +Author: Josh Stompro +Date: Thu Apr 16 14:55:25 2015 -0500 + + LP#1445187 - Force disable of deflate + + Add the -f (force) flag to a2dismod to remove the chance of getting + a confirmation prompt when removing deflate. + + Signed-off-by: Josh Stompro + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/extras/install/Makefile.debian + +commit dca4c15a4cc224bbae12a8b1330a43a98526a99d +Author: Josh Stompro +Date: Mon Apr 20 14:45:59 2015 -0500 + + LP#1447195 Updates for Debian Jessie in README + + - Adding in a few missed references to Debian Jessie + - Noted instances where Jessie uses the same instructions as Trusty + - Debian Jessie includes Apache2.4 so needs to use those steps. + - Added Jessie to postgres server install + + Signed-off-by: Josh Stompro + Signed-off-by: Ben Shum + +8 7 docs/installation/server_installation.txt + +commit 65a171703e2b36660b0d8cc13d69b082ff6a2667 +Author: Josh Stompro +Date: Thu Apr 16 13:13:17 2015 -0500 + + LP#1445150 Update Debian Jessie depend make to PG9.4 + + Signed-off-by: Josh Stompro + Signed-off-by: Ben Shum + +7 7 Open-ILS/src/extras/install/Makefile.debian-jessie + +commit 3ab0ebc11cd11fa4b1cb8dbdf937421fc4bfc84c +Author: Ben Shum +Date: Mon May 4 12:42:47 2015 -0400 + + Docs: Change references to release 2.7.5 + + Since 2.7.5 is released, change references in upgrade docs to this newest + release. + + Signed-off-by: Ben Shum + +16 15 docs/installation/server_upgrade.txt + +commit 6a14ec18e7d6dca97dcb5e551452051b9ee32aa4 +Author: Ben Shum +Date: Fri May 1 14:09:01 2015 -0400 + + Docs - Add security note for 2.7.5 + + Signed-off-by: Ben Shum + +56 2 docs/RELEASE_NOTES_2_7.txt + +commit bb112c5a108bc7208fe321f7af6e2c524a91dd74 +Author: Galen Charlton +Date: Thu Apr 30 11:07:14 2015 -0700 + + LP#1449283: fix auth when running under Apache 2.4 + + When running under Apache 2.4 using the stock configuration + derived from apache_24/eg_vhost.conf.in, protected + URLs such as https://eghost/reporter/ that are meant to + require valid EG staff credentials were not in fact + requiring authentication. + + This patch does the following to fix this: + + [1] Removes several uses of "Require all granted" that + was causing authentication to be ignored. + [2] Changes OpenILS::WWW::Proxy::Authen so that it always + sets the username in the Apache request object if + authentication was successful; it appears that starting + with Apache 2.4, authentication handlers must ensure + that a user name is set for a "Require valid-user" + directive to work. + + Signed-off-by: Galen Charlton + Signed-off-by: Jason Stephenson + Signed-off-by: Bill Erickson + +9 17 Open-ILS/examples/apache_24/eg_vhost.conf.in +4 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy/Authen.pm diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index d750216454..9150c18745 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-7-6"; } __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 fe2ceebecc..e09ae142de 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 ('0920', :eg_version); -- miker/klussier +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.7.6', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.7.5-2.7.6-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.7.5-2.7.6-upgrade-db.sql new file mode 100644 index 0000000000..5b8be73b3f --- /dev/null +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.7.5-2.7.6-upgrade-db.sql @@ -0,0 +1,35 @@ +--Upgrade Script for 2.7.5 to 2.7.6 +\set eg_version '''2.7.6''' +BEGIN; +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.7.6', :eg_version); +-- index serial.record_entry.record + + +SELECT evergreen.upgrade_deps_block_check('0917', :eg_version); + +CREATE INDEX serial_record_entry_record_idx ON serial.record_entry ( record ); + +-- index authority.simple_heading.record so that reingesting +-- authority records does not require a sequential scan of ash + +SELECT evergreen.upgrade_deps_block_check('0918', :eg_version); + +CREATE INDEX authority_simple_heading_record_idx ON authority.simple_heading (record); + + +SELECT evergreen.upgrade_deps_block_check('0919', :eg_version); + +ALTER TABLE acq.acq_lineitem_history DROP CONSTRAINT IF EXISTS acq_lineitem_history_queued_record_fkey; + + +SELECT evergreen.upgrade_deps_block_check('0920', :eg_version); + +CREATE UNIQUE INDEX + hold_request_capture_protect_idx ON action.hold_request (current_copy) + WHERE current_copy IS NOT NULL -- sometimes null in old/bad data + AND capture_time IS NOT NULL + AND cancel_time IS NULL + AND fulfillment_time IS NULL; + + +COMMIT; 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 dd106530c3..2fce0365a4 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 @@

Evergreen

Target Server ID:

-

$HeadURL$

+

http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_7_6

What is Evergreen?

diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js index 0613a13ddf..73972d1dfd 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/Evergreen.git?h=refs/heads/rel_2_7_6"); 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 a9543579a8..31ae06e28f 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.7" !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 b57451acb4..0000000000 --- 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 0000000000..e77f6e3e31 --- /dev/null +++ b/README @@ -0,0 +1,620 @@ +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 install some extra packages +and perform one step before they can proceed with the `./configure` step. + +As the *root* Linux account, install the following packages: + + * autoconf + * automake + * libtool + +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), Debian Squeeze(6.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 many distributions, it is necessary to install PostgreSQL 9.1+ from external + repositories. ++ + * On Debian Squeeze, open `/etc/apt/sources.list` in a text editor as the + *root* Linux account and add the following line: ++ +[source, bash] +------------------------------------------------------------------------------ +deb http://backports.debian.org/debian-backports squeeze-backports main contrib +------------------------------------------------------------------------------ ++ + * 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`, `debian-squeeze`, `fedora`, + `ubuntu-trusty`, or `ubuntu-precise` for below: ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install +------------------------------------------------------------------------------ ++ +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 +------------------------------------------------------------------------------ + +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_7_6 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 +------------------------------- + +1. 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 +------------------------------------------------------------------------------ ++ +2. 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 +------------------------------------------------------------------------------ ++ +3. 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/`. +4. 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`. +5. Configure Apache with performance settings appropriate for Evergreen: + * (Debian and Ubuntu): As the *root* Linux account, edit + `/etc/apache2/apache2.conf`: + * (Fedora): As the *root* Linux account, edit `/etc/httpd/conf/httpd.conf`: + a. Change `KeepAliveTimeout` to `1`. Higher values reduce the chance of + a request timing out unexpectedly, but increase the risk of using up + all available Apache child processes. + b. 'Optional': Change `MaxKeepAliveRequests` to `100` + c. (Debian Wheezy, Ubuntu Precise, and Fedora) Update the prefork configuration + section to suit your environment. The following settings apply to a busy + system: ++ +[source,bash] +------------------------------------------------------------------------------ + + StartServers 20 + MinSpareServers 5 + MaxSpareServers 15 + MaxClients 150 + MaxRequestsPerChild 10000 + +------------------------------------------------------------------------------ + d. (Ubuntu Trusty, Debian Jessie) As the *root* user, edit + /etc/apache2/mods-available/mpm_prefork.conf to match the above values. + Then, also as the *root* user, enable the mpm_prefork module by doing: ++ +[source,bash] +------------------------------------------------------------------------------ +a2dismod mpm_event +a2enmod mpm_prefork +------------------------------------------------------------------------------ ++ +6. (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/`. +7. (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 +------------------------------------------------------------------------------ ++ +8. (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 +------------------------------------------------------------------------------ + +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 the following section, sets the database +connection information in `opensrf.xml` for you. + +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-'. 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-debian-squeeze +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 , , +, , and with the appropriate values for your +PostgreSQL database (where and are for the *evergreen* +PostgreSQL account you just created), and replace and +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 --password --hostname --port \ + --database --admin-user --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 +------------------------------------------------------------------------------ + +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 585ab00c5f..20006be75a 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@list.georgialibraries.org) -AM_INIT_AUTOMAKE([OpenILS], [trunk]) +AC_INIT(Open-ILS, 2.7.6, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [2.7.6]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar]) -- 2.11.0