From: Lebbeous Fogle-Weekley Date: Thu, 21 Feb 2013 20:56:48 +0000 (-0500) Subject: Bumping version numbers, adding Upgrade Script and Changelog X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fsenator%2Frel_2_2_6_rc;p=working%2FEvergreen.git Bumping version numbers, adding Upgrade Script and Changelog Signed-off-by: Lebbeous Fogle-Weekley --- diff --git a/ChangeLog b/ChangeLog index 1f72b2c73e..0b72f34c06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,292 @@ -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 9bd326205a6ddbfb82acf5b96effa23a9bbeb870 +Author: Lebbeous Fogle-Weekley +Date: Thu Feb 21 13:26:05 2013 -0500 + + Translations import + + Signed-off-by: Lebbeous Fogle-Weekley + +21 21 build/i18n/po/Searcher.js/pt-BR.po +2 4 build/i18n/po/XULTermLoader.js/XULTermLoader.js.pot +21 47 build/i18n/po/acq.js/acq.js.pot +10 8 build/i18n/po/admin.properties/hy-AM.po +15 16 build/i18n/po/admin.properties/pt-BR.po +8 8 build/i18n/po/authority.js/hy-AM.po +102 0 build/i18n/po/authority.js/tr-TR.po +2 4 build/i18n/po/capture.js/capture.js.pot +2 28 build/i18n/po/circ.properties/circ.properties.pot +6 6 build/i18n/po/circ.properties/cs-CZ.po +15 1 build/i18n/po/circ.properties/de-DE.po +6 6 build/i18n/po/circ.properties/en-CA.po +15 1 build/i18n/po/circ.properties/en-GB.po +19 5 build/i18n/po/circ.properties/es-ES.po +15 1 build/i18n/po/circ.properties/fr-CA.po +35 16 build/i18n/po/circ.properties/hy-AM.po +83 36 build/i18n/po/circ.properties/pt-BR.po +15 1 build/i18n/po/circ.properties/ru-RU.po +2 6 build/i18n/po/common.properties/common.properties.pot +1 1 build/i18n/po/common.properties/cs-CZ.po +4 4 build/i18n/po/common.properties/en-CA.po +10 10 build/i18n/po/common.properties/hy-AM.po +2 2 build/i18n/po/conify.dtd/conify.dtd.pot +4 4 build/i18n/po/conify.dtd/hy-AM.po +7 19 build/i18n/po/conify.js/conify.js.pot +6 6 build/i18n/po/conify.js/cs-CZ.po +9 9 build/i18n/po/conify.js/de-DE.po +6 6 build/i18n/po/conify.js/es-ES.po +5 5 build/i18n/po/conify.js/hy-AM.po +6 6 build/i18n/po/conify.js/pt-BR.po +122 122 build/i18n/po/db.seed/cs-CZ.po +718 809 build/i18n/po/db.seed/db.seed.pot +127 127 build/i18n/po/db.seed/de-DE.po +122 122 build/i18n/po/db.seed/en-CA.po +122 122 build/i18n/po/db.seed/en-GB.po +122 122 build/i18n/po/db.seed/es-ES.po +122 128 build/i18n/po/db.seed/fr-CA.po +262 265 build/i18n/po/db.seed/hy-AM.po +122 122 build/i18n/po/db.seed/oc-FR.po +122 127 build/i18n/po/db.seed/pt-BR.po +122 127 build/i18n/po/db.seed/ru-RU.po +122 122 build/i18n/po/db.seed/tr-TR.po +4 4 build/i18n/po/fm_IDL.dtd/cs-CZ.po +798 774 build/i18n/po/fm_IDL.dtd/de-DE.po +4 4 build/i18n/po/fm_IDL.dtd/en-CA.po +808 781 build/i18n/po/fm_IDL.dtd/en-GB.po +795 771 build/i18n/po/fm_IDL.dtd/es-ES.po +2341 2537 build/i18n/po/fm_IDL.dtd/fm_IDL.dtd.pot +835 807 build/i18n/po/fm_IDL.dtd/fr-CA.po +985 941 build/i18n/po/fm_IDL.dtd/hy-AM.po +808 781 build/i18n/po/fm_IDL.dtd/pt-BR.po +808 781 build/i18n/po/fm_IDL.dtd/ru-RU.po +32 26 build/i18n/po/ils_events.xml/cs-CZ.po +27 27 build/i18n/po/ils_events.xml/de-DE.po +36 30 build/i18n/po/ils_events.xml/en-GB.po +27 27 build/i18n/po/ils_events.xml/es-ES.po +34 28 build/i18n/po/ils_events.xml/fr-CA.po +43 103 build/i18n/po/ils_events.xml/ils_events.xml.pot +33 27 build/i18n/po/ils_events.xml/pt-BR.po +33 27 build/i18n/po/ils_events.xml/ru-RU.po +66 541 build/i18n/po/lang.dtd/ar-AR.po +6 6 build/i18n/po/lang.dtd/cs-CZ.po +333 568 build/i18n/po/lang.dtd/de-DE.po +25 15 build/i18n/po/lang.dtd/en-CA.po +748 616 build/i18n/po/lang.dtd/en-GB.po +227 551 build/i18n/po/lang.dtd/es-ES.po +963 788 build/i18n/po/lang.dtd/hy-AM.po +543 146 build/i18n/po/lang.dtd/lang.dtd.pot +702 602 build/i18n/po/lang.dtd/pt-BR.po +704 604 build/i18n/po/lang.dtd/ru-RU.po +67 542 build/i18n/po/lang.dtd/tr-TR.po +5 0 build/i18n/po/offline.properties/cs-CZ.po +5 0 build/i18n/po/offline.properties/de-DE.po +7 7 build/i18n/po/offline.properties/en-CA.po +5 0 build/i18n/po/offline.properties/en-GB.po +5 0 build/i18n/po/offline.properties/es-ES.po +5 0 build/i18n/po/offline.properties/fr-CA.po +48 31 build/i18n/po/offline.properties/hy-AM.po +2 21 build/i18n/po/offline.properties/offline.properties.pot +5 0 build/i18n/po/offline.properties/pt-BR.po +5 0 build/i18n/po/offline.properties/ru-RU.po +32 11 build/i18n/po/opac.dtd/cs-CZ.po +6 6 build/i18n/po/opac.dtd/de-DE.po +29 17 build/i18n/po/opac.dtd/en-GB.po +31 19 build/i18n/po/opac.dtd/es-ES.po +30 18 build/i18n/po/opac.dtd/fr-CA.po +4 6 build/i18n/po/opac.dtd/he-IL.po +53 20 build/i18n/po/opac.dtd/hy-AM.po +1 3 build/i18n/po/opac.dtd/oc-FR.po +3 5 build/i18n/po/opac.dtd/opac.dtd.pot +165 146 build/i18n/po/opac.dtd/pt-BR.po +3 3 build/i18n/po/opac.js/cs-CZ.po +3 3 build/i18n/po/opac.js/de-DE.po +6 6 build/i18n/po/opac.js/es-ES.po +5 5 build/i18n/po/opac.js/hy-AM.po +4 11 build/i18n/po/opac.js/opac.js.pot +4 4 build/i18n/po/patron.properties/en-CA.po +42 26 build/i18n/po/patron.properties/hy-AM.po +2 6 build/i18n/po/patron.properties/patron.properties.pot +5 5 build/i18n/po/pull_list.js/es-ES.po +16 16 build/i18n/po/pull_list.js/pt-BR.po +15 15 build/i18n/po/register.js/cs-CZ.po +17 17 build/i18n/po/register.js/de-DE.po +13 13 build/i18n/po/register.js/en-CA.po +13 13 build/i18n/po/register.js/en-GB.po +29 29 build/i18n/po/register.js/es-ES.po +3 7 build/i18n/po/register.js/fr-CA.po +21 21 build/i18n/po/register.js/hy-AM.po +13 13 build/i18n/po/register.js/pt-BR.po +2 3 build/i18n/po/register.js/register.js.pot +13 13 build/i18n/po/register.js/ru-RU.po +39 39 build/i18n/po/register.js/tr-TR.po +6 6 build/i18n/po/reservation.js/hy-AM.po +2 5 build/i18n/po/reservation.js/reservation.js.pot +5 5 build/i18n/po/selfcheck.js/es-ES.po +8 8 build/i18n/po/selfcheck.js/hy-AM.po +32 23 build/i18n/po/selfcheck.js/pt-BR.po +3 8 build/i18n/po/selfcheck.js/selfcheck.js.pot +15 15 build/i18n/po/serial.properties/hy-AM.po +11 11 build/i18n/po/serial.properties/pt-BR.po +244 1536 build/i18n/po/tpac/tpac.pot + create mode 100644 build/i18n/po/authority.js/tr-TR.po + +commit 4e266eaf972370051a12bbd4be04b536e6326010 +Author: Lebbeous Fogle-Weekley +Date: Wed Feb 13 10:34:17 2013 -0500 + + Serials: change more carp() to croak() to avoid infinite loops + + This addresses a problem very similar to that in LP #1075167, where + certain loops never end because problems with the data elicited calls to + carp(), which fills up log, but never gives our loops notice to end. + + Visible symptoms include 1) a greate volume of log spew and 2) an + open-ils.serial drone that ties up a CPU. + + The fault lies maybe in our loops rather than in the MFHD + package, but this fixes the problem fastest, and should not have + undesirable side-effects. + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Dan Wells + +2 2 Open-ILS/src/perlmods/lib/OpenILS/Utils/MFHD/Caption.pm + +commit 173fe017e4639016223fe788755360a4c8240a0b +Author: Mark Cooper +Date: Tue Oct 16 11:02:23 2012 -0700 + + LP#1067361: vandelay: batch queue deletion no longer works + + Because window.location.reload can trigger before the deletions + have occurred. Simple fix (band aid?) is to make the delete + calls in sync. + + Signed-off-by: Mark Cooper + Signed-off-by: Kathy Lussier + Signed-off-by: Ben Shum + +1 1 Open-ILS/web/js/ui/default/vandelay/vandelay.js + +commit 64658bb975b6fd9ca5df403e0e810219df97dbfd +Author: Jason Etheridge +Date: Thu Sep 20 13:10:15 2012 -0400 + + LP1053526 - Don't inadvertently modify the in-memory org tree when printing + + To see an example of this causing a problem, load Holdings Maintenance for + an arbitrary bib record with items. Make sure the Hide Empty Libs checkbox + is checked. Hit the Print button at the bottom of the UI (it's okay to then + Cancel the print). Then hit Refresh. It should result in an org.children() + is null error. + + Signed-off-by: Jason Etheridge + Signed-off-by: Ben Shum + +2 2 Open-ILS/xul/staff_client/chrome/content/util/list.js + +commit 42980607363da546727ab0e29ae921d907c3cade +Author: Kathy Lussier +Date: Thu Jan 31 10:51:40 2013 -0500 + + Copy_offset and copy_limit shouldn't persist in URL + + Added copy_offset and copy_limit to stop_parms definition so that they + don't persist in URL when returning to search results or launching + subject/series searches. + + Signed-off-by: Kathy Lussier + Signed-off-by: Pasi Kallinen + Signed-off-by: Ben Shum + +1 1 Open-ILS/src/templates/opac/parts/record/body.tt2 + +commit 4f0b0ec1c62ed1107e83ae31718030444508e43f +Author: Lebbeous Fogle-Weekley +Date: Mon Jan 21 14:54:55 2013 -0500 + + Serials: Caption/pattern wizard use enum fields for chronology when no enum + + MFHD spec says that when there are no ‡a - ‡f enumeration captions, any + chronology captions should move back from their usual ‡i - ‡m places + back into enumeration space. + + The predictions engine we already have deals with this better than with + the wrong patterns we were creating before, e.g.: + + 853 20 ‡81 ‡i(year) ‡j(month) ‡wm + + Signed-off-by: Lebbeous Fogle-Weekley + Signed-off-by: Dan Wells + +15 3 Open-ILS/xul/staff_client/server/serial/pattern_wizard.js + +commit 47b17025cbc82a9435b68323b29a6768ff7645ad +Author: Dan Scott +Date: Fri Aug 17 16:07:19 2012 -0400 + + Deal with opt-in boundaries defensively + + If a site had not set an 'org.patron_opt_default' OU setting, then it + seemed that a DEFAULT value was getting dumped into the "create opt-in" + INSERT statement for the org_unit argument, and that (as there is a + non-NULL constraint on the column and no default value for the column) + resulted in the patron not getting opted in. + + One way for sites to deal with this is to set an opt-in boundary at the + consortial level, along the lines of: + + INSERT INTO actor.org_unit_setting (org_unit, name, value) + VALUES (1, 'org.patron_opt_default', 2); + + Alternatively, in the absense of any such setting, opt-in should + continue to work as it had before the new feature was added; this change + keeps the old behaviour active in that case. + + Signed-off-by: Dan Scott + Signed-off-by: James Fournie + Signed-off-by: Ben Shum + +5 2 Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm + +commit 273f7d81d0d25204dd2c67b93e1a687c18358729 +Author: Robert Soulliere +Date: Tue Jan 22 09:40:37 2013 -0500 + + Documentation: Update staff client installation for 2.2.5 + + Signed-off-by: Robert Soulliere + +3 3 docs/installation/staff_client_installation.txt + +commit 59d24d0e07c6761e1c97971be18a2af855fe3fdc +Author: Robert Soulliere +Date: Tue Jan 22 09:26:13 2013 -0500 + + Documentation: Update upgrading server instructions for 2.2.5 + + Signed-off-by: Robert Soulliere + +13 10 docs/installation/server_upgrade.txt + +commit f9ec4a5ae5d87d4bceba8df4c68422731ffe7124 +Author: Ben Shum +Date: Mon Dec 3 10:37:43 2012 -0500 + + Update staff client's about page to include newest core committers + + The newest core committers were elected during the Evergreen Hack-A-Way on + October 10, 2012: + + Jeff Godin, Traverse Area District Library + Benjamin Shum, Bibliomation, Inc. + Jason Stephenson, Merrimack Valley Library Consortium + + Also update language of page to reflect that these contributors are now core + "committers" rather than "developers". And move past core committers into + their own section. + + Signed-off-by: Ben Shum + Signed-off-by: Dan Scott + +13 6 Open-ILS/xul/staff_client/chrome/content/main/about.html + diff --git a/Open-ILS/src/perlmods/lib/OpenILS.pm b/Open-ILS/src/perlmods/lib/OpenILS.pm index ead71e2e45..8a2bc35ee9 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS.pm @@ -6,6 +6,6 @@ OpenILS - Client and server support for the Evergreen open source library system =cut -our $VERSION = '2.00'; +our $VERSION = '2.0206'; 1; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index 7e36e0e9d4..58bc6e2003 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 "2-2"; + return "2-2-6"; } __PACKAGE__->register_method( diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 559022feda..5f798928fc 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 ('0750', :eg_version); -- miker/jstephenson +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.2.6', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, 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..fdb8c709fe --- /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_2_6 install +------------------------------------------------------------------------------ ++ +2. The server portion of the staff client expects `http://hostname/xul/server` + to resolve. Issue the following commands as the *root* Linux account to + create a symbolic link pointing to the `server` subdirectory of the server + portion of the staff client that we just built using the staff client ID + 'rel_name': ++ +[source, bash] +------------------------------------------------------------------------------ +cd /openils/var/web/xul +ln -sf rel_name/server server +------------------------------------------------------------------------------ + +Change ownership of the Evergreen files +--------------------------------------- + +All files in the `/openils/` directory and subdirectories must be owned by the +`opensrf` user. Issue the following command as the *root* Linux account to +change the ownership on the files: + +[source, bash] +------------------------------------------------------------------------------ +chown -R opensrf:opensrf /openils +------------------------------------------------------------------------------ + +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 d599a51622..2a67ed0372 100644 --- a/configure.ac +++ b/configure.ac @@ -20,8 +20,8 @@ export PATH=${PATH}:/usr/sbin AC_PREREQ(2.61) -AC_INIT(Open-ILS, 2.2, open-ils-dev@list.georgialibraries.org) -AM_INIT_AUTOMAKE([OpenILS], [2.2]) +AC_INIT(Open-ILS, 2.2.6, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [2.2.6]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_PREFIX_DEFAULT([/openils/])