From 3ae7ed9b2028e428c6d06c80df4fe9f4b2e6b4b0 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 19 Jun 2013 09:43:58 -0400 Subject: [PATCH] Bumping version numbers, adding Upgrade Script and Changelog Signed-off-by: Bill Erickson --- ChangeLog | 381 +++++++++++++- Open-ILS/src/perlmods/lib/OpenILS/Application.pm | 2 +- Open-ILS/src/sql/Pg/002.schema.config.sql | 1 + .../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 | 550 ++++++++++++++++++++- configure.ac | 4 +- 8 files changed, 934 insertions(+), 10 deletions(-) mode change 120000 => 100644 README diff --git a/ChangeLog b/ChangeLog index 1f72b2c73e..9ff7152b21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,378 @@ -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 39f895ee8a044f6975469e124613fb0b83e79f0c +Author: Bill Erickson +Date: Wed Jun 19 09:43:21 2013 -0400 + + Bumping OpenILS Version to 2.0308 + + Signed-off-by: Bill Erickson + +1 1 Open-ILS/src/perlmods/lib/OpenILS.pm + +commit 82f8d092d767fcc7d7d2ee91e3650d9beacffa2d +Author: Bill Erickson +Date: Wed Jun 19 09:37:32 2013 -0400 + + 2.3.8 Translations Import + + Signed-off-by: Bill Erickson + +1 1 build/i18n/po/AutoFieldWidget.js/fi-FI.po +5 5 build/i18n/po/Searcher.js/es-ES.po +1 1 build/i18n/po/Searcher.js/fi-FI.po +1 1 build/i18n/po/TranslatorPopup.js/fi-FI.po +1 1 build/i18n/po/User.js/fi-FI.po +4 2 build/i18n/po/XULTermLoader.js/XULTermLoader.js.pot +1 1 build/i18n/po/XULTermLoader.js/fi-FI.po +30 10 build/i18n/po/acq.js/acq.js.pot +1 1 build/i18n/po/admin.properties/fi-FI.po +1 1 build/i18n/po/auth.properties/fi-FI.po +1 1 build/i18n/po/authority.js/fi-FI.po +4 2 build/i18n/po/capture.js/capture.js.pot +1 1 build/i18n/po/capture.js/fi-FI.po +1 1 build/i18n/po/cat.properties/fi-FI.po +1 1 build/i18n/po/circ.properties/fi-FI.po +4 4 build/i18n/po/common.properties/cs-CZ.po +1 1 build/i18n/po/common.properties/fi-FI.po +19 7 build/i18n/po/conify.js/conify.js.pot +1 1 build/i18n/po/conify.js/fi-FI.po +6 6 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 +13 13 build/i18n/po/fm_IDL.dtd/fm_IDL.dtd.pot +1 1 build/i18n/po/ils_events.xml/fi-FI.po +104 44 build/i18n/po/ils_events.xml/ils_events.xml.pot +27 26 build/i18n/po/lang.dtd/cs-CZ.po +1 1 build/i18n/po/lang.dtd/fi-FI.po +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 +11 4 build/i18n/po/opac.js/opac.js.pot +4 4 build/i18n/po/patron.properties/cs-CZ.po +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 +11 10 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 +5 2 build/i18n/po/reservation.js/reservation.js.pot +1 1 build/i18n/po/selfcheck.js/fi-FI.po +8 3 build/i18n/po/selfcheck.js/selfcheck.js.pot +1 1 build/i18n/po/serial.properties/fi-FI.po + +commit 9b3b78bab1e8ed3e907ccebbf13b0c08b85a0f0b +Author: Kathy Lussier +Date: Fri Jun 14 15:51:42 2013 -0400 + + Fixes to MARC batch import docs + + Added needed subheadings to the MARC batch update docs. Also shortened + line lengths and modified intro that focused on 2.2 new features. + + Signed-off-by: Kathy Lussier + +134 62 docs/cataloging/batch_importing_MARC.txt + +commit 77231ce373487ced795327f5a95b2ae4ff8e5493 +Author: Bill Erickson +Date: Mon Aug 27 10:38:48 2012 -0400 + + Repair fine generator memory leak + + Calling "next" from within a "try" block results in a memory leak, + presumably because "try" is a tangled nest of subs and evals. + Replacing the "try" with a good ol' "eval" avoids the leak. + + This can be reproduced with the following: + + --------- + use Error qw/:try/; + + foreach (0..200000) { + try { + next; + } catch Error with { + }; + } + --------- + + This particular leak in the fine generator is onerous when the fine + generator is run often (e.g. every 15 mins), which means circs that + have already been processed for the day are re-analzyed over and over, + causing the code to continue early (next) to the next loop iteration + for large numbers of circs. It also happens when a circs are skipped + because they have no fine interval, rate, or max fine. + + You know this is happening because you will see something like this in + the storage stderr log: + + Exiting eval via next at + /usr/local/share/perl/5.10.1/OpenILS/Application/Storage/Publisher/action.pm + line 820. + + Exiting subroutine via next at + /usr/local/share/perl/5.10.1/OpenILS/Application/Storage/Publisher/action.pm + line 820. + + This patch does not avoid the "exiting eval via next" warning, since + we're still next'ing out of the eval. It just avoids the memory leak + (and the "Exiting subroutine" warning). More extensive refactoring is + needed to to completely remove the second warning. + + Signed-off-by: Bill Erickson + Signed-off-by: Mike Rylander + +7 5 Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm + +commit 89898e7bdb8e6d38aa93ccaf045abe2de917fad8 +Author: Mike Rylander +Date: Tue Apr 30 16:45:55 2013 -0400 + + Search clicked /and/ preceding sf values + + When looking for authority records to control a bib field, we currently + search using exactly, and only, the subfield that was clicked. This + commit changes that so that the full field up to and including the clicked + subfield is used in the simple authority heading search we perform to find + the best-match (pivot) authority record. + + Signed-off-by: Mike Rylander + Signed-off-by: Lebbeous Fogle-Weekley + +8 1 Open-ILS/xul/staff_client/server/cat/marcedit.js + +commit b8e64dbd70608ea91432a9b8fff5d956d3eb7a7d +Author: Thomas Berezansky +Date: Thu Jul 26 10:25:32 2012 -0400 + + Make Force/Recall holds always return as nearest + + Without even running the hold rules. + + Signed-off-by: Thomas Berezansky + Signed-off-by: Mike Rylander + + Conflicts: + Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm + + (Just whitespace conflicts on tab vs space -- repaired by hand.) + +5 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm + +commit feaf67e09fe4d44065d5dadfc4ec20247db00df8 +Author: Ben Shum +Date: Sat Mar 2 02:21:58 2013 -0500 + + TPAC - set autofocus to user input when placing holds in staff client + + When placing holds in TPAC via the staff client, the focus had been on the + basic search field above. Change this to have autofocus on the input field + for the hold user by default. + + This can potentially save staff from having to perform an extra click to + select the input field. Now they can immediately begin entering the barcode + of the user they plan to create a hold on behalf of. + + Signed-off-by: Ben Shum + + Conflicts: + Open-ILS/src/templates/opac/parts/place_hold.tt2 + + Signed-off-by: Mike Rylander + +1 1 Open-ILS/src/templates/opac/parts/place_hold.tt2 +3 0 Open-ILS/src/templates/opac/place_hold.tt2 + +commit 33b496412b5f2f49a096c54160aa2ed39b33af6f +Author: Lebbeous Fogle-Weekley +Date: Mon Apr 15 14:06:54 2013 -0400 + + Acq: Be fuzzy about case when retrieving EDI documents + + The edi_fetcher relies on a routine in OpenILS::Acq::EDI to, among + other things, try to avoid fetching the same EDI document multiple times + when many rows in acq.edi_account refer to the same host and login + credentials. + + Since in practice most vendors seem to run FTP servers for EDI on + Windows, not UNIX, and pathnames are therefore case-insensitive, that + test for other occurrences ought also to be case-insensitive. + + If I were to look at this as a purist, I could argue that vendor servers + might sometimes by run on UNIX, and that for some reason it is possible + that different vendor-to-buyer EDI documents (order responses or + invoices) could have pathnames that differ only in the case of some + characters. But that seems wildly unlikely. If anyone does take this + possibility seriously, perhaps acq.edi_account needs a Boolean column to + indicate the remote host's case [in]sensitivity. + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/EDI.pm + +commit deba8502795145d5272b21015e6d0e383db91f1b +Author: Simon Hieu Mai +Date: Mon Jun 3 17:45:08 2013 -0400 + + LP#1053074: Editimg MARC Fixed Fields jumps cursor to marc record + + Put the cursor back to the current fixed field after reload + the MARC record table. + + Signed-off-by: Simon Hieu Mai + Signed-off-by: Dan Wells + +2 0 Open-ILS/xul/staff_client/server/cat/marcedit.js + +commit 71ef1e8ffaa3f1079fb56a4e47dbb992ac0231b4 +Author: Bill Erickson +Date: Thu May 23 09:11:25 2013 -0400 + + LP1183340 selectivly apply editable funds sorting + + Avoid sorting editable funds to the front of the fund list when there + are no org units at which the user has the ADMIN_ACQ_FUND permission. + Otherwise, we are sorting on an empty 'IN' list in pcrud, which results + in an error. + + Signed-off-by: Bill Erickson + Signed-off-by: Dan Wells + +14 13 Open-ILS/web/js/ui/default/acq/financial/list_funds.js + +commit 6bd6690173be01bb9700e3cca731dec64ce046c7 +Author: Ben Shum +Date: Thu May 23 16:32:49 2013 -0400 + + LP1081576 - fix utf8 characters in searches using portal page + + Replace escape() with encodeURIComponent() on the portal page to allow utf8 + characters to be passed more appropriately to the subsequent search in catalog. + + Thanks Dan Scott for pointing this out. + + Signed-off-by: Ben Shum + Signed-off-by: Pasi Kallinen + +2 2 Open-ILS/xul/staff_client/server/index.xhtml + +commit bcd1986bcbc8c60efe56120cc0030c66484bbb74 +Author: Bill Erickson +Date: Thu May 23 09:43:52 2013 -0400 + + LP1183357 Pass locale to bib search (tpac) + + Pass the TPAC locale value, which is collected at each page load, to the + bib search API call. This allows us to take advantage of language-based + relevance bumps. + + Signed-off-by: Bill Erickson + Signed-off-by: Pasi Kallinen + Signed-off-by: Dan Wells + +5 1 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm + +commit 0af98c7ca5b53512e75e1f488be681b8383aca3f +Author: Jason Stephenson +Date: Thu May 23 11:44:05 2013 -0400 + + Fix Launchpad Bug 1183418. + + Clicking on an author with a dash or dates in the name on the search + results page comes up with 0 results. It looks like the dash is stripped + from the date and/or name. + + Clicking on such a link from the record view actually works because + the dash is replaced with a space. + + This branch changes table.tt2 to replace special characters in author + output with a space in the same way that authors.tt2 does. + + Signed-off-by: Jason Stephenson + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/templates/opac/parts/result/table.tt2 + +commit d5fb7c530a7181c35dee992779d602d4d29a9e22 +Author: Lebbeous Fogle-Weekley +Date: Thu May 16 16:12:14 2013 -0400 + + Database upgrade script for 2.2.9 + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Bill Erickson + +40 0 Open-ILS/src/sql/Pg/version-upgrade/2.2.8-2.2.9-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.2.8-2.2.9-upgrade-db.sql + +commit 7fb90796ba1e05af71325ac7b658c0ea288c2f97 +Author: Bill Erickson +Date: Thu May 16 15:52:38 2013 -0400 + + 2.3.6 -> 2.3.7 DB upgrade script + + Signed-off-by: Bill Erickson + Signed-off-by: Lebbeous Fogle-Weekley + +40 0 Open-ILS/src/sql/Pg/version-upgrade/2.3.6-2.3.7-upgrade-db.sql + create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.3.6-2.3.7-upgrade-db.sql + +commit 84e538b358db650de5f88df0773a5e326663ae26 +Author: Bill Erickson +Date: Wed May 15 16:09:22 2013 -0400 + + 2.3.7 Translations Newpot + + Signed-off-by: Bill Erickson + +2 4 build/i18n/po/XULTermLoader.js/XULTermLoader.js.pot +10 30 build/i18n/po/acq.js/acq.js.pot +2 4 build/i18n/po/capture.js/capture.js.pot +7 19 build/i18n/po/conify.js/conify.js.pot +6 6 build/i18n/po/db.seed/db.seed.pot +1048 1048 build/i18n/po/fm_IDL.dtd/fm_IDL.dtd.pot +44 104 build/i18n/po/ils_events.xml/ils_events.xml.pot +4 11 build/i18n/po/opac.js/opac.js.pot +10 11 build/i18n/po/register.js/register.js.pot +2 5 build/i18n/po/reservation.js/reservation.js.pot +3 8 build/i18n/po/selfcheck.js/selfcheck.js.pot + +commit 23ee004648a6f1d5033046b041dd187712f54103 +Author: Bill Erickson +Date: Wed May 15 16:04:07 2013 -0400 + + 2.3.7 Translations Import + + Signed-off-by: Bill Erickson + +5 5 build/i18n/po/cat.properties/en-GB.po +6 4 build/i18n/po/circ.properties/cs-CZ.po +17 13 build/i18n/po/circ.properties/en-GB.po +6 4 build/i18n/po/circ.properties/hy-AM.po +8 8 build/i18n/po/conify.js/cs-CZ.po +9 9 build/i18n/po/conify.js/en-GB.po +8 8 build/i18n/po/conify.js/hy-AM.po +4 4 build/i18n/po/db.seed/cs-CZ.po +8 8 build/i18n/po/db.seed/en-GB.po +5 5 build/i18n/po/db.seed/hy-AM.po +32 32 build/i18n/po/fm_IDL.dtd/cs-CZ.po +6 6 build/i18n/po/fm_IDL.dtd/en-GB.po +24 24 build/i18n/po/fm_IDL.dtd/hy-AM.po +7 4 build/i18n/po/ils_events.xml/cs-CZ.po +18 11 build/i18n/po/ils_events.xml/en-GB.po +7 4 build/i18n/po/ils_events.xml/hy-AM.po +41 41 build/i18n/po/lang.dtd/cs-CZ.po +8 5 build/i18n/po/lang.dtd/en-GB.po +42 42 build/i18n/po/lang.dtd/hy-AM.po +4 4 build/i18n/po/offline.properties/cs-CZ.po +17 17 build/i18n/po/offline.properties/en-GB.po +4 4 build/i18n/po/offline.properties/hy-AM.po +16 4 build/i18n/po/opac.dtd/en-GB.po +7 7 build/i18n/po/patron.properties/en-GB.po +4 4 build/i18n/po/patron.properties/hy-AM.po +5 5 build/i18n/po/reservation.js/en-GB.po +6 6 build/i18n/po/serial.properties/cs-CZ.po +7 7 build/i18n/po/serial.properties/en-GB.po +6 6 build/i18n/po/serial.properties/hy-AM.po diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index cd4dbbf9c0..fbd39ce169 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm @@ -6,7 +6,7 @@ use base qw/OpenSRF::Application/; sub ils_version { # version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0 # For branches, format is "x-y" - return "HEAD"; + return "2-3-8"; } __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 b2de987fd4..cd649c1a98 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -88,6 +88,7 @@ CREATE TRIGGER no_overlapping_deps FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates'); INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0788', :eg_version); -- bshum/dbwells +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.3.8', :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..c862f58c5c 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/about.html +++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html @@ -1,7 +1,7 @@

