[open-ils-commits] [GIT] Evergreen ILS branch tags/rel_2_9_7 created. b86408e05e9498b53ffca57fabd77806274da44e
Evergreen Git
git at git.evergreen-ils.org
Thu Aug 25 18:58:31 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, tags/rel_2_9_7 has been created
at b86408e05e9498b53ffca57fabd77806274da44e (commit)
- Log -----------------------------------------------------------------
commit b86408e05e9498b53ffca57fabd77806274da44e
Author: Jason Stephenson <jason at sigio.com>
Date: Thu Aug 25 17:42:52 2016 -0400
Bumping version numbers, adding Upgrade Script and Changelog
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/ChangeLog b/ChangeLog
index 1f72b2c..632bc09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,413 @@
-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 4e9814fdc877b926bc377753013aee893062e17b
+Author: Jason Stephenson <jason at sigio.com>
+Date: Thu Aug 25 17:37:12 2016 -0400
+
+ Update server upgrade instructions for 2.9.7.
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+17 16 docs/installation/server_upgrade.txt
+
+commit fe9f553860a3fdb9a6d3797932649f04337c0358
+Author: Jason Stephenson <jason at sigio.com>
+Date: Thu Aug 25 17:30:40 2016 -0400
+
+ Update Perl version for 2.9.7
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS.pm
+
+commit 6dcc2f94e1d63a0d962d10613b8970cac6e9c3f6
+Author: Jason Stephenson <jason at sigio.com>
+Date: Thu Aug 25 17:29:12 2016 -0400
+
+ Docs: Add Additional 2.9.7 Acknowledgments for Testing/Signoff
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+3 0 docs/RELEASE_NOTES_2_9.txt
+
+commit f36ae97ce82ff43d4c64da6baa9d564cdea6dae3
+Author: Jason Stephenson <jason at sigio.com>
+Date: Thu Aug 25 17:26:19 2016 -0400
+
+ Docs: Adding 2.9.7 Release Notes
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+49 0 docs/RELEASE_NOTES_2_9.txt
+
+commit 6a4174d57251bd1ff2da540495bacd0888310cc7
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Aug 25 14:03:38 2016 -0400
+
+ LP#1617017: make another TPAC string translatable
+
+ "Export List" in hold_history.tt2
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+1 1 Open-ILS/src/templates/opac/myopac/hold_history.tt2
+
+commit 1dbcfbb474cf7f1e3defd3fdfb5bbf1e1f747ba0
+Author: blake <blake at mobiusconsortium.org>
+Date: Thu Jun 30 15:41:35 2016 -0500
+
+ LP1496556 Claimed never checked out count not increased when applied to LOST circulation
+
+ Bug within the Lost copy status checkin block. Needed to set the stop_fines
+
+ Signed-off-by: blake <blake at mobiusconsortium.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+3 0 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+
+commit 00c0947e565c7406bd4d912bf8595c2f0d7b6365
+Author: Jason Stephenson <jason at sigio.com>
+Date: Thu Aug 25 11:57:42 2016 -0400
+
+ LP#1613709: Make DOB validation alert failure translatable.
+
+ The alert message about an invalid DOB being entered in the OPAC
+ patron registration is not translatable. The solution, suggested by
+ Eva Cerninakova, is to wrap the string in the l() template function to
+ make it so. That is what this branch does.
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+
+1 1 Open-ILS/src/templates/opac/parts/js.tt2
+
+commit 29f7062f310e80ebf2c551b50588b4d1eef8020d
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Aug 25 11:11:00 2016 -0400
+
+ LP#1616882: mark another string as translateable
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+1 1 Open-ILS/src/templates/opac/parts/myopac/base.tt2
+
+commit 777da634e11c2c149c6a3fc98ac3e0234bf8021a
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Thu Aug 25 11:05:25 2016 -0400
+
+ LP#1616882: mark string as translateable
+
+ This patch makes the "Branch relationship" string in TPAC
+ available to be translated.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+1 1 Open-ILS/src/templates/opac/parts/library/core_info.tt2
+
+commit 1295e37ab87534651f8ef10908a211c168bf17cb
+Author: Jason Stephenson <jason at sigio.com>
+Date: Mon May 30 13:01:45 2016 -0400
+
+ LP 1583608: The make_release script always makes a db upgrade script.
+
+ Alter make_release to always create a db upgrade script, even when no
+ actual db upgrades need to be applied. The minimal script created
+ will at least set the upgrade version in config.upgrade_log.
+
+ Signed-off-by: Jason Stephenson <jason at sigio.com>
+
+2 2 build/tools/make_release
+
+commit 1f0705f065b3bd18c753479bca00421505f6f815
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Sat Aug 20 01:39:09 2016 -0400
+
+ LP#1612364: Add transparency to some format icons
+
+ Some format icons had a white background instead of a transparent one. The
+ transparent ones will look better in the My Account screens, where the icons
+ site on a gray background.
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+- - Open-ILS/web/images/format_icons/icon_format/cd.png
+- - Open-ILS/web/images/format_icons/icon_format/cdmusic.png
+- - Open-ILS/web/images/format_icons/icon_format/dvd.png
+- - Open-ILS/web/images/format_icons/icon_format/eaudio.png
+- - Open-ILS/web/images/format_icons/icon_format/ebook.png
+- - Open-ILS/web/images/format_icons/icon_format/evideo.png
+- - Open-ILS/web/images/format_icons/icon_format/kit.png
+- - Open-ILS/web/images/format_icons/icon_format/map.png
+- - Open-ILS/web/images/format_icons/icon_format/microform.png
+- - Open-ILS/web/images/format_icons/icon_format/music.png
+- - Open-ILS/web/images/format_icons/icon_format/phonomusic.png
+- - Open-ILS/web/images/format_icons/icon_format/score.png
+- - Open-ILS/web/images/format_icons/icon_format/vhs.png
+
+commit 56f99a97820cfe4788ef5333a9392dbc31958204
+Author: Mike Rylander <mrylander at gmail.com>
+Date: Wed Aug 24 08:11:11 2016 -0400
+
+ LP#1306666: Rename test file
+
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+0 423 Open-ILS/src/perlmods/live_t/17-lp1306666-abort-transit-copy-status.t
+423 0 Open-ILS/src/perlmods/live_t/19-lp1306666-abort-transit-copy-status.t
+ delete mode 100644 Open-ILS/src/perlmods/live_t/17-lp1306666-abort-transit-copy-status.t
+ create mode 100644 Open-ILS/src/perlmods/live_t/19-lp1306666-abort-transit-copy-status.t
+
+commit 3b05cbdebb2507508a5b980590b476849c5d79d0
+Author: Jason Stephenson <jstephenson at mvlcstaff.org>
+Date: Mon Mar 28 15:34:32 2016 -0400
+
+ LP 1306666: Add Perl tests for new behavior.
+
+ These tests check that the copy status is correct after aborting
+ transits dependent upon the status of the copy. More tests could be
+ added to cover more situations, but these tests cover the basics.
+
+ Signed-off-by: Jason Stephenson <jstephenson at mvlcstaff.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+423 0 Open-ILS/src/perlmods/live_t/17-lp1306666-abort-transit-copy-status.t
+ create mode 100644 Open-ILS/src/perlmods/live_t/17-lp1306666-abort-transit-copy-status.t
+
+commit 4249b4d5f65ca0a98e3e5b1b974fc96853515e47
+Author: Jason Stephenson <jstephenson at mvlcstaff.org>
+Date: Fri Mar 18 16:38:33 2016 -0400
+
+ LP 1306666: Abort Transit Only Change Copy Status if In Transit
+
+ When aborting a transit, the copy status is presently changed, either
+ to the status stored in action.transit_copy or to Reshelving if the
+ transit was for a hold. This causes problems with "hanging" transits
+ where something was not handled properly before. We've had cases
+ where a transit sticks around on a copy that is later checked out, and
+ while that copy is checked out, the transit is aborted, thus setting
+ the copy status to Reshelving when it should be Checked Out.
+
+ The code change in this branch only changes the copy's status if it is
+ In Transit. A copy in any other status has its status left untouched.
+
+ Signed-off-by: Jason Stephenson <jstephenson at mvlcstaff.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+14 10 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
+
+commit 9516f19afd7e686c4dffa137d90c1afa76c5c372
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Aug 24 11:41:57 2016 -0400
+
+ LP#1205492: fix crash when attempting to renew deposit & rental loans in OPAC
+
+ This patch fixes a bug where attempting to renew a loan on an item
+ that requires a deposit or a rental fee can cause an Apache
+ internal server error.
+
+ In particular, this patch supplies descriptions for the following
+ events:
+
+ ITEM_DEPOSIT_REQUIRED
+ ITEM_RENTAL_FEE_REQUIRED
+ ITEM_DEPOSIT_PAID
+
+ It also normalizes how 'fail_part' is set in the renewal response,
+ as the payload of an event returned when a renewal fails can
+ be either a hash or an acp Fieldmapper object depending on the
+ type of event. In the former case, attempting to access an
+ nonexistent ->fail_part method is what causes the crash.
+
+ To test
+ -------
+ [1] Create an item that requires a deposit or a rental fee
+ and check it out.
+ [2] Attempt to renew the loan in the public catalog. Note
+ that an internal server error is returned.
+ [3] Apply the patch and attept step 2 again. This time, the
+ public catalog should display a notification to the patron
+ that the renewal cannot take place, rather than crashing.
+ [4] Set up other situations where a renewal should fail for
+ reasons other than a deposit/rental fee being required. Verify
+ that appropriate error messages are displayed in the public
+ catalog.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+3 3 Open-ILS/src/extras/ils_events.xml
+9 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+2 2 Open-ILS/src/templates/opac/myopac/circs.tt2
+
+commit 9e2afb458bd823cb43c81f4deec773f8f74a4b57
+Author: Jim Keenan <jkeenan at cwmars.org>
+Date: Fri Aug 12 14:51:28 2016 -0400
+
+ lp1592934 removed lines referencing edition fields 534 and 775. These fields refer to other, different editions of the work and not to the work actually being returned.
+
+ Signed-off-by: Jim Keenan <jkeenan at cwmars.org>
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+
+1 3 Open-ILS/src/templates/opac/parts/misc_util.tt2
+
+commit 67d75ee9aac226a45dcd29bbe4ede79abf2996cc
+Author: Galen Charlton <gmc at esilibrary.com>
+Date: Wed Aug 10 10:26:06 2016 -0400
+
+ LP#1609556: (follow-up) restore previous 852$d output
+
+ The previous patch had a side-effect of changing the 852$d
+ value from the circ library's shortname to its long name. This
+ patch restores the previous behavior.
+
+ Signed-off-by: Galen Charlton <gmc at esilibrary.com>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+1 1 Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm
+
+commit cf94ae1a9bbcd1c475f1bc7f9f4a573cc762f2f0
+Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
+Date: Wed Jul 27 14:00:28 2016 -0700
+
+ LP#1609556: use unapi functions to retrieve holdings for SRU/Z39.50
+
+ Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+68 34 Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm
+
+commit d9b51cda4c5e7fd9a318826da68bdf0fa9fb56f5
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date: Thu Aug 4 10:37:17 2016 -0400
+
+ Delay Novelist loading slightly
+
+ So that if Novelist holds things up other JavaScript, like staff client calls,
+ are not delayed due to Novelist issues.
+
+ Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+2 1 Open-ILS/src/templates/opac/parts/acjs.tt2
+
+commit 84fbdf33a8d53750d21356a7ffe7cea05c3f7196
+Author: Thomas Berezansky <tsbere at mvlc.org>
+Date: Mon Mar 28 11:03:59 2016 -0400
+
+ LP1559281: Allow Baker and Taylor Fake ISBNs
+
+ For Content Cafe, jam two B&T entrys into the hash so that Business::ISBN
+ doesn't register them as invalid prefix ISBNs.
+
+ B&T uses internal ISBN's with country codes 630 and 631 for materials
+ ordered through them when no assigned ISBN exists. The ContentCafe
+ added content service knows about these ISBNs, but they are not generally
+ used by other providers.
+
+ To Test: This only works if you are using the ContentCafe added content provider.
+
+ - Before Patch -
+ 1. Add the isbn 9786315820243 as the only isbn on a record. Remove UPCs also..
+ 2. Clear the added content cache by restarting memcached or using the staff link.
+ 3. View record in catalog and you should see no cover art.
+
+ - After Patch -
+ 1. Clear the added content cache.
+ 2. View the record in the catalog and you should now see cover art for the title
+ "Video games: the movie"
+
+ Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
+ Signed-off-by: Josh Stompro <stomproj at larl.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+4 0 Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent/ContentCafe.pm
+
+commit bf8154d907f5923b40324b465d9cc28a65012942
+Author: Kathy Lussier <klussier at masslnc.org>
+Date: Thu May 19 13:27:11 2016 -0400
+
+ LP#1424656: Fix grammatical error in My Account holds screen
+
+ Changes the holds queue position string from 'x hold on y copies' to 'Hold #x on
+ y copies', which is gramatically correct.
+
+ Signed-off-by: Kathy Lussier <klussier at masslnc.org>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+1 1 Open-ILS/src/templates/opac/parts/hold_status.tt2
+
+commit 64aac0ec7cb25112c4f05903c2ebef1715f49532
+Author: Jason Boyer <jboyer1 at library.in.gov>
+Date: Fri Aug 14 11:26:54 2015 -0400
+
+ LP 1481441: Improve Hold Failure Messages
+
+ Rearranging the order of the various sources of hold
+ failure messages makes it less likely to see spurious
+ "Item is too new to transit this far" messages. Now
+ errors due to excessive fines or number of existing
+ holds.
+
+ Signed-off-by: Jason Boyer <jboyer at library.in.gov>
+ Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+ Conflicts:
+ Open-ILS/src/templates/opac/parts/place_hold_result.tt2
+
+1 1 Open-ILS/src/templates/opac/parts/place_hold_result.tt2
+
+commit 61cb9fad1d6648b7fad32d58f6a5c94b827b10e7
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Mon Aug 1 18:09:04 2016 -0400
+
+ LP#1608711: Update schema.org property name from "seller" to "offeredBy"
+
+ Per the 2015-11-05 release of schema.org
+ (http://schema.org/docs/releases.html#v2.2), the "offeredBy" property is now
+ the preferred property to use for non-commercial entities (such as libraries)
+ making an offer of an item for borrowing, sale, etc.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+ Signed-off-by: Ben Shum <ben at evergreener.net>
+
+1 1 Open-ILS/src/templates/opac/parts/library_name_link.tt2
+
+commit 017a05cfc9ffeb214d6ee2de0b420e061d9735e0
+Author: Remington Steed <rjs7 at calvin.edu>
+Date: Fri Jul 8 10:32:05 2016 -0400
+
+ Docs: Small syntax fix, formatting improvements
+
+ This commit fixes a small AsciiDoc syntax bug caused by a real '_' that
+ accidentally closed the '_' italics tag. This block of documentation
+ will now more closely match the identical content found in
+ 'admin/template_toolkit.txt' (chapter labeled "TPac Configuration and
+ Customization").
+
+ Signed-off-by: Remington Steed <rjs7 at calvin.edu>
+
+5 5 docs/admin_initial_setup/designing_your_catalog.txt
+
+commit ca9a3646070bb73f28e9a39b96f9de7961621674
+Author: Yamil Suarez <yamil at yamil.com>
+Date: Sun Jun 26 12:52:43 2016 -0400
+
+ Docs: Add tip for using "temp" as a login_types when using "Change Operator: New"
+
+ Signed-off-by: Yamil Suarez <yamil at yamil.com>
+
+4 0 docs/admin/authentication_proxy.txt
+
+commit 46afbbc822384758645244d359849d72800bac29
+Author: Jason Stephenson <jstephenson at mvlcstaff.org>
+Date: Wed Jun 15 15:08:53 2016 -0400
+
+ Add 2.9.5 to 2.9.6 upgrade script.
+
+ Signed-off-by: Jason Stephenson <jstephenson at mvlcstaff.org>
+
+11 0 Open-ILS/src/sql/Pg/version-upgrade/2.9.5-2.9.6-upgrade-db.sql
+ create mode 100644 Open-ILS/src/sql/Pg/version-upgrade/2.9.5-2.9.6-upgrade-db.sql
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index d750216..58e5ec0 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
@@ -7,7 +7,7 @@ use OpenILS::Utils::Fieldmapper;
sub ils_version {
# version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0
# For branches, format is "x-y"
- return "HEAD";
+ return "2-9-7";
}
__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 8702f24..7d21d5a 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,6 +92,7 @@ CREATE TRIGGER no_overlapping_deps
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0981', :eg_version); -- gmcharlt/jlundgren/kmlussier
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.9.7', :eg_version);
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.9.6-2.9.7-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.9.6-2.9.7-upgrade-db.sql
new file mode 100644
index 0000000..ce52d99
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.9.6-2.9.7-upgrade-db.sql
@@ -0,0 +1,5 @@
+--Upgrade Script for 2.9.6 to 2.9.7
+\set eg_version '''2.9.7'''
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.9.7', :eg_version);
+COMMIT;
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html
index dd10653..ed04ebc 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 @@
<html><head><script></script></head><body onload="var x = document.getElementById('version'); var version ='/xul/server/'.split(/\//)[2]; if (version == 'server') { version = 'versionless debug build'; } x.appendChild(document.createTextNode(version));">
<h1 style="text-decoration: underline">Evergreen</h1>
<p>Target Server ID: <span id="version"></span></p>
-<p>$HeadURL$</p>
+<p>http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_9_7</p>
<h2>What is Evergreen?</h2>
<blockquote>
<p>
diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
index 0613a13..6fea08c 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_2_9_7");
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 a954357..285d0fd 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.9"
!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 b57451a..0000000
--- 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 0000000..7ca0807
--- /dev/null
+++ b/README
@@ -0,0 +1,633 @@
+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/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**: Version 9.3 is recommended. The minimum supported version
+ is 9.1.
+ * **Linux**: Evergreen 2.9 has been tested on Debian Jessie (8.0),
+ Debian Wheezy (7.0), Ubuntu Trusty Tahr (14.04),
+ Ubuntu Precise Pangolin (12.04), and Fedora.
+ 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, Ubuntu or Fedora websites.
+ * **OpenSRF**: The minimum supported version of OpenSRF is 2.4.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 (2.4.0 or later).
+ You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/
+2. On some distributions, it is necessary to install PostgreSQL 9.1+ from external
+ repositories.
++
+ * Debian Wheezy and Jessie Ubuntu Precise and Trusty comes with
+ PostgreSQL 9.1+, so no additional steps are required.
+ * Fedora 19 and 20 come with PostgreSQL 9.2+, 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-jessie`, `debian-wheezy`, `fedora`,
+ `ubuntu-trusty`, or `ubuntu-precise` for <osname> below:
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>
+------------------------------------------------------------------------------
++
+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, Trusty or Debian Jessie. The ubuntu
+and Debian Jessie targets use libdbd-pgsql from packages.
++
+.Debian Wheezy
+[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
+------------------------------------------------------------------------------
+
+6. OPTIONAL: Developer additions
++
+To perform certain developer tasks from a Git source code checkout,
+additional packages may be required. As the *root* Linux account:
++
+ * To install packages needed for retriving and managing web dependencies,
+ use the <osname>-developer Makefile.install target. Currently,
+ this is only needed for building and installing the (preview) browser
+ staff client.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-developer
+------------------------------------------------------------------------------
++
+ * To install packages required for building Evergreen release bundles, use
+ the <osname>-packager Makefile.install target.
++
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install <osname>-packager
+------------------------------------------------------------------------------
+
+Configuration and compilation instructions
+------------------------------------------
+
+For the time being, we are still installing everything in the `/openils/`
+directory. From the Evergreen source directory, issue the following commands as
+the *user* Linux account to configure and build Evergreen:
+
+[source, bash]
+------------------------------------------------------------------------------
+PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
+make
+------------------------------------------------------------------------------
+
+These instructions assume that you have also installed OpenSRF under `/openils/`.
+If not, please adjust PATH as needed so that the Evergreen `configure` script
+can find `osrf_config`.
+
+Installation instructions
+-------------------------
+
+1. Once you have configured and compiled Evergreen, issue the following
+ command as the *root* Linux account to install Evergreen, build the server
+ portion of the staff client, and copy example configuration files to
+ `/openils/conf`.
+ Change the value of the `STAFF_CLIENT_STAMP_ID` variable to match the version
+ of the staff client that you will use to connect to the Evergreen server.
++
+[source, bash]
+------------------------------------------------------------------------------
+make STAFF_CLIENT_STAMP_ID=rel_2_9_7 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
+------------------------------------------------------------------------------
+
+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
+-------------------------------
+
+1. Use the example configuration files in `Open-ILS/examples/apache/` (for
+Apache versions below 2.4) or `Open-ILS/examples/apache_24/` (for Apache
+versions 2.4 or greater) to configure your Web server for the Evergreen
+catalog, staff client, Web services, and administration interfaces. Issue the
+following commands as the *root* Linux account:
++
+.Debian Wheezy and Ubuntu Precise
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/
+cp Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/
+cp Open-ILS/examples/apache/eg_startup /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------
++
+.Ubuntu Trusty and Debian Jessie
+[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/eg_startup /etc/apache2/
+# Now set up SSL
+mkdir /etc/apache2/ssl
+cd /etc/apache2/ssl
+------------------------------------------------------------------------------------
++
+.Fedora
+[source,bash]
+------------------------------------------------------------------------------
+cp Open-ILS/examples/apache_24/eg_24.conf /etc/httpd/conf.d/
+cp Open-ILS/examples/apache_24/eg_vhost_24.conf /etc/httpd/eg_vhost.conf
+cp Open-ILS/examples/apache/eg_startup /etc/httpd/
+# Now set up SSL
+mkdir /etc/httpd/ssl
+cd /etc/httpd/ssl
+------------------------------------------------------------------------------
++
+2. The `openssl` command cuts a new SSL key for your Apache server. For a
+production server, you should purchase a signed SSL certificate, but you can
+just use a self-signed certificate and accept the warnings in the staff client
+and browser during testing and development. Create an SSL key for the Apache
+server by issuing the following command as the *root* Linux account:
++
+[source,bash]
+------------------------------------------------------------------------------
+openssl req -new -x509 -days 365 -nodes -out server.crt -keyout server.key
+------------------------------------------------------------------------------
++
+3. As the *root* Linux account, edit the `eg.conf` file that you copied into
+place.
+ a. To enable access to the offline upload / execute interface from any
+ workstation on any network, make the following change (and note that
+ you *must* secure this for a production instance):
+ * (Apache 2.2): Replace `Allow from 10.0.0.0/8` with `Allow from all`
+ * (Apache 2.4): Replace `Require host 10.0.0.0/8` with `Require all granted`
+ b. (Fedora): Change references from the non-existent `/etc/apache2/` directory
+ to `/etc/httpd/`.
+4. Change the user for the Apache server.
+ * (Debian and Ubuntu): As the *root* Linux account, edit
+ `/etc/apache2/envvars`. Change `export APACHE_RUN_USER=www-data` to
+ `export APACHE_RUN_USER=opensrf`.
+ * (Fedora): As the *root* Linux account , edit `/etc/httpd/conf/httpd.conf`.
+ Change `User apache` to `User opensrf`.
+5. Configure Apache with performance settings appropriate for Evergreen:
+ * (Debian and Ubuntu): As the *root* Linux account, edit
+ `/etc/apache2/apache2.conf`:
+ * (Fedora): As the *root* Linux account, edit `/etc/httpd/conf/httpd.conf`:
+ a. Change `KeepAliveTimeout` to `1`. Higher values reduce the chance of
+ a request timing out unexpectedly, but increase the risk of using up
+ all available Apache child processes.
+ b. 'Optional': Change `MaxKeepAliveRequests` to `100`
+ c. (Debian Wheezy, Ubuntu Precise, and Fedora) Update the prefork configuration
+ section to suit your environment. The following settings apply to a busy
+ system:
++
+[source,bash]
+------------------------------------------------------------------------------
+<IfModule mpm_prefork_module>
+ StartServers 20
+ MinSpareServers 5
+ MaxSpareServers 15
+ MaxClients 150
+ MaxRequestsPerChild 10000
+</IfModule>
+------------------------------------------------------------------------------
+ d. (Ubuntu Trusty, Debian Jessie) As the *root* user, edit
+ /etc/apache2/mods-available/mpm_prefork.conf to match the above values.
+ Then, also as the *root* user, enable the mpm_prefork module by doing:
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dismod mpm_event
+a2enmod mpm_prefork
+------------------------------------------------------------------------------
++
+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 Wheezy and Ubuntu Precise): 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
+------------------------------------------------------------------------------
++
+(Ubuntu Trusty, Debian Jessie):
++
+[source,bash]
+------------------------------------------------------------------------------
+a2dissite 000-default # OPTIONAL: disable the default site (the "It Works" page)
+a2ensite eg.conf
+------------------------------------------------------------------------------
++
+8. (Ubuntu): 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
+------------------------------------------------------------------------------
++
+9. Learn more about additional Apache options in the following sections:
+ * <<_apache_rewrite_tricks,Apache Rewrite Tricks>>
+ * <<_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 the following section, sets the database
+connection information in `opensrf.xml` for you.
+
+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:
+
+.(Debian / Ubuntu / Fedora) 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-<OSTYPE>'. Choose the most appropriate
+command below based on your operating system.
+
+[source, bash]
+------------------------------------------------------------------------------
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-jessie
+make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-precise
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-trusty
+make -f Open-ILS/src/extras/Makefile.install postgres-server-fedora
+------------------------------------------------------------------------------
+
+.(Fedora) Postgres initialization
+
+Installing Postgres on Fedora also requires you to initialize the PostgreSQL
+cluster and start the service. Issue the following commands as the *root* user:
+
+[source, bash]
+------------------------------------------------------------------------------
+postgresql-setup initdb
+systemctl start postgresql
+------------------------------------------------------------------------------
+
+For a standalone PostgreSQL server, install the following Perl modules for your
+distribution as the *root* Linux account:
+
+.(Ubuntu Precise)
+[source,bash]
+---------------------------------------------------------------------------------
+cpan Rose::URI
+---------------------------------------------------------------------------------
+
+.(Debian "wheezy" and Ubuntu Trusty)
+No extra modules required for these distributions.
+
+.(Fedora)
+[source, bash]
+------------------------------------------------------------------------------
+cpan Rose::URI
+------------------------------------------------------------------------------
+
+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, and in
+the `/var/lib/pgsql/data/` directory on Fedora. 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 <user>, <password>,
+<hostname>, <port>, and <dbname> with the appropriate values for your
+PostgreSQL database (where <user> and <password> are for the *evergreen*
+PostgreSQL account you just created), and replace <admin-user> and <admin-pass>
+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 <user> --password <password> --hostname <hostname> --port <port> \
+ --database <dbname> --admin-user <admin-user> --admin-pass <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.1 and later
+^^^^^^^^^^^^^^^^^^^^^^^^
+To create the database instance on a remote database server running PostgreSQL
+9.1 or later, simply use the `--create-database` flag on `eg_db_config`.
+
+Starting Evergreen
+------------------
+1. As the *root* Linux account, start the `memcached` and `ejabberd` services
+(if they aren't already running):
++
+[source, bash]
+------------------------------------------------------------------------------
+/etc/init.d/ejabberd start
+/etc/init.d/memcached start
+------------------------------------------------------------------------------
++
+2. As the *opensrf* Linux account, start Evergreen. The `-l` flag in the
+following command is only necessary if you want to force Evergreen to treat the
+hostname as `localhost`; if you configured `opensrf.xml` using the real
+hostname of your machine as returned by `perl -ENet::Domain 'print
+Net::Domain::hostfqdn() . "\n";'`, you should not use the `-l` flag.
++
+[source, bash]
+------------------------------------------------------------------------------
+osrf_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 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 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 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 <admin-user> <admin-pass>
+------------------------------------------------------------------------------
+
+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 585ab00..d21ceaa 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 at list.georgialibraries.org)
-AM_INIT_AUTOMAKE([OpenILS], [trunk])
+AC_INIT(Open-ILS, 2.9.7, open-ils-dev at list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [2.9.7])
AC_REVISION($Revision: 0.1 $)
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar])
commit 4e9814fdc877b926bc377753013aee893062e17b
Author: Jason Stephenson <jason at sigio.com>
Date: Thu Aug 25 17:37:12 2016 -0400
Update server upgrade instructions for 2.9.7.
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/docs/installation/server_upgrade.txt b/docs/installation/server_upgrade.txt
index 04cad5e..f586aba 100644
--- a/docs/installation/server_upgrade.txt
+++ b/docs/installation/server_upgrade.txt
@@ -48,8 +48,8 @@ the http://evergreen-ils.org/opensrf-downloads/[OpenSRF download page].
+
[source, bash]
-----------------------------------------------
-wget http://evergreen-ils.org/downloads/Evergreen-ILS-2.9.6.tar.gz
-tar xzf Evergreen-ILS-2.9.6.tar.gz
+wget http://evergreen-ils.org/downloads/Evergreen-ILS-2.9.7.tar.gz
+tar xzf Evergreen-ILS-2.9.7.tar.gz
-----------------------------------------------
+
[NOTE]
@@ -59,7 +59,7 @@ For the latest edition of Evergreen, check the http://evergreen-ils.org/egdownlo
+
[source, bash]
---------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.9.6
+cd /home/opensrf/Evergreen-ILS-2.9.7
---------------------------------------------
+
On the next command, replace `[distribution]` with one of these values for your
@@ -84,7 +84,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution]
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.9.6
+cd /home/opensrf/Evergreen-ILS-2.9.7
PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
make
------------------------------------------------------------
@@ -95,8 +95,8 @@ These instructions assume that you have also installed OpenSRF under /openils/.
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.9.6
-make STAFF_CLIENT_STAMP_ID=rel_2_9_6 install
+cd /home/opensrf/Evergreen-ILS-2.9.7
+make STAFF_CLIENT_STAMP_ID=rel_2_9_7 install
------------------------------------------------------------
+
. As the *root* user, change all files to be owned by the opensrf user and group:
@@ -112,7 +112,7 @@ chown -R opensrf:opensrf /openils
-----------------------------------------------------------
cd /openils/var/web/xul/
rm server
-ln -sf rel_2_9_6/server server
+ln -sf rel_2_9_7/server server
----------------------------------------------------------
+
. As the *opensrf* user, update opensrf_core.xml and opensrf.xml by copying the
@@ -132,7 +132,7 @@ Copying these configuration files will remove any customizations you have made t
+
[source, bash]
-------------------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.9.6
+cd /home/opensrf/Evergreen-ILS-2.9.7
perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \
--create-offline --database evergreen --host localhost --user evergreen --password evergreen
-------------------------------------------------------------------------
@@ -156,21 +156,21 @@ The diff command can be used to show the differences between the distribution ve
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.9.6/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
+cp /home/opensrf/Evergreen-ILS-2.9.7/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-2.9.6/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
+cp /home/opensrf/Evergreen-ILS-2.9.7/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-2.9.6/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
+cp /home/opensrf/Evergreen-ILS-2.9.7/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
----------------------------------------------------------
Upgrade the Evergreen database schema
@@ -193,7 +193,7 @@ anything goes wrong during the upgrade.
=============
Evergreen provides incremental upgrade scripts that allow you to upgrade
from one minor version to the next until you have the current version of
-the schema. For example, if you want to upgrade from 2.5.1 to 2.9.6, you
+the schema. For example, if you want to upgrade from 2.5.1 to 2.9.7, you
would run the following upgrade scripts:
- 2.5.1-2.5.2-upgrade-db.sql
@@ -217,13 +217,14 @@ would run the following upgrade scripts:
- 2.9.3-2.9.4-upgrade-db.sql
- 2.9.4-2.9.5-upgrade-db.sql
- 2.9.5-2.9.6-upgrade-db.sql
+- 2.9.6-2.9.7-upgrade-db.sql
Note that you do *not* want to run additional 2.5 scripts to upgrade to the
newest version of 2.5, since currently there is no automated way to upgrade
from 2.5.4+ to 2.6. Only upgrade as far as necessary to reach the major
version upgrade script (in this example, as far as 2.5.3).
-To upgrade across multiple major versions (e.g. from 2.3.0 to 2.9.6), use
+To upgrade across multiple major versions (e.g. from 2.3.0 to 2.9.7), use
the same logic to utilize the provided major version upgrade scripts. For
example:
@@ -239,7 +240,7 @@ example:
- 2.7.4-2.8.0-upgrade-db.sql
- (run all incremental scripts from 2.8.0 to 2.8.4)
- 2.8.4-2.9.0-upgrade-db.sql
-- (run all incremental scripts from 2.9.0 to 2.9.6)
+- (run all incremental scripts from 2.9.0 to 2.9.7)
=============
[CAUTION]
@@ -253,8 +254,8 @@ as a user with the ability to connect to the database server.
[source, bash]
----------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.9.6/Open-ILS/src/sql/Pg
-psql -U evergreen -h localhost -f version-upgrade/2.9.5-2.9.6-upgrade-db.sql evergreen
+cd /home/opensrf/Evergreen-ILS-2.9.7/Open-ILS/src/sql/Pg
+psql -U evergreen -h localhost -f version-upgrade/2.9.6-2.9.7-upgrade-db.sql evergreen
----------------------------------------------------------
[TIP]
commit fe9f553860a3fdb9a6d3797932649f04337c0358
Author: Jason Stephenson <jason at sigio.com>
Date: Thu Aug 25 17:30:40 2016 -0400
Update Perl version for 2.9.7
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS.pm b/Open-ILS/src/perlmods/lib/OpenILS.pm
index a099119..97ffe20 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.09';
+our $VERSION = '2.0907';
1;
-----------------------------------------------------------------------
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list