From db6027e5efe6578b779bcab80b2d78c1b61814aa Mon Sep 17 00:00:00 2001 From: Jason Boyer Date: Tue, 24 Nov 2020 09:47:55 -0500 Subject: [PATCH] Bumping version numbers, adding Upgrade Script and Changelog Signed-off-by: Jason Boyer --- ChangeLog | 450 +++++++++++++- Open-ILS/src/perlmods/lib/OpenILS/Application.pm | 2 +- Open-ILS/src/sql/Pg/002.schema.config.sql | 1 + .../Pg/version-upgrade/3.6.0-3.6.1-upgrade-db.sql | 82 +++ .../staff_client/chrome/content/main/about.html | 2 +- .../xul/staff_client/defaults/preferences/prefs.js | 2 +- Open-ILS/xul/staff_client/windowssetup.nsi | 2 +- README | 663 ++++++++++++++++++++- configure.ac | 2 +- .../modules/installation/pages/server_upgrade.adoc | 32 +- 10 files changed, 1213 insertions(+), 25 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/3.6.0-3.6.1-upgrade-db.sql mode change 120000 => 100644 README diff --git a/ChangeLog b/ChangeLog index 1f72b2c73e..9e930f0bae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,447 @@ -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 d7deec8302e7376d31590740d2e456c39ec60fec +Author: Jason Boyer +Date: Tue Nov 24 09:20:23 2020 -0500 + + bumping Perl version string for 3.6.1 + + Signed-off-by: Jason Boyer + +1 1 Open-ILS/src/perlmods/lib/OpenILS.pm + +commit 1d54acf95207bd6de9ab7fb2a91b2e7d1d160a8f +Author: Jason Boyer +Date: Tue Nov 24 09:18:44 2020 -0500 + + Translation updates - po files + + Signed-off-by: Jason Boyer + +9 6 build/i18n/po/acq/ar-JO.po +11 8 build/i18n/po/acq/cs-CZ.po +6 6 build/i18n/po/acq/de-DE.po +6 6 build/i18n/po/acq/en-CA.po +9 6 build/i18n/po/acq/es-ES.po +9 6 build/i18n/po/acq/hy-AM.po +6 6 build/i18n/po/acq/ru-RU.po +5348 0 build/i18n/po/bootstrap-opac/cs-CZ.po +5 5 build/i18n/po/cat/de-DE.po +22 22 build/i18n/po/circ/de-DE.po +4077 3794 build/i18n/po/db.seed/ar-JO.po +4143 3809 build/i18n/po/db.seed/cs-CZ.po +4025 3767 build/i18n/po/db.seed/de-DE.po +4028 3770 build/i18n/po/db.seed/en-CA.po +4028 3770 build/i18n/po/db.seed/en-GB.po +4080 3797 build/i18n/po/db.seed/es-ES.po +4032 3774 build/i18n/po/db.seed/fi-FI.po +4034 3776 build/i18n/po/db.seed/fr-CA.po +4023 3765 build/i18n/po/db.seed/he-IL.po +4023 3765 build/i18n/po/db.seed/hu-HU.po +4082 3799 build/i18n/po/db.seed/hy-AM.po +4028 3770 build/i18n/po/db.seed/oc-FR.po +4029 3771 build/i18n/po/db.seed/pt-BR.po +4030 3772 build/i18n/po/db.seed/ru-RU.po +4023 3765 build/i18n/po/db.seed/sv-SE.po +4023 3765 build/i18n/po/db.seed/tr-TR.po +3081 2841 build/i18n/po/fm_IDL.dtd/ar-JO.po +3092 2849 build/i18n/po/fm_IDL.dtd/cs-CZ.po +3053 2813 build/i18n/po/fm_IDL.dtd/de-DE.po +3080 2840 build/i18n/po/fm_IDL.dtd/en-CA.po +3078 2838 build/i18n/po/fm_IDL.dtd/en-GB.po +3082 2842 build/i18n/po/fm_IDL.dtd/es-ES.po +3081 2841 build/i18n/po/fm_IDL.dtd/fi-FI.po +3051 2811 build/i18n/po/fm_IDL.dtd/fr-CA.po +3047 2807 build/i18n/po/fm_IDL.dtd/he-IL.po +3047 2807 build/i18n/po/fm_IDL.dtd/hu-HU.po +3084 2841 build/i18n/po/fm_IDL.dtd/hy-AM.po +3049 2809 build/i18n/po/fm_IDL.dtd/oc-FR.po +3068 2828 build/i18n/po/fm_IDL.dtd/pt-BR.po +3069 2829 build/i18n/po/fm_IDL.dtd/ru-RU.po +3047 2807 build/i18n/po/fm_IDL.dtd/sv-SE.po +3047 2807 build/i18n/po/fm_IDL.dtd/tr-TR.po +51 39 build/i18n/po/ils_events.xml/ar-JO.po +55 41 build/i18n/po/ils_events.xml/cs-CZ.po +50 38 build/i18n/po/ils_events.xml/de-DE.po +51 39 build/i18n/po/ils_events.xml/en-CA.po +51 39 build/i18n/po/ils_events.xml/en-GB.po +51 39 build/i18n/po/ils_events.xml/es-ES.po +51 39 build/i18n/po/ils_events.xml/fi-FI.po +51 39 build/i18n/po/ils_events.xml/fr-CA.po +50 38 build/i18n/po/ils_events.xml/he-IL.po +50 38 build/i18n/po/ils_events.xml/hu-HU.po +51 39 build/i18n/po/ils_events.xml/hy-AM.po +50 38 build/i18n/po/ils_events.xml/oc-FR.po +51 39 build/i18n/po/ils_events.xml/pt-BR.po +51 39 build/i18n/po/ils_events.xml/ru-RU.po +50 38 build/i18n/po/ils_events.xml/sv-SE.po +50 38 build/i18n/po/ils_events.xml/tr-TR.po +4 3 build/i18n/po/multiclass_search_help.html/ar-JO.po +17 13 build/i18n/po/multiclass_search_help.html/cs-CZ.po +4 3 build/i18n/po/multiclass_search_help.html/de-DE.po +4 3 build/i18n/po/multiclass_search_help.html/en-CA.po +4 3 build/i18n/po/multiclass_search_help.html/en-GB.po +4 3 build/i18n/po/multiclass_search_help.html/es-ES.po +4 3 build/i18n/po/multiclass_search_help.html/fr-CA.po +5 4 build/i18n/po/multiclass_search_help.html/hu-HU.po +4 3 build/i18n/po/multiclass_search_help.html/hy-AM.po +5 4 build/i18n/po/multiclass_search_help.html/oc-FR.po +4 3 build/i18n/po/multiclass_search_help.html/pt-BR.po +4 3 build/i18n/po/multiclass_search_help.html/ru-RU.po +5 4 build/i18n/po/multiclass_search_help.html/tr-TR.po +518 269 build/i18n/po/tpac/ar-JO.po +537 286 build/i18n/po/tpac/cs-CZ.po +518 269 build/i18n/po/tpac/de-DE.po +518 269 build/i18n/po/tpac/en-CA.po +518 269 build/i18n/po/tpac/en-GB.po +518 269 build/i18n/po/tpac/es-ES.po +518 269 build/i18n/po/tpac/fi-FI.po +518 269 build/i18n/po/tpac/fr-CA.po +518 269 build/i18n/po/tpac/he-IL.po +518 269 build/i18n/po/tpac/hu-HU.po +518 269 build/i18n/po/tpac/hy-AM.po +518 269 build/i18n/po/tpac/oc-FR.po +518 269 build/i18n/po/tpac/pt-BR.po +518 269 build/i18n/po/tpac/ru-RU.po +518 269 build/i18n/po/tpac/sv-SE.po +518 269 build/i18n/po/tpac/tr-TR.po +979 568 build/i18n/po/webstaff/ar-JO.po +1041 574 build/i18n/po/webstaff/cs-CZ.po +11401 0 build/i18n/po/webstaff/de-DE.po +960 567 build/i18n/po/webstaff/en-CA.po +954 567 build/i18n/po/webstaff/en-GB.po +960 567 build/i18n/po/webstaff/es-ES.po +957 567 build/i18n/po/webstaff/hy-AM.po +954 567 build/i18n/po/webstaff/ru-RU.po + create mode 100644 build/i18n/po/bootstrap-opac/cs-CZ.po + create mode 100644 build/i18n/po/webstaff/de-DE.po + +commit beea7c1fa585a92d246483b08b18bc33aff007c6 +Author: Jane Sandberg +Date: Wed Nov 18 09:38:32 2020 -0800 + + Docs: fix typo in 3.6 release notes + + Thanks to Elizabeth Thomsen for catching this error. + +1 1 docs/RELEASE_NOTES_3_6.adoc + +commit fc2a4846848c1ab8e4da6a076b0bdb0ec3d3c1d1 +Author: Jane Sandberg +Date: Wed Nov 18 09:23:12 2020 -0800 + + Docs: release notes for 3.6.1 + + Signed-off-by: Jane Sandberg + +111 63 docs/RELEASE_NOTES_3_6.adoc + +commit 21f30cc90c184e31adc7a679f51c20fb16dd0c41 +Author: Jane Sandberg +Date: Wed Nov 18 09:14:49 2020 -0800 + + Docs: release notes for 3.5.2 + + Signed-off-by: Jane Sandberg + +160 0 docs/RELEASE_NOTES_3_5.adoc + +commit 9e4bffc37023204d4c3f95ec309997baf6051ecc +Author: Jane Sandberg +Date: Wed Nov 18 09:11:41 2020 -0800 + + Docs: release notes for 3.4.5 + + Signed-off-by: Jane Sandberg + +129 0 docs/RELEASE_NOTES_3_4.adoc + +commit 109c0457448e86765effe615a1f58f6b19e4e2f2 +Author: Jason Boyer +Date: Fri Nov 13 11:12:22 2020 -0500 + + LP1904220: Fix Booking Service Check + + Instead of trying to tell AppService which router we want to talk + to and confusing it, just tell it we want to talk to a router and + let it do its thing. + + Signed-off-by: Jason Boyer + Signed-off-by: Mike Rylander + +1 6 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm + +commit f425799cd4fba84eecbee3d92c5a9a9008424e14 +Author: Dan Briem +Date: Fri Oct 30 13:06:59 2020 -0400 + + LP#1900184 Patron password use phone not working + + An early return statement in extract_hold_notify() was removed + in 7e92293 and added back in ddf5b4b3, so props set at the end + of that function used in future comparisons never get set. + + This re-removes the return statement and sets the local notify + variable to default string values so the rest of the function + can play out. + + To test: + 1. Set org unit setting: "Patron: password from phone #" to TRUE + at the top context location + 2. Circulation->Register Patron + 3. Type 123-456-7890 into the Daytime Phone field and press tab + 4. Note: the password field isn't updated to the last 4 digits + 5. Apply patch and repeat steps + 6. Note: the password field updates to the last 4 digits + + Signed-off-by: Dan Briem + Signed-off-by: Garry Collum + +1 3 Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js + +commit 4996ed64b2bb96d70f5e1d1445d2c04f25d69bb9 +Author: Katie Greenleaf Martin +Date: Mon Oct 26 16:39:57 2020 -0400 + + Docs: LP1826256 Change 'catalogue' to 'catalog' + + Signed-off-by: Katie Greenleaf Martin + Signed-off-by: Jane Sandberg + +3 3 docs/modules/acquisitions/pages/selection_lists_po.adoc +1 1 docs/modules/admin_initial_setup/pages/describing_your_people.adoc +1 1 docs/modules/admin_initial_setup/pages/designing_your_catalog.adoc +7 7 docs/modules/cataloging/pages/copy-buckets_web_client.adoc +6 6 docs/modules/circulation/pages/booking.adoc +1 1 docs/modules/development/pages/intro_opensrf.adoc +2 2 docs/modules/installation/pages/server_installation.adoc +1 1 docs/modules/installation/pages/server_upgrade.adoc +7 7 docs/modules/opac/pages/using_the_public_access_catalog.adoc + +commit 5efa4fa2cef07987d13b26691afbc82064d5cc5b +Author: Jason Etheridge +Date: Fri May 15 14:37:13 2020 -0400 + + LP#1508208: live_t/ test for this branch + + Includes timing information for the checkin, but pass/fail is not predicated on it. + + Signed-off-by: Jason Etheridge + Signed-off-by: Chris Sharp + +219 0 Open-ILS/src/perlmods/live_t/30-lp1508208-age-protect-hold-capture.t + create mode 100644 Open-ILS/src/perlmods/live_t/30-lp1508208-age-protect-hold-capture.t + +commit c90a3066bf5eb4e41e028431daeb1dc390bc38c9 +Author: Mike Rylander +Date: Tue Dec 10 17:17:38 2019 -0500 + + LP#1508208: Only look at holds that age protection allows + + When hold capture is attempted, we look at (currently) the first 100 + holds ordered by Best Hold Sort Selection Order. If a very long list + of holds are targetting an age-protected item then op capture may not + have a chance to see a viable hold for that copy. + + This commit attempts to take into account the age protection currently + set for the copy by restricting the holds to just those where the + hold-copy-map proximity is less than or equal to the maximum proximity + allowed by the age protection. This works now because we store the + hold proximity in the hold copy map, where we did not before. + + Being based on the hold-copy-map proximity, which is calculated + proximity, means this is an approximation and the final hold capture + logic may still reject some holds for the copy. Likewise, this does + not entirely eliminate the possibility that there may be a better hold + to capture the copy for if the in-range set of holds is very, very + long, but this should allow hold capture to proceed if even + imperfectly. + + If no age protection is set for the copy, the current behavior + (looking at all holds) is maintained. + + Signed-off-by: Mike Rylander + Signed-off-by: Jason Etheridge + Signed-off-by: Chris Sharp + +4 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm + +commit a6ae2226e4f314375bc398e3ebbc98b76b125b6f +Author: Chris Sharp +Date: Wed Oct 28 16:03:24 2020 -0400 + + LP1325704: fix bad merge + +0 54 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lost_lo_claimsret_descrip.sql + delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lost_lo_claimsret_descrip.sql + +commit 915d18aafc9176b784b30d5fd077ae6d612e167c +Author: Remington Steed +Date: Tue May 15 09:46:41 2018 -0400 + + LP#1325704: Update Items-Out YAOUS descrip for web client + + Three settings refer to the "top" and "bottom" lists on the XUL client + Items Out screen. With the web client, these have become three named + tabs. This commit updates the setting descriptions in the seed data so + they reflect the new design. I also attempted to make the meaning of the + values more clear by labeling the two subsettings as "A" and "B". + + Signed-off-by: Remington Steed + Signed-off-by: Terran McCanna + Signed-off-by: Chris Sharp + +18 15 Open-ILS/src/sql/Pg/950.data.seed-values.sql +54 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lost_lo_claimsret_descrip.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lost_lo_claimsret_descrip.sql + +commit 06a06ea5410749cd982647e4b16dd19be28ed6d4 +Author: Chris Sharp +Date: Wed Oct 28 15:57:42 2020 -0400 + + LP#1325704: stamping upgrade script + + Signed-off-by: Chris Sharp + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +54 0 Open-ILS/src/sql/Pg/upgrade/1242.schema.lost_lo_claimsret_descrip.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/1242.schema.lost_lo_claimsret_descrip.sql + +commit 566a5f75cc7bc890519aed1662710bdc841bb86d +Author: Jane Sandberg +Date: Mon Oct 26 09:24:10 2020 -0700 + + Docs: adding information about 3.6 features from the release notes + + Signed-off-by: Jane Sandberg + +1 0 docs/antora.yml +68 1 docs/modules/admin/pages/actiontriggers.adoc +1 0 docs/modules/admin_initial_setup/nav.adoc +29 0 docs/modules/admin_initial_setup/pages/bootstrap_opac.adoc +4 0 docs/modules/integrations/_attributes.adoc +5 0 docs/modules/integrations/nav.adoc +29 0 docs/modules/integrations/pages/ezproxy.adoc +6 0 docs/modules/integrations/pages/introduction.adoc +34 0 docs/modules/integrations/pages/patron-api.adoc +73 0 docs/modules/integrations/pages/rfid.adoc +0 1 docs/modules/opac/nav.adoc + create mode 100644 docs/modules/admin_initial_setup/pages/bootstrap_opac.adoc + create mode 100644 docs/modules/integrations/_attributes.adoc + create mode 100644 docs/modules/integrations/nav.adoc + create mode 100644 docs/modules/integrations/pages/ezproxy.adoc + create mode 100644 docs/modules/integrations/pages/introduction.adoc + create mode 100644 docs/modules/integrations/pages/patron-api.adoc + create mode 100644 docs/modules/integrations/pages/rfid.adoc + +commit e60b1f3494118038eb8dd0bfe48a7dcbe729cc47 +Author: Bill Erickson +Date: Thu Oct 22 11:10:17 2020 -0400 + + LP1901038 Repair Angular catalog journal title search + + Completes the Journal Title search implementation in the Angular staff + catalog. + + To test in concerto, search Journal Title => IEEE. + + Signed-off-by: Bill Erickson + Signed-off-by: Chris Sharp + +10 1 Open-ILS/src/eg2/src/app/share/catalog/search-context.ts + +commit 727f352519f48bc593df6b748ab246d37e18dfb5 +Author: Bill Erickson +Date: Mon Dec 9 11:47:30 2019 -0500 + + LP1855737 Don't send error object across shared worker port + + Data must be string-ifiable to pass across a shared web worker message + port. In Firefox, at least, errors encountered during IndexedDB / + Lovefield operations are not candidates for automatic stringification. + Avoid trying to send the error object back to the caller. + + Signed-off-by: Bill Erickson + Signed-off-by: Chris Sharp + +0 1 Open-ILS/web/js/ui/default/staff/offline-db-worker.js + +commit 0dfb01195c80cd646b499f2fe2bada97f8e2f226 +Author: Mike Rylander +Date: Mon Oct 12 15:51:29 2020 -0400 + + LP#1893463: Protect against null emails + + Unique indexes on nullable columns will allow multiple conceptually + unique rows if the nullable columns are, in fact, NULL because NULL does + not equal itself. This commit uses COALESCE to make sure that the + nullable email column in the reporter.schedule table gets a value of the + empty string for the purposes of the unique index. The upgrade script + now also takes this into account and ignores the email column. + + Signed-off-by: Mike Rylander + Signed-off-by: Chris Sharp + +1 1 Open-ILS/src/sql/Pg/reporter-schema.sql +2 2 Open-ILS/src/sql/Pg/upgrade/1241.schema.reporter_schedule_uniqueness.sql + +commit d5e8176421d87bd4197a9a1518f121973fd89704 +Author: Jason Boyer +Date: Wed Oct 14 12:11:27 2020 -0400 + + LP1882828: (follow-up) Add static parameter to ViewChild decorator + + While not strictly required in rel_3_6 and above, rel_3_5 uses + a version of Angular that requires specifying a value for the + static parameter when using the ViewChild decorator on an object. + + Signed-off-by: Jason Boyer + +1 1 Open-ILS/src/eg2/src/app/staff/booking/pull-list.component.ts + +commit 9d6f08986e531f0d65c2b6ebb6a6b9104e83eebe +Author: Chris Sharp +Date: Wed Oct 7 15:38:34 2020 -0400 + + LP1893463: Follow-up to address de-duplication and adding release notes. + + Signed-off-by: Chris Sharp + Signed-off-by: Jason Stephenson + +14 0 Open-ILS/src/sql/Pg/upgrade/1241.schema.reporter_schedule_uniqueness.sql +5 0 docs/RELEASE_NOTES_NEXT/Reports/deduplicated_reports_schedule.adoc + create mode 100644 docs/RELEASE_NOTES_NEXT/Reports/deduplicated_reports_schedule.adoc + +commit 1ae8fd7921232257979457901861b3fca494abb5 +Author: Chris Sharp +Date: Wed Oct 7 14:54:41 2020 -0400 + + LP1893463: stamp upgrade script + + Signed-off-by: Chris Sharp + +1 1 Open-ILS/src/sql/Pg/002.schema.config.sql +1 1 Open-ILS/src/sql/Pg/upgrade/{XXXX.schema.reporter_schedule_uniqueness.sql => 1241.schema.reporter_schedule_uniqueness.sql} + rename Open-ILS/src/sql/Pg/upgrade/{XXXX.schema.reporter_schedule_uniqueness.sql => 1241.schema.reporter_schedule_uniqueness.sql} (75%) + +commit 4075a1214db39514a6e2bfc61f2d104725c81d25 +Author: Jason Boyer +Date: Fri Aug 28 17:13:14 2020 -0400 + + LP1893463: Prevent duplicated report outputs + + When re-running recurring reports that are interrupted, + it's possible to end up with a duplicate copy of the next + recurrance of that report. This branch adds a unique index + to reporter.schedule and tells clark-kent.pl not to worry + about it. + + For the purposes of this change a duplicate report is + one where report.schedule has identical values for report, + (output) folder, runner, run_time, and email. + + Signed-off-by: Jason Boyer + Signed-off-by: Chris Sharp + +9 3 Open-ILS/src/reporter/clark-kent.pl +1 0 Open-ILS/src/sql/Pg/reporter-schema.sql +9 0 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.reporter_schedule_uniqueness.sql + create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.reporter_schedule_uniqueness.sql diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index d750216454..c56800af59 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 "3-6-1"; } __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 a78a2a063c..c7fd0032e2 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -93,6 +93,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 ('1242', :eg_version); -- remingtron/terranm +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.6.1', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/version-upgrade/3.6.0-3.6.1-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/3.6.0-3.6.1-upgrade-db.sql new file mode 100644 index 0000000000..de16955e45 --- /dev/null +++ b/Open-ILS/src/sql/Pg/version-upgrade/3.6.0-3.6.1-upgrade-db.sql @@ -0,0 +1,82 @@ +--Upgrade Script for 3.6.0 to 3.6.1 +\set eg_version '''3.6.1''' +BEGIN; +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.6.1', :eg_version); + +SELECT evergreen.upgrade_deps_block_check('1241', :eg_version); + +SET CONSTRAINTS ALL IMMEDIATE; -- to address "pending trigger events" error + +-- Dedupe the table before applying the script. Preserve the original to allow the admin to delete it manually later. +CREATE TABLE reporter.schedule_original (LIKE reporter.schedule); +INSERT INTO reporter.schedule_original SELECT * FROM reporter.schedule; +TRUNCATE reporter.schedule; +INSERT INTO reporter.schedule (SELECT DISTINCT ON (report, folder, runner, run_time) id, report, folder, runner, run_time, start_time, complete_time, email, excel_format, html_format, csv_format, chart_pie, chart_bar, chart_line, error_code, error_text FROM reporter.schedule_original); +\qecho NOTE: This has created a backup of the original reporter.schedule +\qecho table, named reporter.schedule_original. Once you are sure that everything +\qecho works as expected, you can delete that table by issuing the following: +\qecho +\qecho 'DROP TABLE reporter.schedule_original;' +\qecho + +-- Explicitly supply the name because it is referenced in clark-kent.pl +CREATE UNIQUE INDEX rpt_sched_recurrence_once_idx ON reporter.schedule (report,folder,runner,run_time,COALESCE(email,'')); + + + +-- check whether patch can be applied +SELECT evergreen.upgrade_deps_block_check('1242', :eg_version); + +-- Long Overdue +UPDATE config.org_unit_setting_type +SET description = oils_i18n_gettext( + 'ui.circ.items_out.longoverdue', +'Value is a numeric code, describing: A. In which tab ("Items Checked Out", '|| +'or "Other/Special Circulations") the circulation '|| +'should appear while checked out, and B. Whether the circulation should '|| +'continue to appear in the "Other" tab when checked in with '|| +'oustanding fines. '|| +'1 = (A) "Items", (B) "Other". 2 = (A) "Other", (B) "Other". ' || +'5 = (A) "Items", (B) do not display. 6 = (A) "Other", (B) do not display.', + 'coust', + 'description' + ) +WHERE NAME = 'ui.circ.items_out.longoverdue'; + +-- Lost +UPDATE config.org_unit_setting_type +SET description = oils_i18n_gettext( + 'ui.circ.items_out.lost', +'Value is a numeric code, describing: A. In which tab ("Items Checked Out", '|| +'or "Other/Special Circulations") the circulation '|| +'should appear while checked out, and B. Whether the circulation should '|| +'continue to appear in the "Other" tab when checked in with '|| +'oustanding fines. '|| +'1 = (A) "Items", (B) "Other". 2 = (A) "Other", (B) "Other". ' || +'5 = (A) "Items", (B) do not display. 6 = (A) "Other", (B) do not display.', + 'coust', + 'description' + ) +WHERE NAME = 'ui.circ.items_out.lost'; + +-- Claims Returned +UPDATE config.org_unit_setting_type +SET description = oils_i18n_gettext( + 'ui.circ.items_out.claimsreturned', +'Value is a numeric code, describing: A. In which tab ("Items Checked Out", '|| +'or "Other/Special Circulations") the circulation '|| +'should appear while checked out, and B. Whether the circulation should '|| +'continue to appear in the "Other" tab when checked in with '|| +'oustanding fines. '|| +'1 = (A) "Items", (B) "Other". 2 = (A) "Other", (B) "Other". ' || +'5 = (A) "Items", (B) do not display. 6 = (A) "Other", (B) do not display.', + 'coust', + 'description' + ) +WHERE NAME = 'ui.circ.items_out.claimsreturned'; + +COMMIT; + +-- Update auditor tables to catch changes to source tables. +-- Can be removed/skipped if there were no schema changes. +SELECT auditor.update_auditors(); 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 b2b87b683f..694a2dc8be 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/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_3_6_1

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..2a2eb6eb56 100644 --- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js +++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js @@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main"); pref("open-ils.enable_join_tabs", true); // We'll use this one to help brand some build information into the client, and rely on subversion keywords -pref("open-ils.repository.headURL","$HeadURL$"); +pref("open-ils.repository.headURL","http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_3_6_1"); pref("open-ils.repository.author","$Author$"); pref("open-ils.repository.revision","$Revision$"); pref("open-ils.repository.date","$Date$"); diff --git a/Open-ILS/xul/staff_client/windowssetup.nsi b/Open-ILS/xul/staff_client/windowssetup.nsi index a9543579a8..b600e79062 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 "3.6" !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 1486a8d676..0000000000 --- a/README +++ /dev/null @@ -1 +0,0 @@ -docs/modules/installation/pages/server_installation.adoc \ No newline at end of file diff --git a/README b/README new file mode 100644 index 0000000000..6bdd62d171 --- /dev/null +++ b/README @@ -0,0 +1,662 @@ += Installing the Evergreen server = +:toc: + +== 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 you can switch to this account from + your *user* account by issuing the `su -` command and entering the + password for the *root* account when prompted. On Ubuntu you can switch + to this account from your *user* account using the `sudo su -` command + and entering the password for your *user* account when prompted. + ** The *opensrf* Linux account is an account that you create when installing + OpenSRF. You can switch to this account from the *root* account by + issuing the `su - opensrf` command. + ** The *postgres* Linux account is created automatically when you install + the PostgreSQL database server. You can switch to this account from the + *root* account by issuing the `su - postgres` command. + * PostgreSQL user accounts: + ** The *evergreen* PostgreSQL account is a superuser account that you will + create to connect to the PostgreSQL database server. + * Evergreen administrator account: + ** The *egadmin* Evergreen account is an administrator account for + Evergreen that you will use to test connectivity and configure your + Evergreen instance. + +== Preamble: developer instructions == + +[NOTE] +Skip this section if you are using an official release tarball downloaded +from http://evergreen-ils.org/egdownloads + +Developers working directly with the source code from the Git repository, +rather than an official release tarball, must perform one step before they +can proceed with the `./configure` step. + +As the *user* Linux account, issue the following command in the Evergreen +source directory to generate the configure script and Makefiles: + +[source, bash] +------------------------------------------------------------------------------ +autoreconf -i +------------------------------------------------------------------------------ + +== Installing prerequisites == + + * **PostgreSQL**: The minimum supported version is 9.6. + * **Linux**: Evergreen has been tested on + Debian Buster (10), + Debian Stretch (9), + Debian Jessie (8), + Ubuntu Bionic Beaver (18.04), + and Ubuntu Xenial Xerus (16.04). + If you are running an older version of these distributions, you may want + to upgrade before upgrading Evergreen. For instructions on upgrading these + distributions, visit the Debian or Ubuntu websites. + * **OpenSRF**: The minimum supported version of OpenSRF is 3.2.0. + + +Evergreen has a number of prerequisite packages that must be installed +before you can successfully configure, compile, and install Evergreen. + +1. Begin by installing the most recent version of OpenSRF (3.2.0 or later). + You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/ ++ +2. Issue the following commands as the *root* Linux account to install + prerequisites using the `Makefile.install` prerequisite installer, + substituting `debian-buster`,`debian-stretch`,`debian-jessie`,`ubuntu-bionic`, or + `ubuntu-xenial` for below: ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install +------------------------------------------------------------------------------ ++ +[#optional_developer_additions] +3. OPTIONAL: Developer additions ++ +To perform certain developer tasks from a Git source code checkout, +including the testing of the Angular web client components, +additional packages may be required. As the *root* Linux account: ++ + * To install packages needed for retrieving and managing web dependencies, + use the -developer Makefile.install target. Currently, + this is only needed for building and installing the web + staff client. ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install -developer +------------------------------------------------------------------------------ ++ + * To install packages required for building Evergreen translations, use + the -translator Makefile.install target. ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install -translator +------------------------------------------------------------------------------ ++ + * To install packages required for building Evergreen release bundles, use + the -packager Makefile.install target. ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install -packager +------------------------------------------------------------------------------ + +== Extra steps for web staff client == + +[NOTE] +Skip this entire section if you are using an official release tarball downloaded +from http://evergreen-ils.org/downloads. Otherwise, ensure you have installed the +xref:#optional_developer_additions[optional developer additions] before proceeding. + +[[install_files_for_web_staff_client]] +=== Install AngularJS files for web staff client === + +1. Building, Testing, Minification: The remaining steps all take place within + the staff JS web root: ++ +[source,sh] +------------------------------------------------------------------------------ +cd $EVERGREEN_ROOT/Open-ILS/web/js/ui/default/staff/ +------------------------------------------------------------------------------ ++ +2. Install Project-local Dependencies. npm inspects the 'package.json' file + for dependencies and fetches them from the Node package network. ++ +[source,sh] +------------------------------------------------------------------------------ +npm install # fetch JS dependencies +------------------------------------------------------------------------------ ++ +3. Run the build script. ++ +[source,sh] +------------------------------------------------------------------------------ +# build, concat+minify +npm run build-prod +------------------------------------------------------------------------------ ++ +4. OPTIONAL: Test web client code if the -developer packages were installed. + CHROME_BIN should be set to the path to chrome or chromimum, e.g., + `/usr/bin/chromium`: ++ +[source,sh] +------------------------------------------------------------------------------ +CHROME_BIN=/path/to/chrome npm run test +------------------------------------------------------------------------------ + +[[install_files_for_angular_web_staff_client]] +=== Install Angular files for web staff client === + +1. Building, Testing, Minification: The remaining steps all take place within + the Angular staff root: ++ +[source,sh] +------------------------------------------------------------------------------ +cd $EVERGREEN_ROOT/Open-ILS/src/eg2/ +------------------------------------------------------------------------------ ++ +2. Install Project-local Dependencies. npm inspects the 'package.json' file + for dependencies and fetches them from the Node package network. ++ +[source,sh] +------------------------------------------------------------------------------ +npm install # fetch JS dependencies +------------------------------------------------------------------------------ ++ +3. Run the build script. ++ +[source,sh] +------------------------------------------------------------------------------ +# build and run tests +ng build --prod +------------------------------------------------------------------------------ ++ +4. OPTIONAL: Test eg2 web client code if the -developer packages were installed: + CHROME_BIN should be set to the path to chrome or chromimum, e.g., + `/usr/bin/chromium`: ++ +[source,sh] +------------------------------------------------------------------------------ +CHROME_BIN=/path/to/chrome npm run test +------------------------------------------------------------------------------ + +[[install_opac_deps]] +=== Install OPAC skin dependencies === + +1. The following steps take place within the OPAC dependencies root: ++ +[source,sh] +------------------------------------------------------------------------------ +cd $EVERGREEN_ROOT/Open-ILS/web/opac/deps +------------------------------------------------------------------------------ ++ +2. Install Project-local Dependencies. npm inspects the 'package.json' file + for dependencies and fetches them from the Node package network. ++ +[source,sh] +------------------------------------------------------------------------------ +npm install # fetch JS and CSS dependencies +------------------------------------------------------------------------------ ++ +Note that there is no build step. + +== 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 and copy + example configuration files to `/openils/conf`. ++ +[source, bash] +------------------------------------------------------------------------------ +make install +------------------------------------------------------------------------------ + +== 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 +------------------------------------------------------------------------------ + +== Run ldconfig == + +On Ubuntu 18.04 or Debian Stretch / Buster, run the following command as the root user: + +[source, bash] +------------------------------------------------------------------------------ +ldconfig +------------------------------------------------------------------------------ + +== Additional Instructions for Developers == + +[NOTE] +Skip this section if you are using an official release tarball downloaded +from http://evergreen-ils.org/egdownloads + +Developers working directly with the source code from the Git repository, +rather than an official release tarball, need to install the Dojo Toolkit +set of JavaScript libraries. The appropriate version of Dojo is included in +Evergreen release tarballs. Developers should install the Dojo 1.3.3 version +of Dojo by issuing the following commands as the *opensrf* Linux account: + +[source, bash] +------------------------------------------------------------------------------ +wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz +tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz +cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/. +------------------------------------------------------------------------------ + + +== Configure the Apache Web server == + +. Use the example configuration files to configure your Web server for +the Evergreen catalog, web staff client, Web services, and administration +interfaces. Issue the following commands as the *root* Linux account: ++ +[source,bash] +------------------------------------------------------------------------------------ +cp Open-ILS/examples/apache_24/eg_24.conf /etc/apache2/sites-available/eg.conf +cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/apache2/eg_vhost.conf +cp Open-ILS/examples/apache_24/eg_startup /etc/apache2/ +# Now set up SSL +mkdir /etc/apache2/ssl +cd /etc/apache2/ssl +------------------------------------------------------------------------------------ ++ +. The `openssl` command cuts a new SSL key for your Apache server. For a +production server, you should purchase a signed SSL certificate, but you can +just use a self-signed certificate and accept the warnings in the +and browser during testing and development. Create an SSL key for the Apache +server by issuing the following command as the *root* Linux account: ++ +[source,bash] +------------------------------------------------------------------------------ +openssl req -new -x509 -days 365 -nodes -out server.crt -keyout server.key +------------------------------------------------------------------------------ ++ +. As the *root* Linux account, edit the `eg.conf` file that you copied into +place. + a. To enable access to the offline upload / execute interface from any + workstation on any network, make the following change (and note that + you *must* secure this for a production instance): + * Replace `Require host 10.0.0.0/8` with `Require all granted` +. Change the user for the Apache server. + * As the *root* Linux account, edit + `/etc/apache2/envvars`. Change `export APACHE_RUN_USER=www-data` to + `export APACHE_RUN_USER=opensrf`. +. As the *root* Linux account, configure Apache with KeepAlive settings + appropriate for Evergreen. Higher values can improve the performance of a + single client by allowing multiple requests to be sent over the same TCP + connection, but increase the risk of using up all available Apache child + processes and memory. + * Edit `/etc/apache2/apache2.conf`. + a. Change `KeepAliveTimeout` to `1`. + b. Change `MaxKeepAliveRequests` to `100`. +. As the *root* Linux account, configure the prefork module to start and keep + enough Apache servers available to provide quick responses to clients without + running out of memory. The following settings are a good starting point for a + site that exposes the default Evergreen catalog to the web: ++ +.`/etc/apache2/mods-available/mpm_prefork.conf` +[source,bash] +------------------------------------------------------------------------------ + + StartServers 15 + MinSpareServers 5 + MaxSpareServers 15 + MaxRequestWorkers 75 + MaxConnectionsPerChild 500 + +------------------------------------------------------------------------------ ++ +. As the *root* user, enable the mpm_prefork module: ++ +[source,bash] +------------------------------------------------------------------------------ +a2dismod mpm_event +a2enmod mpm_prefork +------------------------------------------------------------------------------ ++ +. As the *root* Linux account, enable the Evergreen site: ++ +[source,bash] +------------------------------------------------------------------------------ +a2dissite 000-default # OPTIONAL: disable the default site (the "It Works" page) +a2ensite eg.conf +------------------------------------------------------------------------------ ++ +. As the *root* Linux account, enable Apache to write + to the lock directory; this is currently necessary because Apache + is running as the `opensrf` user: ++ +[source,bash] +------------------------------------------------------------------------------ +chown opensrf /var/lock/apache2 +------------------------------------------------------------------------------ + +Learn more about additional Apache options in the following sections: + + * xref:admin:apache_rewrite_tricks.adoc#apache_rewrite_tricks[Apache Rewrite Tricks] + * xref:admin:apache_access_handler.adoc#apache_access_handler_perl_module[Apache Access Handler Perl Module] + +== Configure OpenSRF for the Evergreen application == + +There are a number of example OpenSRF configuration files in `/openils/conf/` +that you can use as a template for your Evergreen installation. Issue the +following commands as the *opensrf* Linux account: + +[source, bash] +------------------------------------------------------------------------------ +cp -b /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml +cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml +------------------------------------------------------------------------------ + +When you installed OpenSRF, you created four Jabber users on two +separate domains and edited the `opensrf_core.xml` file accordingly. Please +refer back to the OpenSRF README and, as the *opensrf* Linux account, edit the +Evergreen version of the `opensrf_core.xml` file using the same Jabber users +and domains as you used while installing and testing OpenSRF. + +[NOTE] +The `-b` flag tells the `cp` command to create a backup version of the +destination file. The backup version of the destination file has a tilde (`~`) +appended to the file name, so if you have forgotten the Jabber users and +domains, you can retrieve the settings from the backup version of the files. + +`eg_db_config`, described in xref:#creating_the_evergreen_database[Creating the Evergreen database], sets the database connection information in `opensrf.xml` for you. + +=== Configure action triggers for the Evergreen application === +_Action Triggers_ provide hooks for the system to perform actions when a given +event occurs; for example, to generate reminder or overdue notices, the +`checkout.due` hook is processed and events are triggered for potential actions +if there is no checkin time. + +To enable the default set of hooks, issue the following command as the +*opensrf* Linux account: + +[source, bash] +------------------------------------------------------------------------------ +cp -b /openils/conf/action_trigger_filters.json.example /openils/conf/action_trigger_filters.json +------------------------------------------------------------------------------ + +For more information about configuring and running action triggers, see +xref:admin:actiontriggers_process.adoc#processing_action_triggers[Notifications / Action Triggers]. + +[#creating_the_evergreen_database] +== Creating the Evergreen database == + +=== Setting up the PostgreSQL server === + +For production use, most libraries install the PostgreSQL database server on a +dedicated machine. Therefore, by default, the `Makefile.install` prerequisite +installer does *not* install the PostgreSQL 9 database server that is required +by every Evergreen system. You can install the packages required by Debian or +Ubuntu on the machine of your choice using the following commands as the +*root* Linux account: + +. Installing PostgreSQL server packages + +Each OS build target provides the postgres server installation packages +required for each operating system. To install Postgres server packages, +use the make target 'postgres-server-'. Choose the most appropriate +command below based on your operating system. This will install PostgreSQL 9.6, +the minimum supported version. + +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-buster +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-stretch +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-jessie +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-xenial +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-bionic +------------------------------------------------------------------------------ + +To install PostgreSQL version 10, use the following command for your operating +system: + +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-buster-10 +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-stretch-10 +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-jessie-10 +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-xenial-10 +make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-bionic-10 +------------------------------------------------------------------------------ + +For a standalone PostgreSQL server, install the following Perl modules for your +distribution as the *root* Linux account: + +.(Debian and Ubuntu) +No extra modules required for these distributions. + +You need to create a PostgreSQL superuser to create and access the database. +Issue the following command as the *postgres* Linux account to create a new +PostgreSQL superuser named `evergreen`. When prompted, enter the new user's +password: + +[source, bash] +------------------------------------------------------------------------------ +createuser -s -P evergreen +------------------------------------------------------------------------------ + +.Enabling connections to the PostgreSQL database + +Your PostgreSQL database may be configured by default to prevent connections, +for example, it might reject attempts to connect via TCP/IP or from other +servers. To enable TCP/IP connections from localhost, check your `pg_hba.conf` +file, found in the `/etc/postgresql/` directory on Debian and Ubuntu. +A simple way to enable TCP/IP +connections from localhost to all databases with password authentication, which +would be suitable for a test install of Evergreen on a single server, is to +ensure the file contains the following entries _before_ any "host ... ident" +entries: + +------------------------------------------------------------------------------ +host all all ::1/128 md5 +host all all 127.0.0.1/32 md5 +------------------------------------------------------------------------------ + +When you change the `pg_hba.conf` file, you will need to reload PostgreSQL to +make the changes take effect. For more information on configuring connectivity +to PostgreSQL, see +http://www.postgresql.org/docs/devel/static/auth-pg-hba-conf.html + +=== Creating the Evergreen database and schema === + +Once you have created the *evergreen* PostgreSQL account, you also need to +create the database and schema, and configure your configuration files to point +at the database server. Issue the following command as the *root* Linux account +from inside the Evergreen source directory, replacing , , +, , and with the appropriate values for your +PostgreSQL database (where and are for the *evergreen* +PostgreSQL account you just created), and replace and +with the values you want for the *egadmin* Evergreen administrator account: + +[source, bash] +------------------------------------------------------------------------------ +perl Open-ILS/src/support-scripts/eg_db_config --update-config \ + --service all --create-database --create-schema --create-offline \ + --user --password --hostname --port \ + --database --admin-user --admin-pass +------------------------------------------------------------------------------ + +This creates the database and schema and configures all of the services in +your `/openils/conf/opensrf.xml` configuration file to point to that database. +It also creates the configuration files required by the Evergreen `cgi-bin` +administration scripts, and sets the user name and password for the *egadmin* +Evergreen administrator account to your requested values. + +You can get a complete set of options for `eg_db_config` by passing the +`--help` parameter. + +=== Loading sample data === + +If you add the `--load-all-sample` parameter to the `eg_db_config` command, +a set of authority and bibliographic records, call numbers, copies, staff +and regular users, and transactions will be loaded into your target +database. This sample dataset is commonly referred to as the _concerto_ +sample data, and can be useful for testing out Evergreen functionality and +for creating problem reports that developers can easily recreate with their +own copy of the _concerto_ sample data. + +=== Creating the database on a remote server === + +In a production instance of Evergreen, your PostgreSQL server should be +installed on a dedicated server. + +==== PostgreSQL 9.6 and later ==== + +To create the database instance on a remote database server running PostgreSQL +9.6 or later, simply use the `--create-database` flag on `eg_db_config`. + +== Starting Evergreen == + +1. As the *root* Linux account, start the `memcached` and `ejabberd` services +(if they aren't already running): ++ +[source, bash] +------------------------------------------------------------------------------ +/etc/init.d/ejabberd start +/etc/init.d/memcached start +------------------------------------------------------------------------------ ++ +2. As the *opensrf* Linux account, start Evergreen. The `-l` flag in the +following command is only necessary if you want to force Evergreen to treat the +hostname as `localhost`; if you configured `opensrf.xml` using the real +hostname of your machine as returned by `perl -ENet::Domain 'print +Net::Domain::hostfqdn() . "\n";'`, you should not use the `-l` flag. ++ +[source, bash] +------------------------------------------------------------------------------ +osrf_control -l --start-all +------------------------------------------------------------------------------ ++ + ** If you receive the error message `bash: osrf_control: command not found`, + then your environment variable `PATH` does not include the `/openils/bin` + directory; this should have been set in the *opensrf* Linux account's + `.bashrc` configuration file. To manually set the `PATH` variable, edit the + configuration file `~/.bashrc` as the *opensrf* Linux account and add the + following line: ++ +[source, bash] +------------------------------------------------------------------------------ +export PATH=$PATH:/openils/bin +------------------------------------------------------------------------------ ++ +3. As the *opensrf* Linux account, generate the Web files needed by the web staff + client and catalog and update the organization unit proximity (you need to do + this the first time you start Evergreen, and after that each time you change the library org unit configuration. +): ++ +[source, bash] +------------------------------------------------------------------------------ +autogen.sh +------------------------------------------------------------------------------ ++ +4. As the *root* Linux account, restart the Apache Web server: ++ +[source, bash] +------------------------------------------------------------------------------ +/etc/init.d/apache2 restart +------------------------------------------------------------------------------ ++ +If the Apache Web server was running when you started the OpenSRF services, you +might not be able to successfully log in to the OPAC or web staff client until the +Apache Web server is restarted. + +== Testing connections to Evergreen == + +Once you have installed and started Evergreen, test your connection to +Evergreen via `srfsh`. As the *opensrf* Linux account, issue the following +commands to start `srfsh` and try to log onto the Evergreen server using the +*egadmin* Evergreen administrator user name and password that you set using the +`eg_db_config` command: + +[source, bash] +------------------------------------------------------------------------------ +/openils/bin/srfsh +srfsh% login +------------------------------------------------------------------------------ + +You should see a result like: + + Received Data: "250bf1518c7527a03249858687714376" + ------------------------------------ + Request Completed Successfully + Request Time in seconds: 0.045286 + ------------------------------------ + + Received Data: { + "ilsevent":0, + "textcode":"SUCCESS", + "desc":" ", + "pid":21616, + "stacktrace":"oils_auth.c:304", + "payload":{ + "authtoken":"e5f9827cc0f93b503a1cc66bee6bdd1a", + "authtime":420 + } + + } + + ------------------------------------ + Request Completed Successfully + Request Time in seconds: 1.336568 + ------------------------------------ +[[install-troubleshooting-1]] +If this does not work, it's time to do some troubleshooting. + + * As the *opensrf* Linux account, run the `settings-tester.pl` script to see + if it finds any system configuration problems. The script is found at + `Open-ILS/src/support-scripts/settings-tester.pl` in the Evergreen source + tree. + * Follow the steps in the http://evergreen-ils.org/dokuwiki/doku.php?id=troubleshooting:checking_for_errors[troubleshooting guide]. + * If you have faithfully followed the entire set of installation steps + listed here, you are probably extremely close to a working system. + Gather your configuration files and log files and contact the + http://evergreen-ils.org/communicate/mailing-lists/[Evergreen development +mailing list] for assistance before making any drastic changes to your system + configuration. + +== Getting help == + +Need help installing or using Evergreen? Join the mailing lists at +http://evergreen-ils.org/communicate/mailing-lists/ or contact us on the Freenode +IRC network on the #evergreen channel. + +== License == + +This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 +Unported License. To view a copy of this license, visit +http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative +Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA. diff --git a/configure.ac b/configure.ac index d807121082..fa55b24ca1 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ export PATH=${PATH}:/usr/sbin AC_PREREQ(2.61) -AC_INIT(Open-ILS, trunk, open-ils-dev@list.georgialibraries.org) +AC_INIT(Open-ILS, 3.6.1, open-ils-dev@list.georgialibraries.org) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/docs/modules/installation/pages/server_upgrade.adoc b/docs/modules/installation/pages/server_upgrade.adoc index 8551e04d36..176814c480 100644 --- a/docs/modules/installation/pages/server_upgrade.adoc +++ b/docs/modules/installation/pages/server_upgrade.adoc @@ -7,7 +7,7 @@ All of the steps in this chapter are to be completed from the command line. == Software Prerequisites == * **PostgreSQL**: The minimum supported version is 9.6. - * **Linux**: Evergreen 3.X.X has been tested on Debian Stretch (9.0), + * **Linux**: Evergreen 3.6.1 has been tested on Debian Stretch (9.0), Debian Jessie (8.0), Ubuntu Xenial Xerus (16.04), and Ubuntu Bionic Beaver (18.04). If you are running an older version of these distributions, you may want to upgrade before upgrading Evergreen. For instructions on upgrading these @@ -42,12 +42,12 @@ osrf_control --localhost --stop-all .. Back up the /openils directory. . Upgrade OpenSRF. Download and install the latest version of OpenSRF from the https://evergreen-ils.org/opensrf-downloads/[OpenSRF download page]. -. As the *opensrf* user, download and extract Evergreen 3.X.X: +. As the *opensrf* user, download and extract Evergreen 3.6.1: + [source, bash] ----------------------------------------------- -wget https://evergreen-ils.org/downloads/Evergreen-ILS-3.X.X.tar.gz -tar xzf Evergreen-ILS-3.X.X.tar.gz +wget https://evergreen-ils.org/downloads/Evergreen-ILS-3.6.1.tar.gz +tar xzf Evergreen-ILS-3.6.1.tar.gz ----------------------------------------------- + [NOTE] @@ -57,7 +57,7 @@ For the latest edition of Evergreen, check the https://evergreen-ils.org/egdownl + [source, bash] --------------------------------------------- -cd /home/opensrf/Evergreen-ILS-3.X.X +cd /home/opensrf/Evergreen-ILS-3.6.1 --------------------------------------------- + On the next command, replace `[distribution]` with one of these values for your @@ -80,7 +80,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution] + [source, bash] ------------------------------------------------------------ -cd /home/opensrf/Evergreen-ILS-3.X.X +cd /home/opensrf/Evergreen-ILS-3.6.1 PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf make ------------------------------------------------------------ @@ -91,7 +91,7 @@ These instructions assume that you have also installed OpenSRF under /openils/. + [source, bash] ------------------------------------------------------------ -cd /home/opensrf/Evergreen-ILS-3.X.X +cd /home/opensrf/Evergreen-ILS-3.6.1 make install ------------------------------------------------------------ + @@ -102,8 +102,8 @@ can supply `STAFF_CLIENT_STAMP` during the `make install` step like this: + [source, bash] ------------------------------------------------------------ -cd /home/opensrf/Evergreen-ILS-3.X.X -make STAFF_CLIENT_STAMP_ID=rel_3_x_x install +cd /home/opensrf/Evergreen-ILS-3.6.1 +make STAFF_CLIENT_STAMP_ID=rel_3_6_1 install ------------------------------------------------------------ + . As the *root* user, change all files to be owned by the opensrf user and group: @@ -120,7 +120,7 @@ chown -R opensrf:opensrf /openils ------------------------------------------------------------ cd /openils/var/web/xul/ rm server -ln -sf rel_3_x_x/server server +ln -sf rel_3_6_1/server server ------------------------------------------------------------ + . As the *opensrf* user, update opensrf_core.xml and opensrf.xml by copying the @@ -140,7 +140,7 @@ Copying these configuration files will remove any customizations you have made t + [source, bash] ------------------------------------------------------------------------- -cd /home/opensrf/Evergreen-ILS-3.X.X +cd /home/opensrf/Evergreen-ILS-3.6.1 perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \ --create-offline --database evergreen --host localhost --user evergreen --password evergreen ------------------------------------------------------------------------- @@ -164,21 +164,21 @@ The diff command can be used to show the differences between the distribution ve + [source, bash] ---------------------------------------------------------- -cp /home/opensrf/Evergreen-ILS-3.X.X/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup +cp /home/opensrf/Evergreen-ILS-3.6.1/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup ---------------------------------------------------------- + .. Update /etc/apache2/eg_vhost.conf by copying the example from Open-ILS/examples/apache/eg_vhost.conf. + [source, bash] ---------------------------------------------------------- -cp /home/opensrf/Evergreen-ILS-3.X.X/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf +cp /home/opensrf/Evergreen-ILS-3.6.1/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf ---------------------------------------------------------- + .. Update /etc/apache2/sites-available/eg.conf by copying the example from Open-ILS/examples/apache/eg.conf. + [source, bash] ---------------------------------------------------------- -cp /home/opensrf/Evergreen-ILS-3.X.X/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf +cp /home/opensrf/Evergreen-ILS-3.6.1/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf ---------------------------------------------------------- == Upgrade the Evergreen database schema == @@ -234,8 +234,8 @@ as a user with the ability to connect to the database server. [source, bash] ---------------------------------------------------------- -cd /home/opensrf/Evergreen-ILS-3.X.X/Open-ILS/src/sql/Pg -psql -U evergreen -h localhost -f version-upgrade/3.X.W-3.X.X-upgrade-db.sql evergreen +cd /home/opensrf/Evergreen-ILS-3.6.1/Open-ILS/src/sql/Pg +psql -U evergreen -h localhost -f version-upgrade/3.6.0-3.6.1-upgrade-db.sql evergreen ---------------------------------------------------------- [TIP] -- 2.11.0