Evergreen

Target Server ID:

-

$HeadURL$

+

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

What is Evergreen?

diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js index 6352b6e04e..813ad9ab6f 100644 --- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js +++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js @@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main"); pref("open-ils.enable_join_tabs", true); // We'll use this one to help brand some build information into the client, and rely on subversion keywords -pref("open-ils.repository.headURL","$HeadURL$"); +pref("open-ils.repository.headURL","http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_3_8"); pref("open-ils.repository.author","$Author$"); pref("open-ils.repository.revision","$Revision$"); pref("open-ils.repository.date","$Date$"); diff --git a/Open-ILS/xul/staff_client/windowssetup.nsi b/Open-ILS/xul/staff_client/windowssetup.nsi index e0bc1ef5df..e7e96bb1ed 100644 --- a/Open-ILS/xul/staff_client/windowssetup.nsi +++ b/Open-ILS/xul/staff_client/windowssetup.nsi @@ -3,7 +3,7 @@ ; HM NIS Edit Wizard helper defines ; Old versions of makensis don't like this, moved to Makefile ;!define /file PRODUCT_VERSION "client/VERSION" -!define PRODUCT_TAG "Master" +!define PRODUCT_TAG "2.3" !define PRODUCT_INSTALL_TAG "${PRODUCT_TAG}" !define UI_IMAGESET "beta" ;!define UI_IMAGESET "release" diff --git a/README b/README deleted file mode 120000 index b57451acb4..0000000000 --- a/README +++ /dev/null @@ -1 +0,0 @@ -docs/installation/server_installation.txt \ No newline at end of file diff --git a/README b/README new file mode 100644 index 0000000000..6809ee18a5 --- /dev/null +++ b/README @@ -0,0 +1,549 @@ +Installing the Evergreen server +=============================== +:toc: +:numbered: + +Preamble: referenced user accounts +---------------------------------- + +In subsequent sections, we will refer to a number of different accounts, as +follows: + + * Linux user accounts: + ** The *user* Linux account is the account that you use to log onto the + Linux system as a regular user. + ** The *root* Linux account is an account that has system administrator + privileges. On Debian and Fedora you can switch to this account from + your *user* account by issuing the `su -` command and entering the + password for the *root* account when prompted. On Ubuntu you can switch + to this account from your *user* account using the `sudo su -` command + and entering the password for your *user* account when prompted. + ** The *opensrf* Linux account is an account that you create when installing + OpenSRF. You can switch to this account from the *root* account by + issuing the `su - opensrf` command. + ** The *postgres* Linux account is created automatically when you install + the PostgreSQL database server. You can switch to this account from the + *root* account by issuing the `su - postgres` command. + * PostgreSQL user accounts: + ** The *evergreen* PostgreSQL account is a superuser account that you will + create to connect to the PostgreSQL database server. + * Evergreen administrator account: + ** The *egadmin* Evergreen account is an administrator account for + Evergreen that you will use to test connectivity and configure your + Evergreen instance. + +Preamble: developer instructions +-------------------------------- + +[NOTE] +Skip this section if you are using an official release tarball downloaded +from http://evergreen-ils.org/downloads + +Developers working directly with the source code from the Git repository, +rather than an official release tarball, must install some extra packages +and perform one step before they can proceed with the `./configure` step. + +As the *root* Linux account, install the following packages: + + * autoconf + * automake + * libtool + +As the *user* Linux account, issue the following command in the Evergreen +source directory to generate the configure script and Makefiles: + +[source, bash] +------------------------------------------------------------------------------ +autoreconf -i +------------------------------------------------------------------------------ + +After running `make install`, developers also need to install the Dojo Toolkit +set of JavaScript libraries. The appropriate version of Dojo is included +in Evergreen release tarballs. Developers should install the Dojo 1.3.3 +version of Dojo by issuing the following commands as the *opensrf* Linux +account: + +[source, bash] +------------------------------------------------------------------------------ +wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz +tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz +cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/. +------------------------------------------------------------------------------ + +Installing prerequisites +------------------------ + +Evergreen has a number of prerequisite packages that must be installed +before you can successfully configure, compile, and install Evergreen. + +1. Begin by installing the most recent version of OpenSRF (2.1 or later). + You can download OpenSRF releases from http://evergreen-ils.org/opensrf.php +2. On many distributions, it is necessary to install PostgreSQL 9 from external + repositories. ++ + * On Debian Squeeze, open `/etc/apt/sources.list` in a text editor as the + *root* Linux account and add the following line: ++ +[source, bash] +------------------------------------------------------------------------------ +deb http://backports.debian.org/debian-backports squeeze-backports main contrib +------------------------------------------------------------------------------ ++ + * On Ubuntu Lucid, you can use a PPA (personal package archive), which are + package sources hosted on Launchpad. The one most commonly used by Evergreen + Community members is maintained by Martin Pitt, who also maintains the + official PostgreSQL packages for Ubuntu. As the *root* Linux account, issue + the following commands to add the PPA source: ++ +[source, bash] +------------------------------------------------------------------------------ +apt-get install python-software-properties +add-apt-repository ppa:pitti/postgresql +------------------------------------------------------------------------------ ++ + * Ubuntu Precise comes with PostgreSQL 9, so no additional steps are required. ++ + * Fedora comes with PostgreSQL 9, so no additional steps are required. ++ +3. On Debian and Ubuntu, run `aptitude update` as the *root* Linux account to + retrieve the new packages from the backports repository. +4. Issue the following commands as the *root* Linux account to install + prerequisites using the `Makefile.install` prerequisite installer, + substituting `debian-squeeze`, `fedora`, `ubuntu-lucid`, or + `ubuntu-precise` for below: ++ +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install +------------------------------------------------------------------------------ ++ +5. Add the libdbi-libdbd libraries to the system dynamic library path by + issuing the following commands as the *root* Linux account: ++ +[NOTE] +You should skip this step if installing on Ubuntu Precise. The ubuntu-precise +target uses libdbd-pgsql from packages. ++ +.Debian / Ubuntu Lucid +[source, bash] +------------------------------------------------------------------------------ +echo "/usr/local/lib/dbd" > /etc/ld.so.conf.d/eg.conf +ldconfig +------------------------------------------------------------------------------ ++ +.Fedora +[source, bash] +------------------------------------------------------------------------------ +echo "/usr/lib64/dbd" > /etc/ld.so.conf.d/eg.conf +ldconfig +------------------------------------------------------------------------------ + +Configuration and compilation instructions +------------------------------------------ + +For the time being, we are still installing everything in the `/openils/` +directory. From the Evergreen source directory, issue the following commands as +the *user* Linux account to configure and build Evergreen: + +[source, bash] +------------------------------------------------------------------------------ +./configure --prefix=/openils --sysconfdir=/openils/conf +make +------------------------------------------------------------------------------ + +Installation instructions +------------------------- + +1. Once you have configured and compiled Evergreen, issue the following + command as the *root* Linux account to install Evergreen, build the server + portion of the staff client, and copy example configuration files to + `/openils/conf`. + Change the value of the `STAFF_CLIENT_STAMP_ID` variable to match the version + of the staff client that you will use to connect to the Evergreen server. ++ +[source, bash] +------------------------------------------------------------------------------ +make STAFF_CLIENT_STAMP_ID=rel_2_3_8 install +------------------------------------------------------------------------------ ++ +2. The server portion of the staff client expects `http://hostname/xul/server` + to resolve. Issue the following commands as the *root* Linux account to + create a symbolic link pointing to the `server` subdirectory of the server + portion of the staff client that we just built using the staff client ID + 'rel_name': ++ +[source, bash] +------------------------------------------------------------------------------ +cd /openils/var/web/xul +ln -sf rel_name/server server +------------------------------------------------------------------------------ + +Change ownership of the Evergreen files +--------------------------------------- + +All files in the `/openils/` directory and subdirectories must be owned by the +`opensrf` user. Issue the following command as the *root* Linux account to +change the ownership on the files: + +[source, bash] +------------------------------------------------------------------------------ +chown -R opensrf:opensrf /openils +------------------------------------------------------------------------------ + +Configure the Apache Web server +------------------------------- + +1. Use the example configuration files in `Open-ILS/examples/apache/` to +configure your Web server for the Evergreen catalog, staff client, Web +services, and administration interfaces. Issue the following commands as the +*root* Linux account: ++ +.Debian and Ubuntu +[source,bash] +------------------------------------------------------------------------------ +cp Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/ +cp Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/ +cp Open-ILS/examples/apache/startup.pl /etc/apache2/ +# Now set up SSL +mkdir /etc/apache2/ssl +cd /etc/apache2/ssl +------------------------------------------------------------------------------ ++ +.Fedora +[source,bash] +------------------------------------------------------------------------------ +cp Open-ILS/examples/apache/eg.conf /etc/httpd/conf.d/ +cp Open-ILS/examples/apache/eg_vhost.conf /etc/httpd/ +cp Open-ILS/examples/apache/startup.pl /etc/httpd/ +# Now set up SSL +mkdir /etc/httpd/ssl +cd /etc/httpd/ssl +------------------------------------------------------------------------------ ++ +2. The `openssl` command cuts a new SSL key for your Apache server. For a +production server, you should purchase a signed SSL certificate, but you can +just use a self-signed certificate and accept the warnings in the staff client +and browser during testing and development. Create an SSL key for the Apache +server by issuing the following command as the *root* Linux account: ++ +[source,bash] +------------------------------------------------------------------------------ +openssl req -new -x509 -days 365 -nodes -out server.crt -keyout server.key +------------------------------------------------------------------------------ ++ +3. As the *root* Linux account, edit the `eg.conf` file that you copied into +place. + a. Replace `Allow from 10.0.0.0/8` with `Allow from all` (to enable + access to the offline upload / execute interface from any workstation on + any network - note that you must secure this for a production instance) + b. (Fedora): Change references from the non-existent `/etc/apache2/` directory + to `/etc/httpd/`. +4. Change the user for the Apache server. + * (Debian and Ubuntu): As the *root* Linux account, edit + `/etc/apache2/envvars`. Change `export APACHE_RUN_USER=www-data` to + `export APACHE_RUN_USER=opensrf`. + * (Fedora): As the *root* Linux account , edit `/etc/httpd/conf/httpd.conf`. + Change `User apache` to `User opensrf`. +5. Configure Apache with performance settings appropriate for Evergreen: + * (Debian and Ubuntu): As the *root* Linux account, edit + `/etc/apache2/apache2.conf`: + * (Fedora): As the *root* Linux account, edit `/etc/httpd/conf/httpd.conf`: + a. Change `KeepAliveTimeout` to `1`. Higher values reduce the chance of + a request timing out unexpectedly, but increase the risk of using up + all available Apache child processes. + b. 'Optional': Change `MaxKeepAliveRequests` to `100` + c. Update the prefork configuration section to suit your environment. The + following settings apply to a busy system: ++ +[source,bash] +------------------------------------------------------------------------------ + + StartServers 20 + MinSpareServers 5 + MaxSpareServers 15 + MaxClients 150 + MaxRequestsPerChild 10000 + +------------------------------------------------------------------------------ ++ +6. (Fedora): As the *root* Linux account, edit the `/etc/httpd/eg_vhost.conf` + file to change references from the non-existent `/etc/apache2/` directory + to `/etc/httpd/`. +7. (Debian and Ubuntu): As the *root* Linux account, enable the Evergreen site: ++ +[source,bash] +------------------------------------------------------------------------------ +a2dissite default # OPTIONAL: disable the default site (the "It Works" page) +a2ensite eg.conf +------------------------------------------------------------------------------ + +Configure OpenSRF for the Evergreen application +----------------------------------------------- +There are a number of example OpenSRF configuration files in `/openils/conf/` +that you can use as a template for your Evergreen installation. Issue the +following commands as the *opensrf* Linux account: + +[source, bash] +------------------------------------------------------------------------------ +cp -b /openils/conf/opensrf_core.xml.example /openils/conf/opensrf_core.xml +cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml +------------------------------------------------------------------------------ + +When you installed OpenSRF, you created four Jabber users on two +separate domains and edited the `opensrf_core.xml` file accordingly. Please +refer back to the OpenSRF README and, as the *opensrf* Linux account, edit the +Evergreen version of the `opensrf_core.xml` file using the same Jabber users +and domains as you used while installing and testing OpenSRF. + +[NOTE] +The `-b` flag tells the `cp` command to create a backup version of the +destination file. The backup version of the destination file has a tilde (`~`) +appended to the file name, so if you have forgotten the Jabber users and +domains, you can retrieve the settings from the backup version of the files. + +`eg_db_config.pl`, described in the following section, sets the database +connection information in `opensrf.xml` for you. + +Creating the Evergreen database +------------------------------- + +By default, the `Makefile.install` prerequisite installer does not install +the PostgreSQL 9 database server required by every Evergreen system; +for production use, most libraries install the PostgreSQL database server on a +dedicated machine. You can install the packages required by Debian or Ubuntu Lucid +on the machine of your choice using the following commands as the *root* +Linux account: + +.(Debian and Ubuntu Lucid) Installing PostgreSQL 9.1 server packages +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_backport_debs_91 +------------------------------------------------------------------------------ + +.(Ubuntu Precise) Installing PostgreSQL 9.1 server packages +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install install_pgsql_server_debs_91 +------------------------------------------------------------------------------ + +You can install the packages required by Fedora on the machine of your choice +using the following commands as the *root* Linux account: + +.(Fedora) Installing PostgreSQL server packages +[source, bash] +------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install install_fedora_pgsql_server +postgresql-setup initdb +------------------------------------------------------------------------------ + +For a standalone PostgreSQL server, install the following Perl modules as the +*root* Linux account: + +.(Debian / Ubuntu) Installing additional Perl modules on a standalone PostgreSQL 9 server +[source, bash] +------------------------------------------------------------------------------ +aptitude install gcc libxml-libxml-perl libxml-libxslt-perl +cpan Business::ISBN +cpan JSON::XS +cpan Library::CallNumber::LC +cpan MARC::Record +cpan MARC::File::XML +cpan UUID::Tiny +------------------------------------------------------------------------------ + +.(Fedora) Installing additional Perl modules on a standalone PostgreSQL 9 server +[source, bash] +------------------------------------------------------------------------------ +yum install gcc perl-XML-LibXML perl-XML-LibXSLT perl-Business-ISBN +cpan Library::CallNumber::LC +cpan MARC::Record +cpan MARC::File::XML +cpan UUID::Tiny +------------------------------------------------------------------------------ + +You need to create a PostgreSQL superuser to create and access the database. +Issue the following command as the *postgres* Linux account to create a new +PostgreSQL superuser named `evergreen`. When prompted, enter the new user's +password: + +[source, bash] +------------------------------------------------------------------------------ +createuser -s -P evergreen +------------------------------------------------------------------------------ + +Once you have created the *evergreen* PostgreSQL account, you also need to +create the database and schema, and configure your configuration files to point +at the database server. Issue the following command as the *root* Linux account +from inside the Evergreen source directory, replacing , , +, , and with the appropriate values for your +PostgreSQL database (where and are for the *evergreen* +PostgreSQL account you just created), and replace and +with the values you want for the *egadmin* Evergreen administrator account: + +[source, bash] +------------------------------------------------------------------------------ +perl Open-ILS/src/support-scripts/eg_db_config.pl --update-config \ + --service all --create-database --create-schema --create-offline \ + --user --password --hostname --port \ + --database --admin-user --admin-pass +------------------------------------------------------------------------------ + +This creates the database and schema and configures all of the services in +your `/openils/conf/opensrf.xml` configuration file to point to that database. +It also creates the configuration files required by the Evergreen `cgi-bin` +administration scripts, and sets the user name and password for the *egadmin* +Evergreen administrator account to your requested values. + +Creating the database on a remote server +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In a production instance of Evergreen, your PostgreSQL server should be +installed on a dedicated server. + +PostgreSQL 9.1 and later +^^^^^^^^^^^^^^^^^^^^^^^^ +To create the database instance on a remote database server running PostgreSQL +9.1 or later, simply use the `--create-database` flag on `eg_db_config.pl`. + +For PostgreSQL 9.0 +^^^^^^^^^^^^^^^^^^ +To create the database instance on a remote database server running PostgreSQL +9.0, you can either: + + * Install the PostgreSQL contrib modules on the machine on which you + are installing the Evergreen code, and use the `--create-database` + option from that machine, or + * Copy the `Open-ILS/src/sql/Pg/create_database.sql` script to your + PostgreSQL server and invoke it as the *postgres* Linux account: ++ +[source, bash] +------------------------------------------------------------------------------ +psql -vdb_name= -vcontrib_dir=`pg_config --sharedir`/contrib -f create_database.sql +------------------------------------------------------------------------------ + +Then you can issue the `eg_db_config.pl` command as above _without_ the +`--create-database` argument to create your schema and configure your +configuration files. + +Starting Evergreen +------------------ +1. As the *root* Linux account, start the `memcached` and `ejabberd` services +(if they aren't already running): ++ +[source, bash] +------------------------------------------------------------------------------ +/etc/init.d/ejabberd start +/etc/init.d/memcached start +------------------------------------------------------------------------------ ++ +2. As the *opensrf* Linux account, start Evergreen. The `-l` flag in the +following command is only necessary if you want to force Evergreen to treat the +hostname as `localhost`; if you configured `opensrf.xml` using the real +hostname of your machine as returned by `perl -ENet::Domain 'print +Net::Domain::hostfqdn() . "\n";'`, you should not use the `-l` flag. ++ +[source, bash] +------------------------------------------------------------------------------ +osrf_ctl.sh -l -a start_all +------------------------------------------------------------------------------ ++ + ** If you receive the error message `bash: osrf_ctl.sh: command not found`, + then your environment variable `PATH` does not include the `/openils/bin` + directory; this should have been set in the *opensrf* Linux account's + `.bashrc` configuration file. To manually set the `PATH` variable, edit the + configuration file `~/.bashrc` as the *opensrf* Linux account and add the + following line: ++ +[source, bash] +------------------------------------------------------------------------------ +export PATH=$PATH:/openils/bin +------------------------------------------------------------------------------ ++ +3. As the *opensrf* Linux account, generate the Web files needed by the staff + client and catalogue and update the organization unit proximity (you need to do + this the first time you start Evergreen, and after that each time you change + the library hierarchy in `config.cgi`): ++ +[source, bash] +------------------------------------------------------------------------------ +autogen.sh -u +------------------------------------------------------------------------------ ++ +4. As the *root* Linux account, restart the Apache Web server: ++ +[source, bash] +------------------------------------------------------------------------------ +/etc/init.d/apache2 restart +------------------------------------------------------------------------------ ++ +If the Apache Web server was running when you started the OpenSRF services, you +might not be able to successfully log in to the OPAC or staff client until the +Apache Web server is restarted. + +Testing connections to Evergreen +-------------------------------- + +Once you have installed and started Evergreen, test your connection to +Evergreen via `srfsh`. As the *opensrf* Linux account, issue the following +commands to start `srfsh` and try to log onto the Evergreen server using the +*egadmin* Evergreen administrator user name and password that you set using the +`eg_db_config.pl` command: + +[source, bash] +------------------------------------------------------------------------------ +/openils/bin/srfsh +srfsh% login +------------------------------------------------------------------------------ + +You should see a result like: + + Received Data: "250bf1518c7527a03249858687714376" + ------------------------------------ + Request Completed Successfully + Request Time in seconds: 0.045286 + ------------------------------------ + + Received Data: { + "ilsevent":0, + "textcode":"SUCCESS", + "desc":" ", + "pid":21616, + "stacktrace":"oils_auth.c:304", + "payload":{ + "authtoken":"e5f9827cc0f93b503a1cc66bee6bdd1a", + "authtime":420 + } + + } + + ------------------------------------ + Request Completed Successfully + Request Time in seconds: 1.336568 + ------------------------------------ + +If this does not work, it's time to do some troubleshooting. + + * As the *opensrf* Linux acccount, run the `settings-tester.pl` script to see + if it finds any system configuration problems. The script is found at + `Open-ILS/src/support-scripts/settings-tester.pl` in the Evergreen source + tree. + * Follow the steps in the http://evergreen-ils.org/dokuwiki/doku.php?id=troubleshooting:checking_for_errors[troubleshooting guide]. + * If you have faithfully followed the entire set of installation steps + listed here, you are probably extremely close to a working system. + Gather your configuration files and log files and contact the + http://open-ils.org/listserv.php[Evergreen development mailing list] + for assistance before making any drastic changes to your system + configuration. + +Getting help +------------ + +Need help installing or using Evergreen? Join the mailing lists at +http://evergreen-ils.org/listserv.php or contact us on the Freenode +IRC network on the #evergreen channel. + +License +------- +This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 +Unported License. To view a copy of this license, visit +http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative +Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA. diff --git a/configure.ac b/configure.ac index 89e64f6829..f811496896 100644 --- a/configure.ac +++ b/configure.ac @@ -20,8 +20,8 @@ export PATH=${PATH}:/usr/sbin AC_PREREQ(2.61) -AC_INIT(Open-ILS, trunk, open-ils-dev@list.georgialibraries.org) -AM_INIT_AUTOMAKE([OpenILS], [trunk]) +AC_INIT(Open-ILS, 2.3.8, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [2.3.8]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_PREFIX_DEFAULT([/openils/]) -- 2.11.0