From: Bill Erickson Date: Thu, 3 Oct 2013 15:04:48 +0000 (-0400) Subject: Bumping version numbers, adding Upgrade Script and Changelog X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4483452160fee87d70a9de2b4f14ec740bb7e4a3;p=working%2FEvergreen.git Bumping version numbers, adding Upgrade Script and Changelog Signed-off-by: Bill Erickson --- diff --git a/ChangeLog b/ChangeLog index 1f72b2c73e..31699c9b02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,623 @@ -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 569a76a6a3e3d8f7315797bacb3265f83f54bddf +Author: Bill Erickson +Date: Thu Oct 3 11:03:48 2013 -0400 + + Bumping OpenILS VERSION to 2.0311 + + Signed-off-by: Bill Erickson + +1 1 Open-ILS/src/perlmods/lib/OpenILS.pm + +commit fd5140ef0d6ff65693bdd4bdb59a6cf433b652ed +Author: Bill Erickson +Date: Thu Oct 3 10:59:35 2013 -0400 + + 2.3.11 translations import + + Signed-off-by: Bill Erickson + +1 1 build/i18n/po/AutoFieldWidget.js/fi-FI.po +5 5 build/i18n/po/Searcher.js/es-ES.po +1 1 build/i18n/po/Searcher.js/fi-FI.po +1 1 build/i18n/po/TranslatorPopup.js/fi-FI.po +1 1 build/i18n/po/User.js/fi-FI.po +4 2 build/i18n/po/XULTermLoader.js/XULTermLoader.js.pot +1 1 build/i18n/po/XULTermLoader.js/fi-FI.po +30 10 build/i18n/po/acq.js/acq.js.pot +1 1 build/i18n/po/admin.properties/fi-FI.po +1 1 build/i18n/po/auth.properties/fi-FI.po +1 1 build/i18n/po/authority.js/fi-FI.po +4 2 build/i18n/po/capture.js/capture.js.pot +1 1 build/i18n/po/capture.js/fi-FI.po +17 15 build/i18n/po/cat.properties/cs-CZ.po +15 13 build/i18n/po/cat.properties/de-DE.po +15 13 build/i18n/po/cat.properties/en-CA.po +15 13 build/i18n/po/cat.properties/en-GB.po +15 13 build/i18n/po/cat.properties/es-ES.po +16 14 build/i18n/po/cat.properties/fi-FI.po +15 13 build/i18n/po/cat.properties/fr-CA.po +15 13 build/i18n/po/cat.properties/hy-AM.po +15 13 build/i18n/po/cat.properties/oc-FR.po +15 13 build/i18n/po/cat.properties/pt-BR.po +15 13 build/i18n/po/cat.properties/ru-RU.po +7 13 build/i18n/po/cat.properties/tr-TR.po +2 2 build/i18n/po/circ.properties/circ.properties.pot +27 6 build/i18n/po/circ.properties/cs-CZ.po +22 4 build/i18n/po/circ.properties/de-DE.po +27 6 build/i18n/po/circ.properties/en-CA.po +27 6 build/i18n/po/circ.properties/en-GB.po +26 5 build/i18n/po/circ.properties/es-ES.po +28 7 build/i18n/po/circ.properties/fi-FI.po +26 5 build/i18n/po/circ.properties/fr-CA.po +27 6 build/i18n/po/circ.properties/hy-AM.po +22 4 build/i18n/po/circ.properties/oc-FR.po +27 6 build/i18n/po/circ.properties/pt-BR.po +26 5 build/i18n/po/circ.properties/ru-RU.po +22 4 build/i18n/po/circ.properties/tr-TR.po +13 5 build/i18n/po/common.properties/cs-CZ.po +11 3 build/i18n/po/common.properties/de-DE.po +11 3 build/i18n/po/common.properties/en-CA.po +11 3 build/i18n/po/common.properties/en-GB.po +11 3 build/i18n/po/common.properties/es-ES.po +12 4 build/i18n/po/common.properties/fi-FI.po +11 3 build/i18n/po/common.properties/fr-CA.po +11 3 build/i18n/po/common.properties/hy-AM.po +11 3 build/i18n/po/common.properties/oc-FR.po +11 3 build/i18n/po/common.properties/pt-BR.po +11 3 build/i18n/po/common.properties/ru-RU.po +19 7 build/i18n/po/conify.js/conify.js.pot +1 1 build/i18n/po/conify.js/fi-FI.po +9037 3079 build/i18n/po/db.seed/cs-CZ.po +820 765 build/i18n/po/db.seed/db.seed.pot +8448 2324 build/i18n/po/db.seed/de-DE.po +8745 2722 build/i18n/po/db.seed/en-CA.po +8753 2795 build/i18n/po/db.seed/en-GB.po +8421 2401 build/i18n/po/db.seed/es-ES.po +9444 3327 build/i18n/po/db.seed/fi-FI.po +9760 3802 build/i18n/po/db.seed/fr-CA.po +9801 3843 build/i18n/po/db.seed/hy-AM.po +8460 2331 build/i18n/po/db.seed/oc-FR.po +9309 3270 build/i18n/po/db.seed/pt-BR.po +9161 3125 build/i18n/po/db.seed/ru-RU.po +7953 1827 build/i18n/po/db.seed/tr-TR.po +2667 2468 build/i18n/po/fm_IDL.dtd/cs-CZ.po +2637 2444 build/i18n/po/fm_IDL.dtd/de-DE.po +2670 2468 build/i18n/po/fm_IDL.dtd/en-CA.po +2669 2467 build/i18n/po/fm_IDL.dtd/en-GB.po +2640 2447 build/i18n/po/fm_IDL.dtd/es-ES.po +2671 2469 build/i18n/po/fm_IDL.dtd/fi-FI.po +13 13 build/i18n/po/fm_IDL.dtd/fm_IDL.dtd.pot +2639 2446 build/i18n/po/fm_IDL.dtd/fr-CA.po +2670 2468 build/i18n/po/fm_IDL.dtd/hy-AM.po +2636 2443 build/i18n/po/fm_IDL.dtd/oc-FR.po +2655 2462 build/i18n/po/fm_IDL.dtd/pt-BR.po +2655 2462 build/i18n/po/fm_IDL.dtd/ru-RU.po +2634 2441 build/i18n/po/fm_IDL.dtd/tr-TR.po +269 256 build/i18n/po/ils_events.xml/cs-CZ.po +267 254 build/i18n/po/ils_events.xml/de-DE.po +269 256 build/i18n/po/ils_events.xml/en-CA.po +269 256 build/i18n/po/ils_events.xml/en-GB.po +267 254 build/i18n/po/ils_events.xml/es-ES.po +270 257 build/i18n/po/ils_events.xml/fi-FI.po +270 257 build/i18n/po/ils_events.xml/fr-CA.po +269 256 build/i18n/po/ils_events.xml/hy-AM.po +104 44 build/i18n/po/ils_events.xml/ils_events.xml.pot +269 256 build/i18n/po/ils_events.xml/pt-BR.po +269 256 build/i18n/po/ils_events.xml/ru-RU.po +827 16 build/i18n/po/lang.dtd/ar-AR.po +909 55 build/i18n/po/lang.dtd/cs-CZ.po +853 21 build/i18n/po/lang.dtd/de-DE.po +883 30 build/i18n/po/lang.dtd/en-CA.po +882 29 build/i18n/po/lang.dtd/en-GB.po +865 38 build/i18n/po/lang.dtd/es-ES.po +885 32 build/i18n/po/lang.dtd/fi-FI.po +871 27 build/i18n/po/lang.dtd/fr-CA.po +883 30 build/i18n/po/lang.dtd/hy-AM.po +5 1 build/i18n/po/lang.dtd/lang.dtd.pot +835 18 build/i18n/po/lang.dtd/oc-FR.po +877 27 build/i18n/po/lang.dtd/pt-BR.po +877 27 build/i18n/po/lang.dtd/ru-RU.po +843 20 build/i18n/po/lang.dtd/tr-TR.po +7 3 build/i18n/po/offline.properties/cs-CZ.po +7 3 build/i18n/po/offline.properties/de-DE.po +7 3 build/i18n/po/offline.properties/en-CA.po +7 3 build/i18n/po/offline.properties/en-GB.po +7 3 build/i18n/po/offline.properties/es-ES.po +8 4 build/i18n/po/offline.properties/fi-FI.po +7 3 build/i18n/po/offline.properties/fr-CA.po +7 3 build/i18n/po/offline.properties/hy-AM.po +7 3 build/i18n/po/offline.properties/oc-FR.po +7 3 build/i18n/po/offline.properties/pt-BR.po +7 3 build/i18n/po/offline.properties/ru-RU.po +7 3 build/i18n/po/offline.properties/tr-TR.po +1 1 build/i18n/po/opac.dtd/fi-FI.po +1 1 build/i18n/po/opac.js/fi-FI.po +11 4 build/i18n/po/opac.js/opac.js.pot +40 18 build/i18n/po/patron.properties/cs-CZ.po +38 14 build/i18n/po/patron.properties/de-DE.po +39 15 build/i18n/po/patron.properties/en-CA.po +39 15 build/i18n/po/patron.properties/en-GB.po +22 10 build/i18n/po/patron.properties/es-ES.po +40 16 build/i18n/po/patron.properties/fi-FI.po +38 14 build/i18n/po/patron.properties/fr-CA.po +39 15 build/i18n/po/patron.properties/hy-AM.po +18 9 build/i18n/po/patron.properties/oc-FR.po +38 14 build/i18n/po/patron.properties/pt-BR.po +38 14 build/i18n/po/patron.properties/ru-RU.po +23 11 build/i18n/po/patron.properties/tr-TR.po +1 1 build/i18n/po/pickup_and_return.js/fi-FI.po +1 1 build/i18n/po/pull_list.js/fi-FI.po +29 22 build/i18n/po/register.js/cs-CZ.po +29 22 build/i18n/po/register.js/de-DE.po +29 22 build/i18n/po/register.js/en-CA.po +29 22 build/i18n/po/register.js/en-GB.po +29 22 build/i18n/po/register.js/es-ES.po +30 23 build/i18n/po/register.js/fi-FI.po +29 22 build/i18n/po/register.js/fr-CA.po +29 22 build/i18n/po/register.js/hy-AM.po +29 22 build/i18n/po/register.js/oc-FR.po +30 23 build/i18n/po/register.js/pt-BR.po +11 10 build/i18n/po/register.js/register.js.pot +29 22 build/i18n/po/register.js/ru-RU.po +23 20 build/i18n/po/register.js/tr-TR.po +1 1 build/i18n/po/reports.dtd/fi-FI.po +1 1 build/i18n/po/reports.js/fi-FI.po +1 1 build/i18n/po/reservation.js/fi-FI.po +5 2 build/i18n/po/reservation.js/reservation.js.pot +60 29 build/i18n/po/selfcheck.js/cs-CZ.po +41 25 build/i18n/po/selfcheck.js/de-DE.po +60 29 build/i18n/po/selfcheck.js/en-CA.po +60 29 build/i18n/po/selfcheck.js/en-GB.po +48 26 build/i18n/po/selfcheck.js/es-ES.po +61 30 build/i18n/po/selfcheck.js/fi-FI.po +60 29 build/i18n/po/selfcheck.js/fr-CA.po +60 29 build/i18n/po/selfcheck.js/hy-AM.po +44 25 build/i18n/po/selfcheck.js/oc-FR.po +60 29 build/i18n/po/selfcheck.js/pt-BR.po +40 24 build/i18n/po/selfcheck.js/ru-RU.po +8 3 build/i18n/po/selfcheck.js/selfcheck.js.pot +11 3 build/i18n/po/serial.properties/cs-CZ.po +11 3 build/i18n/po/serial.properties/de-DE.po +11 3 build/i18n/po/serial.properties/en-CA.po +11 3 build/i18n/po/serial.properties/en-GB.po +11 3 build/i18n/po/serial.properties/es-ES.po +12 4 build/i18n/po/serial.properties/fi-FI.po +11 3 build/i18n/po/serial.properties/fr-CA.po +11 3 build/i18n/po/serial.properties/hy-AM.po +11 3 build/i18n/po/serial.properties/oc-FR.po +11 3 build/i18n/po/serial.properties/pt-BR.po +11 3 build/i18n/po/serial.properties/tr-TR.po +8 8 build/i18n/po/tpac/tpac.pot + +commit a6e64bfe9ebd5d8512b490f757a09cf848e18805 +Author: Galen Charlton +Date: Thu Sep 26 14:24:42 2013 -0700 + + LP#1207281: require SSL when downloading offline patron list + + This patch builds on the previous one by forcing use of + SSL for downloading the offline patron list. + + Signed-off-by: Galen Charlton + Signed-off-by: Bill Erickson + +1 0 Open-ILS/examples/apache/eg_vhost.conf +1 1 Open-ILS/xul/staff_client/chrome/content/main/menu.js + +commit a97d5e0c87369a3ed9d23abf010ec368e8460e18 +Author: Michael Peters +Date: Tue Sep 24 16:57:37 2013 -0400 + + LP#1207281 Prevent download of offline patron list without authentication + + This patch addresses the vulnerability which allowed a user with the proper + knowledge of the location of offline patron lists to download the file over + regular HTTP without any staff credentials. + + This small addition to eg_vhost.conf.in will present users with a login prompt + when trying to access the /standalone/ subdirectory on an Evergreen server. + + Users are able to download the patron list in the staff client as normal + because they already have obtained credentials during the normal staff client + authentication process. + + Signed-off-by: Michael Peters + Signed-off-by: Galen Charlton + Signed-off-by: Bill Erickson + +13 0 Open-ILS/examples/apache/eg_vhost.conf + +commit caa65873f6fa5e20b4a5bde84af3b4748bc3745a +Author: Ben Shum +Date: Thu Oct 11 22:04:30 2012 -0400 + + LP#1066141: add authtoken check and related permission for age to lost function + + The SET_CIRC_LOST permission is now required in order to invoke + the open-ils.circ.circulation.age_to_lost method. + + Signed-off-by: Ben Shum + Signed-off-by: Galen Charlton + Signed-off-by: Bill Erickson + +3 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm + +commit e8d713ddb980400998e30884f3443221e1662d8e +Author: Jason Stephenson +Date: Wed Jan 30 16:56:12 2013 -0500 + + Fix an omission in the log redaction configuration. + + open-ils.actor.patron.password_reset.commit was omitted in the + block of opensrf_core.xml.example. This commit adds + it and updates the release notes for 2.3 to include it. + + There is also a release notes file informing users that they need to + edit opensrf_core.xml to address this issue. + + Signed-off-by: Jason Stephenson + Signed-off-by: Galen Charlton + Signed-off-by: Bill Erickson + +1 0 Open-ILS/examples/opensrf_core.xml.example +1 0 docs/RELEASE_NOTES_2_3.txt +9 0 docs/RELEASE_NOTES_NEXT/password_reset_commit_not_secure.txt + create mode 100644 docs/RELEASE_NOTES_NEXT/password_reset_commit_not_secure.txt + +commit 9f35cdfbcde7abb2d76d73ca65aff4b736addc48 +Author: Pasi Kallinen +Date: Wed Sep 11 08:54:55 2013 +0300 + + Fix delete items confirmation typo. + + Signed-off-by: Pasi Kallinen + Signed-off-by: Ben Shum + +1 1 Open-ILS/xul/staff_client/server/locale/en-US/circ.properties + +commit c9029e11372306b14888085abc8bdee98ba91e21 +Author: Lebbeous Fogle-Weekley +Date: Thu Sep 5 13:24:54 2013 -0400 + + Better handling of purchase_order being non-numeric + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Ben Shum + +3 2 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/EDI.pm + +commit 40b54d040927d5361ff65fc7c075a51fc5ba033f +Author: Bill Erickson +Date: Thu Aug 22 16:47:27 2013 -0400 + + Action/Trigger load environment via stream + + Load objects in the A/T environment via streaming response instead of + atomic, to avoid very large messages. + + Signed-off-by: Bill Erickson + Signed-off-by: Chris Sharp + +4 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Event.pm + +commit d2dca2ec9482233d97bcd410e5aaf2c8ceef3474 +Author: Mike Rylander +Date: Fri Aug 30 11:22:27 2013 -0400 + + Have TPAC put user input at the end in all cases + + Signed-off-by: Mike Rylander + Signed-off-by: Jason Etheridge + +16 15 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm + +commit ca021fac379e8141f18faa3ec22c28899c268df7 +Author: Mike Rylander +Date: Wed Aug 28 15:05:36 2013 -0400 + + Stream facet data + + For certain shapes of facet datasets, the .atomic version of the + json_query call can produce an XMPP message large enough to cause + ejabberd to fall over unceremoniously. Switch to a streaming + CStoreEditor-based call instead to avoid this. + + Ideally, this would use message bundling (aka, chunking) as well, + but the C parts of OpenSRF don't seem to support that yet. + + Signed-off-by: Mike Rylander + Signed-off-by: Dan Wells + +1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm + +commit 425bf4a9a6b0134abd54dc0e8e1f5bef0a51efc5 +Author: Ben Shum +Date: Fri Sep 6 23:20:16 2013 -0400 + + Stamping upgrade script for biblio A/T title variable fix + + Signed-off-by: Ben Shum + + Conflicts: + Open-ILS/src/sql/Pg/002.schema.config.sql + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +18 0 Open-ILS/src/sql/Pg/upgrade/0825.data.bre_format.sql +0 18 Open-ILS/src/sql/Pg/upgrade/XXXX.data.bre_format.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0825.data.bre_format.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.bre_format.sql + +commit 4ebd19b0f7a51d6417eb1f9c33adc7bf3df0d390 +Author: Jason Etheridge +Date: Thu Nov 8 11:27:13 2012 -0500 + + reset title variable when looping with biblio A/T + + Two templates that I'm concerned with, though there may be others that could use + this treatment: biblio.record_entry.email and biblio.record_entry.print + + Basically, they can group events from the same user and consolidate bibs, but as + they loop through the bibs they're not clearing the temporary variable that + contains the bib title, so we get duplicated and run-on titles in the output. + + Signed-off-by: Jason Etheridge + Signed-off-by: Ben Shum + + Conflicts: + Open-ILS/src/sql/Pg/002.schema.config.sql + +2 2 Open-ILS/src/sql/Pg/950.data.seed-values.sql +18 0 Open-ILS/src/sql/Pg/upgrade/XXXX.data.bre_format.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.bre_format.sql + +commit fa4f670254b912cda0383a58a5c6a7c09c1177ca +Author: Chris Sharp +Date: Mon Aug 19 14:29:23 2013 -0400 + + The ILS User reports source branches to an All Hold Requests linked source + that was marked class="circ" instead of class="ahr". This corrects that problem. + + Signed-off-by: Chris Sharp + Signed-off-by: Ben Shum + +1 1 Open-ILS/examples/fm_IDL.xml + +commit b0923e11f5180efee27ab39528f946cfe05b9905 +Author: Ben Shum +Date: Fri Sep 6 22:49:30 2013 -0400 + + Fix some bad break syntax + + Change
to a more appropriate
+ + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/templates/opac/password_reset.tt2 + +commit 8b8f2690a71d5cbba67f31b6ee67229db0393378 +Author: Pasi Kallinen +Date: Wed Sep 4 09:07:47 2013 +0300 + + Unify appellee/appellant relators + + Signed-off-by: Pasi Kallinen + Signed-off-by: Dan Scott + +3 3 Open-ILS/src/templates/opac/parts/relators.tt2 + +commit 19c521d3e8ab775f1c7b8fa70b583477c13e990a +Author: Dan Scott +Date: Fri Apr 5 13:21:47 2013 -0400 + + Fix schema.org mapping for MusicAlbum, add Map + + We had set LDR[06] = j to MusicRecording, but that is really meant for + individual songs. Use MusicAlbum instead, and per + http://schema.org/MusicAlbum, use a new MusicGroup itemtype with a + 'byArtist' property for the primary artist rather than the generic + 'accountablePerson'. + + Also map LDR[06] = e to Map, because that seems like a safe bet. + + Signed-off-by: Dan Scott + Signed-off-by: Mike Rylander + + Conflicts: + Open-ILS/src/templates/opac/parts/record/authors.tt2 + +2 1 Open-ILS/src/templates/opac/parts/misc_util.tt2 + +commit fb4f2ee82e747f338bb52ff121c50eea7e406488 +Author: Pasi Kallinen +Date: Wed Jul 17 19:07:45 2013 +0300 + + Save times in HH:MM format for hours of operation + + When editing Hours of Operation, save the times in HH:MM format, + as that is what the database wants. + + Signed-off-by: Pasi Kallinen + Signed-off-by: Dan Wells + +14 14 Open-ILS/web/conify/global/actor/org_unit.html +5 0 Open-ILS/web/conify/global/actor/org_unit.js + +commit 46959b3963e4ae4f9e8faae64b1772259cc58384 +Author: Chris Sharp +Date: Mon Jul 22 12:35:46 2013 -0400 + + Fixing LP 1203796. + + The alternate view in the Item Status screen shows a "Total Circs" + field that was under-counting circulations because UNION filtered + out duplicates. This commit replaces UNION with UNION ALL, which + allows duplicate rows. + + Signed-off-by: Chris Sharp + Signed-off-by: Ben Shum + +2 2 Open-ILS/examples/fm_IDL.xml + +commit 58845f8a32dbf95c84a44d3d77538db9ac4782f0 +Author: Ben Shum +Date: Thu Aug 22 12:11:54 2013 -0400 + + Stamping upgrade for browse normalization timing fix + + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +76 0 Open-ILS/src/sql/Pg/upgrade/0821.function.browse-normalize-timing.sql +0 76 Open-ILS/src/sql/Pg/upgrade/XXXX.function.browse-normalize-timing.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0821.function.browse-normalize-timing.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.browse-normalize-timing.sql + +commit 2f135e6d21c13a3c5ce013343e0991369f3f9624 +Author: Mike Rylander +Date: Tue Aug 20 16:00:48 2013 -0400 + + Browse normalization timing fix + + When indexing browse entries, we need to normalize the value we want to use + before we go looking for it in the table, for uniqueness. We do in master, + we need to in 2.3 as well. + + Signed-off-by: Mike Rylander + Signed-off-by: Ben Shum + +4 3 Open-ILS/src/sql/Pg/030.schema.metabib.sql +76 0 Open-ILS/src/sql/Pg/upgrade/XXXX.function.browse-normalize-timing.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.function.browse-normalize-timing.sql + +commit 99cc0c0fe9550f5d0731f042df8341de46ed1198 +Author: Mike Rylander +Date: Wed Aug 14 10:25:14 2013 -0400 + + Correctly mark nested INNER joins as such + + We've been adopting containing the JOINs flavor, and then + attempting to use IS NOT NULL to restrict NULL-ness + in the WHERE clause. This is almost right, but not quite, + and was done in an attempt to match behavior with the + expectations of users that are not SQL experts. However, + right is better than "looks right most of the time", so + we use the proper join type now. + + Signed-off-by: Mike Rylander + Signed-off-by: Jason Boyer + + Conflicts [just whitespace style]: + Open-ILS/src/perlmods/lib/OpenILS/Reporter/SQLBuilder.pm + +1 1 Open-ILS/src/perlmods/lib/OpenILS/Reporter/SQLBuilder.pm + +commit 3e7f6f8bdf1c11b557df000c22d6809cc8e62698 +Author: Thomas Berezansky +Date: Thu Nov 1 09:08:38 2012 -0400 + + Fix A/T object cache + + Signed-off-by: Thomas Berezansky + Signed-off-by: Mike Rylander + +14 10 Open-ILS/src/perlmods/lib/OpenILS/Application/Trigger/Event.pm + +commit b8f5167c16c91a330625b82da8a0438587a43c7d +Author: Bill Erickson +Date: Thu May 23 13:30:43 2013 -0400 + + LP1183467 ACQ view funding source list permissions + + Limit the set of funding sources visible in the funding source list + interface by those the user has view permissions for, not just those the + user has edit permissions for. + + Signed-off-by: Bill Erickson + Signed-off-by: Remington Steed + Signed-off-by: Mike Rylander + +1 1 Open-ILS/web/js/ui/default/acq/financial/list_funding_sources.js + +commit 730b9492380f2aba97b5b26298dc97f929527961 +Author: Mike Rylander +Date: Thu Aug 22 11:26:20 2013 -0400 + + Stamping upgrade script for series title normalizer improvement + + Signed-off-by: Mike Rylander + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +28 0 Open-ILS/src/sql/Pg/upgrade/0820.data.series_normalizer.sql +0 28 Open-ILS/src/sql/Pg/upgrade/xxxx.data.series_normalizer.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/0820.data.series_normalizer.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/xxxx.data.series_normalizer.sql + +commit 1465e5b424b8e4c28ab013ff5385c1a57a7d3eae +Author: Steven Callender +Date: Tue Jun 4 14:11:50 2013 -0400 + + Remove [ and ] characters from seriestitle index LP#1187521 + + Signed-off-by: Steven Callender + Signed-off-by: Mike Rylander + +20 0 Open-ILS/src/sql/Pg/950.data.seed-values.sql +28 0 Open-ILS/src/sql/Pg/upgrade/xxxx.data.series_normalizer.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/xxxx.data.series_normalizer.sql + +commit 07c4756a92e6adc839c68e7f5e9e27e22d080ac6 +Author: Mike Rylander +Date: Fri Jul 12 14:43:57 2013 -0400 + + Repair remaining Authority Fixed Field editor entries + + The "Item" fixed field is only valid for MFHD records, so we remove + that entirely from AUTH records. The "GeoSubd" fixed field is + spelled "GeoDiv" everywhere, so we align that naming so that it can + be saved. + + Signed-off-by: Mike Rylander + +1 1 Open-ILS/web/js/dojo/MARC/FixedFields.js +1 1 Open-ILS/xul/staff_client/server/cat/marcedit.xul + +commit 2e417b99130665dfc2c31e10f6b2c9f227e6c946 +Author: Bill Erickson +Date: Thu Aug 22 10:24:57 2013 -0400 + + Propagating 2.3.10 DB upgrade script + + Signed-off-by: Bill Erickson + +75 0 Open-ILS/src/sql/Pg/version-upgrade/2.3.9-2.3.10-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.3.9-2.3.10-upgrade-db.sql + +commit 3ca227fe857467d8007a895444dca0ab346f89f0 +Author: Lebbeous Fogle-Weekley +Date: Mon Jan 23 18:44:00 2012 -0500 + + Invoke skull-and-crossbones popup in batch receive for server-side errors + + And introduce a minor bumper rail to guide serials users who might try + to hand-edit a holding code. + + Signed-off-by: Lebbeous Fogle-Weekley + + Conflicts: + Open-ILS/xul/staff_client/server/serial/batch_receive.js + + Signed-off-by: Dan Wells + +14 2 Open-ILS/web/js/dojo/openils/widget/HoldingCode.js +28 9 Open-ILS/xul/staff_client/server/serial/batch_receive.js + +commit c6106d83fbb34370a720c477300a19e1deb7132e +Author: Bill Erickson +Date: Wed Aug 21 09:51:10 2013 -0400 + + Copying 2.3.8-2.3.9 SQL upgrade script + + Signed-off-by: Bill Erickson + +94 0 Open-ILS/src/sql/Pg/version-upgrade/2.3.8-2.3.9-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.3.8-2.3.9-upgrade-db.sql diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index cd4dbbf9c0..64b678587f 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm @@ -6,7 +6,7 @@ use base qw/OpenSRF::Application/; 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-3-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 a490dc5ee4..9a5d004d79 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -88,6 +88,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 ('0825', :eg_version); -- phasefx/bshum +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.3.11', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.3.10-2.3.11-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.3.10-2.3.11-upgrade-db.sql new file mode 100644 index 0000000000..9e8796b656 --- /dev/null +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.3.10-2.3.11-upgrade-db.sql @@ -0,0 +1,121 @@ +--Upgrade Script for 2.3.10 to 2.3.11 +\set eg_version '''2.3.11''' +BEGIN; +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.3.11', :eg_version); + +-- Remove [ and ] characters from seriestitle. +-- Those characters don't play well when searching. + +SELECT evergreen.upgrade_deps_block_check('0820', :eg_version); -- Callender + +INSERT INTO config.metabib_field_index_norm_map (field,norm,params, pos) + SELECT m.id, + i.id, + $$["]",""]$$, + '-1' + FROM config.metabib_field m, + config.index_normalizer i + WHERE i.func IN ('replace') + AND m.id IN (1); + +INSERT INTO config.metabib_field_index_norm_map (field,norm,params, pos) + SELECT m.id, + i.id, + $$["[",""]$$, + '-1' + FROM config.metabib_field m, + config.index_normalizer i + WHERE i.func IN ('replace') + AND m.id IN (1); + + +SELECT evergreen.upgrade_deps_block_check('0821', :eg_version); + +CREATE OR REPLACE FUNCTION metabib.reingest_metabib_field_entries( bib_id BIGINT, skip_facet BOOL DEFAULT FALSE, skip_browse BOOL DEFAULT FALSE, skip_search BOOL DEFAULT FALSE ) RETURNS VOID AS $func$ +DECLARE + fclass RECORD; + ind_data metabib.field_entry_template%ROWTYPE; + mbe_row metabib.browse_entry%ROWTYPE; + mbe_id BIGINT; + mbe_txt TEXT; +BEGIN + PERFORM * FROM config.internal_flag WHERE name = 'ingest.assume_inserts_only' AND enabled; + IF NOT FOUND THEN + IF NOT skip_search THEN + FOR fclass IN SELECT * FROM config.metabib_class LOOP + -- RAISE NOTICE 'Emptying out %', fclass.name; + EXECUTE $$DELETE FROM metabib.$$ || fclass.name || $$_field_entry WHERE source = $$ || bib_id; + END LOOP; + END IF; + IF NOT skip_facet THEN + DELETE FROM metabib.facet_entry WHERE source = bib_id; + END IF; + IF NOT skip_browse THEN + DELETE FROM metabib.browse_entry_def_map WHERE source = bib_id; + END IF; + END IF; + + FOR ind_data IN SELECT * FROM biblio.extract_metabib_field_entry( bib_id ) LOOP + IF ind_data.field < 0 THEN + ind_data.field = -1 * ind_data.field; + END IF; + + IF ind_data.facet_field AND NOT skip_facet THEN + INSERT INTO metabib.facet_entry (field, source, value) + VALUES (ind_data.field, ind_data.source, ind_data.value); + END IF; + + IF ind_data.browse_field AND NOT skip_browse THEN + -- A caveat about this SELECT: this should take care of replacing + -- old mbe rows when data changes, but not if normalization (by + -- which I mean specifically the output of + -- evergreen.oils_tsearch2()) changes. It may or may not be + -- expensive to add a comparison of index_vector to index_vector + -- to the WHERE clause below. + mbe_txt := metabib.browse_normalize(ind_data.value, ind_data.field); + SELECT INTO mbe_row * FROM metabib.browse_entry WHERE value = mbe_txt; + IF FOUND THEN + mbe_id := mbe_row.id; + ELSE + INSERT INTO metabib.browse_entry (value) VALUES (mbe_txt); + mbe_id := CURRVAL('metabib.browse_entry_id_seq'::REGCLASS); + END IF; + + INSERT INTO metabib.browse_entry_def_map (entry, def, source) + VALUES (mbe_id, ind_data.field, ind_data.source); + END IF; + + IF ind_data.search_field AND NOT skip_search THEN + EXECUTE $$ + INSERT INTO metabib.$$ || ind_data.field_class || $$_field_entry (field, source, value) + VALUES ($$ || + quote_literal(ind_data.field) || $$, $$ || + quote_literal(ind_data.source) || $$, $$ || + quote_literal(ind_data.value) || + $$);$$; + END IF; + + END LOOP; + + RETURN; +END; +$func$ LANGUAGE PLPGSQL; + + +-- Evergreen DB patch 0825.data.bre_format.sql +-- +-- Fix some templates that loop over bibs to not have duplicated/run-on titles +-- + +-- check whether patch can be applied +SELECT evergreen.upgrade_deps_block_check('0825', :eg_version); + +-- I think we shy away from modifying templates on existing systems, but this seems pretty safe... +UPDATE + action_trigger.event_definition +SET + template = replace(template,'[% FOR cbreb IN target %]','[% FOR cbreb IN target %][% title = '''' %]') +WHERE + id IN (31,32); + +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 2737f47bf1..3978356c01 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_3_11

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 6352b6e04e..ecc1822a40 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_3_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 e0bc1ef5df..e7e96bb1ed 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.3" !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..bf3a9a5e43 --- /dev/null +++ b/README @@ -0,0 +1,549 @@ +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/downloads + +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 +------------------------------------------------------------------------------ + +After running `make install`, developers also 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/. +------------------------------------------------------------------------------ + +Installing prerequisites +------------------------ + +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.1 or later). + You can download OpenSRF releases from http://evergreen-ils.org/opensrf.php +2. On many distributions, it is necessary to install PostgreSQL 9 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 +------------------------------------------------------------------------------ ++ + * On Ubuntu Lucid, you can use a PPA (personal package archive), which are + package sources hosted on Launchpad. The one most commonly used by Evergreen + Community members is maintained by Martin Pitt, who also maintains the + official PostgreSQL packages for Ubuntu. As the *root* Linux account, issue + the following commands to add the PPA source: ++ +[source, bash] +------------------------------------------------------------------------------ +apt-get install python-software-properties +add-apt-repository ppa:pitti/postgresql +------------------------------------------------------------------------------ ++ + * Ubuntu Precise comes with PostgreSQL 9, so no additional steps are required. ++ + * Fedora comes with PostgreSQL 9, 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-squeeze`, `fedora`, `ubuntu-lucid`, 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. The ubuntu-precise +target uses libdbd-pgsql from packages. ++ +.Debian / Ubuntu Lucid +[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] +------------------------------------------------------------------------------ +./configure --prefix=/openils --sysconfdir=/openils/conf +make +------------------------------------------------------------------------------ + +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_3_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 +------------------------------------------------------------------------------ + +Configure the Apache Web server +------------------------------- + +1. Use the example configuration files in `Open-ILS/examples/apache/` 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 and Ubuntu +[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/startup.pl /etc/apache2/ +# Now set up SSL +mkdir /etc/apache2/ssl +cd /etc/apache2/ssl +------------------------------------------------------------------------------ ++ +.Fedora +[source,bash] +------------------------------------------------------------------------------ +cp Open-ILS/examples/apache/eg.conf /etc/httpd/conf.d/ +cp Open-ILS/examples/apache/eg_vhost.conf /etc/httpd/ +cp Open-ILS/examples/apache/startup.pl /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. Replace `Allow from 10.0.0.0/8` with `Allow from all` (to enable + access to the offline upload / execute interface from any workstation on + any network - note that you must secure this for a production instance) + 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. 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 + +------------------------------------------------------------------------------ ++ +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 and Ubuntu): 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 +------------------------------------------------------------------------------ + +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.pl`, described in the following section, sets the database +connection information in `opensrf.xml` for you. + +Creating the Evergreen database +------------------------------- + +By default, the `Makefile.install` prerequisite installer does not install +the PostgreSQL 9 database server required by every Evergreen system; +for production use, most libraries install the PostgreSQL database server on a +dedicated machine. You can install the packages required by Debian or Ubuntu Lucid +on the machine of your choice using the following commands as the *root* +Linux account: + +.(Debian and Ubuntu Lucid) Installing PostgreSQL 9.1 server packages +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_backport_debs_91 +------------------------------------------------------------------------------ + +.(Ubuntu Precise) Installing PostgreSQL 9.1 server packages +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_debs_91 +------------------------------------------------------------------------------ + +You can install the packages required by Fedora on the machine of your choice +using the following commands as the *root* Linux account: + +.(Fedora) Installing PostgreSQL server packages +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install install_fedora_pgsql_server +postgresql-setup initdb +------------------------------------------------------------------------------ + +For a standalone PostgreSQL server, install the following Perl modules as the +*root* Linux account: + +.(Debian / Ubuntu) Installing additional Perl modules on a standalone PostgreSQL 9 server +[source, bash] +------------------------------------------------------------------------------ +aptitude install gcc libxml-libxml-perl libxml-libxslt-perl +cpan Business::ISBN +cpan JSON::XS +cpan Library::CallNumber::LC +cpan MARC::Record +cpan MARC::File::XML +cpan UUID::Tiny +------------------------------------------------------------------------------ + +.(Fedora) Installing additional Perl modules on a standalone PostgreSQL 9 server +[source, bash] +------------------------------------------------------------------------------ +yum install gcc perl-XML-LibXML perl-XML-LibXSLT perl-Business-ISBN +cpan Library::CallNumber::LC +cpan MARC::Record +cpan MARC::File::XML +cpan UUID::Tiny +------------------------------------------------------------------------------ + +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 +------------------------------------------------------------------------------ + +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.pl --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. + +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.pl`. + +For PostgreSQL 9.0 +^^^^^^^^^^^^^^^^^^ +To create the database instance on a remote database server running PostgreSQL +9.0, you can either: + + * Install the PostgreSQL contrib modules on the machine on which you + are installing the Evergreen code, and use the `--create-database` + option from that machine, or + * Copy the `Open-ILS/src/sql/Pg/create_database.sql` script to your + PostgreSQL server and invoke it as the *postgres* Linux account: ++ +[source, bash] +------------------------------------------------------------------------------ +psql -vdb_name= -vcontrib_dir=`pg_config --sharedir`/contrib -f create_database.sql +------------------------------------------------------------------------------ + +Then you can issue the `eg_db_config.pl` command as above _without_ the +`--create-database` argument to create your schema and configure your +configuration files. + +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_ctl.sh -l -a start_all +------------------------------------------------------------------------------ ++ + ** If you receive the error message `bash: osrf_ctl.sh: 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 hierarchy in `config.cgi`): ++ +[source, bash] +------------------------------------------------------------------------------ +autogen.sh -u +------------------------------------------------------------------------------ ++ +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.pl` 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 + ------------------------------------ + +If this does not work, it's time to do some troubleshooting. + + * As the *opensrf* Linux acccount, 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://open-ils.org/listserv.php[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/listserv.php 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 89e64f6829..738d7eb2a8 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.3.11, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [2.3.11]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_PREFIX_DEFAULT([/openils/])