From: Mike Rylander Date: Thu, 19 Dec 2013 16:17:21 +0000 (-0500) Subject: Bumping version numbers, adding Upgrade Script and Changelog X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e7fd54c07b76ab362e8e3eee568b40d6720ecd2a;p=working%2FEvergreen.git Bumping version numbers, adding Upgrade Script and Changelog Signed-off-by: Mike Rylander --- diff --git a/ChangeLog b/ChangeLog index 1f72b2c73e..d161a5d080 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,363 @@ -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 8fe91eed0b7089988347de3fd84d02848b91ebc5 +Author: Mike Rylander +Date: Tue Nov 26 15:22:43 2013 -0500 + + Updating translations; Fixing make_release for ChangeLog generation + + Signed-off-by: Mike Rylander + +1 1 build/i18n/po/AutoFieldWidget.js/fi-FI.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 +2 4 build/i18n/po/XULTermLoader.js/XULTermLoader.js.pot +1 1 build/i18n/po/XULTermLoader.js/fi-FI.po +15 37 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 +2 4 build/i18n/po/capture.js/capture.js.pot +1 1 build/i18n/po/capture.js/fi-FI.po +1 1 build/i18n/po/cat.properties/fi-FI.po +2 2 build/i18n/po/circ.properties/circ.properties.pot +1 1 build/i18n/po/circ.properties/fi-FI.po +1 1 build/i18n/po/common.properties/fi-FI.po +7 19 build/i18n/po/conify.js/conify.js.pot +1 1 build/i18n/po/conify.js/fi-FI.po +691 691 build/i18n/po/db.seed/db.seed.pot +1 1 build/i18n/po/db.seed/fi-FI.po +1 1 build/i18n/po/fm_IDL.dtd/fi-FI.po +17 17 build/i18n/po/fm_IDL.dtd/fm_IDL.dtd.pot +1 1 build/i18n/po/ils_events.xml/fi-FI.po +298 358 build/i18n/po/ils_events.xml/ils_events.xml.pot +1 1 build/i18n/po/lang.dtd/fi-FI.po +6 2 build/i18n/po/lang.dtd/lang.dtd.pot +1 1 build/i18n/po/offline.properties/fi-FI.po +1 1 build/i18n/po/opac.dtd/fi-FI.po +1 1 build/i18n/po/opac.js/fi-FI.po +4 11 build/i18n/po/opac.js/opac.js.pot +1 1 build/i18n/po/patron.properties/fi-FI.po +1 1 build/i18n/po/pickup_and_return.js/fi-FI.po +1 1 build/i18n/po/pull_list.js/fi-FI.po +1 1 build/i18n/po/register.js/fi-FI.po +10 11 build/i18n/po/register.js/register.js.pot +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 +2 5 build/i18n/po/reservation.js/reservation.js.pot +1 1 build/i18n/po/selfcheck.js/fi-FI.po +3 8 build/i18n/po/selfcheck.js/selfcheck.js.pot +1 1 build/i18n/po/serial.properties/fi-FI.po +6 6 build/i18n/po/tpac/tpac.pot +1 1 build/tools/make_release + +commit 37b9a2cf5789364918b333418314e8fd57a458d6 +Author: Mike Rylander +Date: Tue Nov 26 14:57:46 2013 -0500 + + Updating PO files from launchpad + + Signed-off-by: Mike Rylander + +1 1 build/i18n/po/AutoFieldWidget.js/fi-FI.po +9 9 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 +1 1 build/i18n/po/XULTermLoader.js/fi-FI.po +13 11 build/i18n/po/admin.properties/es-ES.po +1 1 build/i18n/po/admin.properties/fi-FI.po +1 1 build/i18n/po/auth.properties/fi-FI.po +21 21 build/i18n/po/authority.js/es-ES.po +1 1 build/i18n/po/authority.js/fi-FI.po +1 1 build/i18n/po/capture.js/fi-FI.po +16 14 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 +53 42 build/i18n/po/cat.properties/es-ES.po +18 15 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 +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 +34 13 build/i18n/po/circ.properties/es-ES.po +30 8 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 +12 4 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 +17 9 build/i18n/po/common.properties/es-ES.po +21 12 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 +6 6 build/i18n/po/conify.js/es-ES.po +1 1 build/i18n/po/conify.js/fi-FI.po +9543 3073 build/i18n/po/db.seed/cs-CZ.po +8455 2323 build/i18n/po/db.seed/de-DE.po +8753 2722 build/i18n/po/db.seed/en-CA.po +8761 2795 build/i18n/po/db.seed/en-GB.po +8438 2405 build/i18n/po/db.seed/es-ES.po +9624 3331 build/i18n/po/db.seed/fi-FI.po +9764 3798 build/i18n/po/db.seed/fr-CA.po +9808 3842 build/i18n/po/db.seed/hy-AM.po +8480 2343 build/i18n/po/db.seed/oc-FR.po +9317 3270 build/i18n/po/db.seed/pt-BR.po +9164 3120 build/i18n/po/db.seed/ru-RU.po +7960 1826 build/i18n/po/db.seed/tr-TR.po +2679 2480 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 +2643 2450 build/i18n/po/fm_IDL.dtd/es-ES.po +2731 2528 build/i18n/po/fm_IDL.dtd/fi-FI.po +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 +270 257 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 +286 270 build/i18n/po/ils_events.xml/es-ES.po +272 258 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 +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 +900 38 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 +856 30 build/i18n/po/lang.dtd/es-ES.po +1485 629 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 +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 +8 4 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 +59 44 build/i18n/po/offline.properties/es-ES.po +10 5 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 +9 5 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 +16 10 build/i18n/po/opac.dtd/es-ES.po +7 6 build/i18n/po/opac.dtd/fi-FI.po +6 5 build/i18n/po/opac.js/es-ES.po +1 1 build/i18n/po/opac.js/fi-FI.po +41 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 +44 32 build/i18n/po/patron.properties/es-ES.po +44 19 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 +21 20 build/i18n/po/pickup_and_return.js/es-ES.po +1 1 build/i18n/po/pickup_and_return.js/fi-FI.po +6 6 build/i18n/po/pull_list.js/es-ES.po +1 1 build/i18n/po/pull_list.js/fi-FI.po +30 23 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 +36 29 build/i18n/po/register.js/es-ES.po +32 24 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 +29 22 build/i18n/po/register.js/ru-RU.po +23 20 build/i18n/po/register.js/tr-TR.po +20 8 build/i18n/po/reports.dtd/es-ES.po +8 7 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 +62 30 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 +67 42 build/i18n/po/selfcheck.js/es-ES.po +63 31 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 +25 13 build/i18n/po/serial.properties/cs-CZ.po +15 3 build/i18n/po/serial.properties/de-DE.po +15 3 build/i18n/po/serial.properties/en-CA.po +15 3 build/i18n/po/serial.properties/en-GB.po +19 7 build/i18n/po/serial.properties/es-ES.po +31 18 build/i18n/po/serial.properties/fi-FI.po +15 3 build/i18n/po/serial.properties/fr-CA.po +15 3 build/i18n/po/serial.properties/hy-AM.po +15 3 build/i18n/po/serial.properties/oc-FR.po +15 3 build/i18n/po/serial.properties/pt-BR.po +15 3 build/i18n/po/serial.properties/tr-TR.po +5 5 build/i18n/po/vandelay.dtd/es-ES.po + +commit d7ef743766389a85111f9061cce17687ba5326a1 +Author: Galen Charlton +Date: Mon Nov 25 10:05:21 2013 -0800 + + LP#1254816: prevent cases where a Google Book preview is not displayed + + Due to quirks in how different parts of the Google Books API + processes ISBN searches, it is possible for a Google Books Preview + badge to get displayed, but when the user tries to display the preview, + the embedded preview does not get displayed. + + This patch fixes the problem by grabbing the preview link from + the GB volumes search results, which in turn can be fed into the + Embedded Viewer initialization. + + An ISBN that can be used to reproduce the problem is 9781937994198. + Before the patch, the badge is displayed but not the preview; after + the patch, both badge and preview should be displayed. + + Signed-off-by: Galen Charlton + Signed-off-by: Mike Rylander + +6 1 Open-ILS/src/templates/opac/parts/ac_google_books.tt2 + +commit ccc9672ab69909cfe9c7dcdd52b9fa84d0784c44 +Author: Angela Kilsdonk +Date: Tue Dec 10 14:52:18 2013 -0500 + + Documentation for Sorting Billing Columns + + Docs for sorting money columns in billing interface. In ersions 2.3-2.5. + + Signed-off-by: Angela Kilsdonk + +6 0 docs/circulation/circulation_patron_records.txt + +commit 95ae747f0e0317013dd6838b65187544769b092c +Author: Steven Chan +Date: Wed May 15 14:30:15 2013 -0700 + + Fix LP1180140, View Holds not working for a serial with subscription and no issuances + + A request is made to + open-ils.circ.holds.retrieve_all_from_title, + which is the function Circ/Holds.pm/all_rec_holds(). + + In the function, when checking for issuance holds, there is a missing @ + to dereference the list of issuance IDs, so that the ahr table is search + with badly formed input, which results in returning an undefined list + instead of an empty list. The error will occur for any record with a + serial.subscription entry but with no related entries in + serial.issuance. + + We also recode the initialization of the response object in order to + clarify its expected structure, a hash of array references. + + Signed-off-by: Steven Chan + Signed-off-by: Lebbeous Fogle-Weekley + +11 2 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm + +commit b22be745f55541d841c20ce98d2f98db03012f57 +Author: Elliot Voris +Date: Sat Dec 7 15:24:46 2013 -0600 + + Documentation typo in Authorities chapter subheading + Addresses this bugs reported in launchpad: + https://bugs.launchpad.net/evergreen/+bug/1248726 + + I also browsed through the rest of the docs/admin + directory, and made some (very non-consequential) + changes. + + Signed-off-by: Elliot Voris + Signed-off-by: Robert Soulliere + +10 9 docs/admin/authorities.txt +1 1 docs/admin/permissions.txt +1 1 docs/admin/staff_client-patron_border.txt +6 6 docs/admin/template_toolkit.txt + +commit d9841721ee0851fa44ad2ce3d4df99672cb9b3c9 +Author: Mike Rylander +Date: Thu Dec 5 10:59:06 2013 -0500 + + Pushing upgrade scripts forward + + Signed-off-by: Mike Rylander + +445 0 Open-ILS/src/sql/Pg/version-upgrade/2.4.3-2.4.4-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.4.3-2.4.4-upgrade-db.sql + +commit 171abfb94ffe77884c8f4a2d111f97e6e7a4e07f +Author: Bill Erickson +Date: Thu Dec 5 10:08:34 2013 -0500 + + Forward port 2.3.11->2.3.12 DB upgrade + + Signed-off-by: Bill Erickson + +171 0 Open-ILS/src/sql/Pg/version-upgrade/2.3.11-2.3.12-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.3.11-2.3.12-upgrade-db.sql + +commit d27a18003babad0170e7608c1fb520cd8d26e4ce +Author: Remington Steed +Date: Wed Dec 4 09:35:30 2013 -0500 + + Fix a broken link in the holds docs + + Signed-off-by: Remington Steed + +1 1 docs/circulation/holds.txt + +commit 6c27190e92c0cc5b1238db4b55ce6242afb6ecd7 +Author: Remington Steed +Date: Thu Nov 21 10:29:22 2013 -0500 + + Docs: integrate holds docs from EG 2.1 + + The small amount of Holds docs present in master seemed to fit well at + the end of the older Holds documentation, so this commit appends them + to the new holds.txt file, deletes the previous holds_management.txt file, + and makes the appropriate change to root.txt. + + This commit also includes several small formatting improvements, wording + changes, and bug fixes. + + Signed-off-by: Remington Steed + +410 0 docs/circulation/holds.txt +0 28 docs/circulation/holds_management.txt +1 1 docs/root.txt + create mode 100644 docs/circulation/holds.txt + delete mode 100644 docs/circulation/holds_management.txt diff --git a/Open-ILS/src/perlmods/lib/OpenILS.pm b/Open-ILS/src/perlmods/lib/OpenILS.pm index d7235ce61a..2a47ca0991 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS.pm @@ -6,6 +6,6 @@ OpenILS - Client and server support for the Evergreen open source library system =cut -our $VERSION = '2.4'; +our $VERSION = '2.0405'; 1; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index 2888c93918..6bc748bcd2 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-4-5"; } __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 ec12489ed2..25ed44e5a6 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 ('0848', :eg_version); -- miker +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.4.5', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html index 2737f47bf1..a7384d4b8b 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_4_5

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..9485cf5f35 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_4_5"); 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..0638a4e581 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.4" !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..fc15ac0c76 --- /dev/null +++ b/README @@ -0,0 +1,535 @@ +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.2 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 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] +------------------------------------------------------------------------------ +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_4_5 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/` (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 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/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. 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`, 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 +cpan Rose::URI +------------------------------------------------------------------------------ + +.(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 +yum install perl-Library-CallNumber-LC perl-MARC-Record perl-MARC-Charset +yum install perl-MARC-File-XML perl-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 --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`. + +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` 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 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 fab6180e0c..f3c5f31444 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.4.5, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [2.4.5]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_SUBST(prefix)