[open-ils-commits] [GIT] Evergreen ILS branch master updated. 1dc77fa6a84189758826907ea6324418179543d0
Evergreen Git
git at git.evergreen-ils.org
Wed Feb 4 13:17:52 EST 2015
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, master has been updated
via 1dc77fa6a84189758826907ea6324418179543d0 (commit)
via 7331f82cff9ca991d8f1d92fc385882b8c7393a9 (commit)
via b671b65b636826b2a257bb06caa5705e37c3df30 (commit)
via 3c7bd0b1b9edd1600f0db9bfff2bd14cc36a0301 (commit)
via 0d739dab32cf7e4d464f651685cb801ce4f1ec2e (commit)
via d0f2c79594e4e8d829a9e902a89d2d0c7ce56922 (commit)
via 26c91e4b75d181b7c064b78a2ddfe7f86d27ddb1 (commit)
from f5436da47ef6d06716a27e44e56067f8572f336e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1dc77fa6a84189758826907ea6324418179543d0
Author: Ben Shum <bshum at biblio.org>
Date: Wed Feb 4 13:10:50 2015 -0500
LP#1390138: Clarify 2.6-2.7 upgrade path
The file for upgrading from 2.6 to 2.7 series changed to be specifically
2.6.3-2.7.0 (not just 2.6 to 2.7.0 but 2.6.3 to 2.7.0).
Additionally, alter note on reingesting to include that it might be required
post upgrade script running.
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/docs/installation/server_upgrade.txt b/docs/installation/server_upgrade.txt
index d02aad7..302a23c 100644
--- a/docs/installation/server_upgrade.txt
+++ b/docs/installation/server_upgrade.txt
@@ -200,8 +200,8 @@ would run the following upgrade scripts:
- 2.5.1-2.5.2-upgrade-db.sql
- 2.5.2-2.5.3-upgrade-db.sql
- 2.5.3-2.6.0-upgrade-db.sql (this is a major version upgrade)
-- 2.6.2-2.6.3-upgrade-db.sql (there was one update missed in the 2.6-2.7.0 script, this is needed)
-- 2.6-2.7.0-upgrade-db.sql (this is a major version upgrade)
+- 2.6.2-2.6.3-upgrade-db.sql
+- 2.6.3-2.7.0-upgrade-db.sql (this is a major version upgrade)
- 2.7.0-2.7.1-upgrade-db.sql
- 2.7.1-2.7.2-upgrade-db.sql
- 2.7.2-2.7.3-upgrade-db.sql
@@ -221,11 +221,9 @@ example:
- 2.4.3-2.5.0-upgrade-db.sql
- (run all incremental scripts from 2.5.0 to 2.5.3)
- 2.5.3-2.6.0-upgrade-db.sql
-- 2.6.2-2.6.3-upgrade-db.sql (This is an exception to the pattern that needs to be run before 2.6-2.7.0)
-- 2.6-2.7.0-upgrade-db.sql
-- 2.7.0-2.7.1-upgrade-db.sql
-- 2.7.1-2.7.2-upgrade-db.sql
-- 2.7.2-2.7.3-upgrade-db.sql
+- (run all incremental scripts from 2.6.0 to 2.6.3)
+- 2.6.3-2.7.0-upgrade-db.sql
+- (run all incremental scripts from 2.7.0 to 2.7.3)
=============
[CAUTION]
@@ -240,11 +238,11 @@ as a user with the ability to connect to the database server.
[source, bash]
----------------------------------------------------------
cd /home/opensrf/Evergreen-ILS-2.7.3/Open-ILS/src/sql/Pg
-psql -U evergreen -h localhost -f version-upgrade/2.6-2.7.0-upgrade-db.sql evergreen
+psql -U evergreen -h localhost -f version-upgrade/2.6.3-2.7.0-upgrade-db.sql evergreen
----------------------------------------------------------
[TIP]
-After the `2.5.3-2.6.0-upgrade-db.sql` script finishes, you will see a
+After the some database upgrade scripts finish, you may see a
note on how to reingest your bib records. You may run this after you have
completed the entire upgrade and tested your system. Reingesting records
may take a long time depending on the number of bib records in your system.
commit 7331f82cff9ca991d8f1d92fc385882b8c7393a9
Author: Ben Shum <bshum at biblio.org>
Date: Wed Feb 4 12:59:23 2015 -0500
LP#1390138: Remove references to Ubuntu Lucid Lynx 10.04 as this is not supported
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index f8db66b..e99aa4f 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -58,7 +58,7 @@ Installing prerequisites
is 9.1.
* **Linux**: Evergreen 2.7 has been tested on Debian Jessie (8.0),
Debian Wheezy (7.0), Debian Squeeze(6.0), Ubuntu Trusty Tahr (14.04),
- Ubuntu Precise Pangolin (12.04), Ubuntu Lucid Lynx (10.04) and Fedora.
+ 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.
diff --git a/docs/installation/server_upgrade.txt b/docs/installation/server_upgrade.txt
index 65d07b8..d02aad7 100644
--- a/docs/installation/server_upgrade.txt
+++ b/docs/installation/server_upgrade.txt
@@ -10,7 +10,7 @@ Software Prerequisites
is 9.1.
* **Linux**: Evergreen 2.7 has been tested on Debian Jessie (8.0),
Debian Wheezy (7.0), Debian Squeeze(6.0), Ubuntu Trusty Tahr (14.04),
- Ubuntu Precise Pangolin (12.04), Ubuntu Lucid Lynx (10.04) and Fedora.
+ 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.
@@ -73,7 +73,6 @@ indexterm:[Linux, Ubuntu]
* `debian-squeeze` for Debian Squeeze (6.0)
* `ubuntu-trusty` for Ubuntu Trusty Tahr (14.04) (See https://bugs.launchpad.net/evergreen/+bug/1342227[Bug 134222] if you want to use EDI)
* `ubuntu-precise` for Ubuntu Precise Pangolin (12.04)
- * `ubuntu-lucid` for Ubuntu Lucid Lynx (10.04)
* `fedora` for Fedora
+
commit b671b65b636826b2a257bb06caa5705e37c3df30
Author: Josh Stompro <stomproj at larl.org>
Date: Tue Jan 27 11:01:12 2015 -0600
LP#1390138: Updating Upgrade and Install docs for 2.7
- Updated docs to use 2.7.3 as the base in case this gets included in 2.7.3
Signed-off-by: Josh Stompro <stomproj at larl.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/docs/installation/server_upgrade.txt b/docs/installation/server_upgrade.txt
index 04fea3b..65d07b8 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.7.1.tar.gz
-tar xzf Evergreen-ILS-2.7.1.tar.gz
+wget http://evergreen-ils.org/downloads/Evergreen-ILS-2.7.3.tar.gz
+tar xzf Evergreen-ILS-2.7.3.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.7.1
+cd /home/opensrf/Evergreen-ILS-2.7.3
---------------------------------------------
+
On the next command, replace `[distribution]` with one of these values for your
@@ -86,7 +86,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution]
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.7.1
+cd /home/opensrf/Evergreen-ILS-2.7.3
PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
make
------------------------------------------------------------
@@ -97,8 +97,8 @@ These instructions assume that you have also installed OpenSRF under /openils/.
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.7.1
-make STAFF_CLIENT_STAMP_ID=rel_2_7_1 install
+cd /home/opensrf/Evergreen-ILS-2.7.3
+make STAFF_CLIENT_STAMP_ID=rel_2_7_3 install
------------------------------------------------------------
+
. As the *root* user, change all files to be owned by the opensrf user and group:
@@ -134,7 +134,7 @@ Copying these configuration files will remove any customizations you have made t
+
[source, bash]
-------------------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.7.1
+cd /home/opensrf/Evergreen-ILS-2.7.3
perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \
--create-offline --database evergreen --host localhost --user evergreen --password evergreen
-------------------------------------------------------------------------
@@ -158,21 +158,21 @@ The diff command can be used to show the differences between the distribution ve
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.7.1/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
+cp /home/opensrf/Evergreen-ILS-2.7.3/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.7.1/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
+cp /home/opensrf/Evergreen-ILS-2.7.3/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.7.1/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
+cp /home/opensrf/Evergreen-ILS-2.7.3/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
----------------------------------------------------------
Upgrade the Evergreen database schema
@@ -195,21 +195,24 @@ 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.7.1, you
+the schema. For example, if you want to upgrade from 2.5.1 to 2.7.3, you
would run the following upgrade scripts:
- 2.5.1-2.5.2-upgrade-db.sql
- 2.5.2-2.5.3-upgrade-db.sql
- 2.5.3-2.6.0-upgrade-db.sql (this is a major version upgrade)
+- 2.6.2-2.6.3-upgrade-db.sql (there was one update missed in the 2.6-2.7.0 script, this is needed)
- 2.6-2.7.0-upgrade-db.sql (this is a major version upgrade)
- 2.7.0-2.7.1-upgrade-db.sql
+- 2.7.1-2.7.2-upgrade-db.sql
+- 2.7.2-2.7.3-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.7.1), use
+To upgrade across multiple major versions (e.g. from 2.3.0 to 2.7.3), use
the same logic to utilize the provided major version upgrade scripts. For
example:
@@ -219,8 +222,11 @@ example:
- 2.4.3-2.5.0-upgrade-db.sql
- (run all incremental scripts from 2.5.0 to 2.5.3)
- 2.5.3-2.6.0-upgrade-db.sql
+- 2.6.2-2.6.3-upgrade-db.sql (This is an exception to the pattern that needs to be run before 2.6-2.7.0)
- 2.6-2.7.0-upgrade-db.sql
- 2.7.0-2.7.1-upgrade-db.sql
+- 2.7.1-2.7.2-upgrade-db.sql
+- 2.7.2-2.7.3-upgrade-db.sql
=============
[CAUTION]
@@ -234,7 +240,7 @@ as a user with the ability to connect to the database server.
[source, bash]
----------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.7.1/Open-ILS/src/sql/Pg
+cd /home/opensrf/Evergreen-ILS-2.7.3/Open-ILS/src/sql/Pg
psql -U evergreen -h localhost -f version-upgrade/2.6-2.7.0-upgrade-db.sql evergreen
----------------------------------------------------------
commit 3c7bd0b1b9edd1600f0db9bfff2bd14cc36a0301
Author: Josh Stompro <stomproj at larl.org>
Date: Wed Nov 12 09:19:11 2014 -0600
LP#1390138: Updating Upgrade and Install docs for 2.7
Upgrade Docs
- Bolded all linux user names so the format matches the install docs.
- Added note about postgres 9.3 being recommended version and 9.1 being the minium version.
- Added Fedora to list of supported linux distros so it matches install docs.
- Added a note about the different apache config files for apache 2.4+ vs Apache 2.2.
- Added a link to troubleshooting section of install docs.
Install Docs
- Added notes about 9.3 being recommened version of postgres and 9.1 being the minimum.
- Changed opensrf version from 2.3.0 to 2.4.0
Signed-off-by: Josh Stompro <stomproj at larl.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index 3c095c6..f8db66b 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -37,7 +37,7 @@ Preamble: developer instructions
[NOTE]
Skip this section if you are using an official release tarball downloaded
-from http://evergreen-ils.org/downloads
+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
@@ -54,12 +54,23 @@ autoreconf -i
Installing prerequisites
------------------------
+ * **PostgreSQL**: Version 9.3 is recommended. The minimum supported version
+ is 9.1.
+ * **Linux**: Evergreen 2.7 has been tested on Debian Jessie (8.0),
+ Debian Wheezy (7.0), Debian Squeeze(6.0), Ubuntu Trusty Tahr (14.04),
+ Ubuntu Precise Pangolin (12.04), Ubuntu Lucid Lynx (10.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.3.0 or later).
+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 many distributions, it is necessary to install PostgreSQL 9 from external
+2. On many distributions, it is necessary to install PostgreSQL 9.1+ from external
repositories.
+
* On Debian Squeeze, open `/etc/apt/sources.list` in a text editor as the
@@ -70,8 +81,8 @@ before you can successfully configure, compile, and install Evergreen.
deb http://backports.debian.org/debian-backports squeeze-backports main contrib
------------------------------------------------------------------------------
+
- * Ubuntu Precise and Trusty comes with PostgreSQL 9+, so no additional steps are required.
- * Fedora comes with PostgreSQL 9, so no additional steps are required.
+ * 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.
@@ -190,7 +201,7 @@ Additional Instructions for Developers
[NOTE]
Skip this section if you are using an official release tarball downloaded
-from http://evergreen-ils.org/downloads
+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
@@ -595,7 +606,7 @@ You should see a result like:
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
diff --git a/docs/installation/server_upgrade.txt b/docs/installation/server_upgrade.txt
index 1ce389f..04fea3b 100644
--- a/docs/installation/server_upgrade.txt
+++ b/docs/installation/server_upgrade.txt
@@ -6,23 +6,25 @@ All of the steps in this chapter are to be completed from the command line.
Software Prerequisites
~~~~~~~~~~~~~~~~~~~~~~
- * **PostgreSQL**: Version 9.1 is recommended. The minimum supported version
+ * **PostgreSQL**: Version 9.3 is recommended. The minimum supported version
is 9.1.
- * **Linux**: Evergreen 2.7 has been tested on Debian Jessie (8.0), Debian Wheezy (7.0), Debian Squeeze (6.0),
- Ubuntu Trusty Tahr (14.04), Ubuntu Precise Pangolin (12.04) and Ubuntu Lucid Lynx (10.04). If you are
- running an older version of these distributions, you may want to upgrade
- before upgrading Evergreen. For instructions on upgrading these
- distributions, visit the Debian or Ubuntu websites.
+ * **Linux**: Evergreen 2.7 has been tested on Debian Jessie (8.0),
+ Debian Wheezy (7.0), Debian Squeeze(6.0), Ubuntu Trusty Tahr (14.04),
+ Ubuntu Precise Pangolin (12.04), Ubuntu Lucid Lynx (10.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.
-In the following instructions, you are asked to perform certain steps as either the root or opensrf user.
- * **Debian**: To become the root user, issue the `su` command and enter the password of the root user.
- * **Ubuntu**: To become the root user, issue the `sudo su` command and enter the password of your current user.
+In the following instructions, you are asked to perform certain steps as either the *root* or *opensrf* user.
-To switch from the root user to a different user, issue the `su - [user]`
+ * **Debian**: To become the *root* user, issue the `su` command and enter the password of the root user.
+ * **Ubuntu**: To become the *root* user, issue the `sudo su` command and enter the password of your current user.
+
+To switch from the *root* user to a different user, issue the `su - [user]`
command; for example, `su - opensrf`. Once you have become a non-root user, to
-become the root user again simply issue the `exit` command.
+become the *root* user again simply issue the `exit` command.
Upgrade the Evergreen code
~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -31,8 +33,8 @@ server. You must adjust these steps to accommodate your customizations such
as catalogue skins.
. Stop Evergreen and back up your data:
- .. As root, stop the Apache web server.
- .. As the opensrf user, stop all Evergreen and OpenSRF services:
+ .. As *root*, stop the Apache web server.
+ .. As the *opensrf* user, stop all Evergreen and OpenSRF services:
+
[source, bash]
-----------------------------
@@ -42,7 +44,7 @@ osrf_control --localhost --stop-all
.. Back up the /openils directory.
. Upgrade OpenSRF. Download and install the latest version of OpenSRF from
the http://evergreen-ils.org/opensrf-downloads/[OpenSRF download page].
-. As the opensrf user, download and extract Evergreen 2.7:
+. As the *opensrf* user, download and extract Evergreen 2.7:
+
[source, bash]
-----------------------------------------------
@@ -53,7 +55,7 @@ tar xzf Evergreen-ILS-2.7.1.tar.gz
[NOTE]
For the latest edition of Evergreen, check the http://evergreen-ils.org/egdownloads/[Evergreen download page] and adjust upgrading instructions accordingly.
-. As the root user, install the prerequisites:
+. As the *root* user, install the prerequisites:
+
[source, bash]
---------------------------------------------
@@ -72,6 +74,7 @@ indexterm:[Linux, Ubuntu]
* `ubuntu-trusty` for Ubuntu Trusty Tahr (14.04) (See https://bugs.launchpad.net/evergreen/+bug/1342227[Bug 134222] if you want to use EDI)
* `ubuntu-precise` for Ubuntu Precise Pangolin (12.04)
* `ubuntu-lucid` for Ubuntu Lucid Lynx (10.04)
+ * `fedora` for Fedora
+
[source, bash]
@@ -79,7 +82,7 @@ indexterm:[Linux, Ubuntu]
make -f Open-ILS/src/extras/Makefile.install [distribution]
------------------------------------------------------------
+
-. As the opensrf user, configure and compile Evergreen:
+. As the *opensrf* user, configure and compile Evergreen:
+
[source, bash]
------------------------------------------------------------
@@ -90,7 +93,7 @@ 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.
+
-. As the root user, install Evergreen:
+. As the *root* user, install Evergreen:
+
[source, bash]
------------------------------------------------------------
@@ -98,14 +101,14 @@ cd /home/opensrf/Evergreen-ILS-2.7.1
make STAFF_CLIENT_STAMP_ID=rel_2_7_1 install
------------------------------------------------------------
+
-. As the root user, change all files to be owned by the opensrf user and group:
+. As the *root* user, change all files to be owned by the opensrf user and group:
+
[source, bash]
------------------------------------------------------------
chown -R opensrf:opensrf /openils
------------------------------------------------------------
+
-. As the opensrf user, update the server symlink in /openils/var/web/xul/:
+. As the *opensrf* user, update the server symlink in /openils/var/web/xul/:
+
[source, bash]
-----------------------------------------------------------
@@ -114,7 +117,7 @@ rm server
ln -sf rel_2_7_1/server server
----------------------------------------------------------
+
-. As the opensrf user, update opensrf_core.xml and opensrf.xml by copying the
+. As the *opensrf* user, update opensrf_core.xml and opensrf.xml by copying the
new example files (/openils/conf/opensrf_core.xml.example and
/openils/conf/opensrf.xml). The _-b_ option creates a backup copy of the old file.
+
@@ -127,7 +130,7 @@ cp -b /openils/conf/opensrf.xml.example /openils/conf/opensrf.xml
[CAUTION]
Copying these configuration files will remove any customizations you have made to them. Remember to redo your customizations after copying them.
+
-. As the opensrf user, update the configuration files:
+. As the *opensrf* user, update the configuration files:
+
[source, bash]
-------------------------------------------------------------------------
@@ -136,33 +139,40 @@ perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \
--create-offline --database evergreen --host localhost --user evergreen --password evergreen
-------------------------------------------------------------------------
+
-. As the _root_ user, update the Apache files:
+. As the *root* user, update the Apache files:
+
indexterm:[Apache]
+
+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:
++
[CAUTION]
Copying these Apache configuration files will remove any customizations you have made to them. Remember to redo your customizations after copying them.
For example, if you purchased an SSL certificate, you will need to edit eg.conf to point to the appropriate SSL certificate files.
+The diff command can be used to show the differences between the distribution version and your customized version. `diff <customized file> <dist file>`
+
.. Update _/etc/apache2/eg_startup_ by copying the example from _Open-ILS/examples/apache/eg_startup_.
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.7.1/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
+cp /home/opensrf/Evergreen-ILS-2.7.1/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
----------------------------------------------------------
+
.. Update /etc/apache2/eg_vhost.conf by copying the example from Open-ILS/examples/apache/eg_vhost.conf.
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.7.1/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
+cp /home/opensrf/Evergreen-ILS-2.7.1/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
----------------------------------------------------------
+
.. Update /etc/apache2/sites-available/eg.conf by copying the example from Open-ILS/examples/apache/eg.conf.
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.7.1/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
+cp /home/opensrf/Evergreen-ILS-2.7.1/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
----------------------------------------------------------
Upgrade the Evergreen database schema
@@ -236,21 +246,21 @@ may take a long time depending on the number of bib records in your system.
Restart Evergreen and Test
~~~~~~~~~~~~~~~~~~~~~~~~~~
-. As the root user, restart memcached to clear out all old user sessions.
+. As the *root* user, restart memcached to clear out all old user sessions.
+
[source, bash]
--------------------------------------------------------------
service memcached restart
--------------------------------------------------------------
+
-. As the opensrf user, start all Evergreen and OpenSRF services:
+. As the *opensrf* user, start all Evergreen and OpenSRF services:
+
[source, bash]
--------------------------------------------------------------
osrf_control --localhost --start-all
--------------------------------------------------------------
+
-. As the opensrf user, run autogen to refresh the static organizational data files:
+. As the *opensrf* user, run autogen to refresh the static organizational data files:
+
[source, bash]
--------------------------------------------------------------
@@ -295,11 +305,12 @@ Received Data: "250bf1518c7527a03249858687714376"
------------------------------------
----------------------------------------------------------
+
-If this does not work, it's time to do some troubleshooting.
+If this does not work, it's time to do some <<install-troubleshooting-1,troubleshooting>>.
+
-. As the root user, start the Apache web server.
+. As the *root* user, start the Apache web server.
+
-If you encounter errors, refer to the troubleshooting section of this documentation for tips on finding solutions and seeking further assistance
+If you encounter errors, refer to the <<install-troubleshooting-1,troubleshooting>> section
+of this documentation for tips on finding solutions and seeking further assistance
from the Evergreen community.
Review Release Notes
commit 0d739dab32cf7e4d464f651685cb801ce4f1ec2e
Author: Josh Stompro <stomproj at larl.org>
Date: Fri Nov 7 10:05:45 2014 -0600
LP#1390138: Another update for install/update docs - added make install
The docs say that the make command will copy the packages into the /updates folder, but without
"make install" that doesn't happen.
Signed-off-by: Josh Stompro <stomproj at larl.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/docs/installation/staff_client_installation.txt b/docs/installation/staff_client_installation.txt
index c6f4ab9..5121697 100644
--- a/docs/installation/staff_client_installation.txt
+++ b/docs/installation/staff_client_installation.txt
@@ -61,6 +61,7 @@ cd /path/to/Evergreen/Open-ILS/xul/staff_client
[source, bash]
--------
make rigrelease rebuild linux32-updates-client linux64-updates-client
+make install
--------
+
This builds and copies two staff client tarballs for Linux to the `updates`
commit d0f2c79594e4e8d829a9e902a89d2d0c7ce56922
Author: Josh Stompro <stomproj at larl.org>
Date: Thu Nov 6 16:16:26 2014 -0600
LP#1390138: Updated upgrade docs for 2.7.1
Missed one instance of 2_6_1 in the /openils/var/web/xul server symlink section.
Signed-off-by: Josh Stompro <stomproj at larl.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/docs/installation/server_upgrade.txt b/docs/installation/server_upgrade.txt
index cc51cc2..1ce389f 100644
--- a/docs/installation/server_upgrade.txt
+++ b/docs/installation/server_upgrade.txt
@@ -111,7 +111,7 @@ chown -R opensrf:opensrf /openils
-----------------------------------------------------------
cd /openils/var/web/xul/
rm server
-ln -sf rel_2_6_1/server server
+ln -sf rel_2_7_1/server server
----------------------------------------------------------
+
. As the opensrf user, update opensrf_core.xml and opensrf.xml by copying the
commit 26c91e4b75d181b7c064b78a2ddfe7f86d27ddb1
Author: Josh Stompro <stomproj at larl.org>
Date: Thu Nov 6 11:24:31 2014 -0600
LP#1390138: Updated upgrade docs for 2.7.1.
Added in section about checking the release notes for other upgrade steps to the end.
Added in the step to restart memcached as Galen Charlton mentioned in his 11/5 dev list email
about clearing out old login sessions for security reasons.
Added in Jessie and Trusty with a pointer to the Ruby EDI bug that users of the distributions
will run into.
Signed-off-by: Josh Stompro <stomproj at larl.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/docs/installation/server_upgrade.txt b/docs/installation/server_upgrade.txt
index b77630b..cc51cc2 100644
--- a/docs/installation/server_upgrade.txt
+++ b/docs/installation/server_upgrade.txt
@@ -8,12 +8,12 @@ Software Prerequisites
* **PostgreSQL**: Version 9.1 is recommended. The minimum supported version
is 9.1.
- * **Linux**: Evergreen 2.6 has been tested on Debian Wheezy (7.0), Debian Squeeze (6.0),
- Ubuntu Precise Pangolin (12.04) and Ubuntu Lucid Lynx (10.04). If you are
+ * **Linux**: Evergreen 2.7 has been tested on Debian Jessie (8.0), Debian Wheezy (7.0), Debian Squeeze (6.0),
+ Ubuntu Trusty Tahr (14.04), Ubuntu Precise Pangolin (12.04) and Ubuntu Lucid Lynx (10.04). If you are
running an older version of these distributions, you may want to upgrade
before upgrading Evergreen. For instructions on upgrading these
distributions, visit the Debian or Ubuntu websites.
- * **OpenSRF**: The minimum supported version of OpenSRF is 2.3.0.
+ * **OpenSRF**: The minimum supported version of OpenSRF is 2.4.0.
In the following instructions, you are asked to perform certain steps as either the root or opensrf user.
@@ -42,12 +42,12 @@ osrf_control --localhost --stop-all
.. Back up the /openils directory.
. Upgrade OpenSRF. Download and install the latest version of OpenSRF from
the http://evergreen-ils.org/opensrf-downloads/[OpenSRF download page].
-. As the opensrf user, download and extract Evergreen 2.6:
+. As the opensrf user, download and extract Evergreen 2.7:
+
[source, bash]
-----------------------------------------------
-wget http://evergreen-ils.org/downloads/Evergreen-ILS-2.6.1.tar.gz
-tar xzf Evergreen-ILS-2.6.1.tar.gz
+wget http://evergreen-ils.org/downloads/Evergreen-ILS-2.7.1.tar.gz
+tar xzf Evergreen-ILS-2.7.1.tar.gz
-----------------------------------------------
+
[NOTE]
@@ -57,7 +57,7 @@ For the latest edition of Evergreen, check the http://evergreen-ils.org/egdownlo
+
[source, bash]
---------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.6.1
+cd /home/opensrf/Evergreen-ILS-2.7.1
---------------------------------------------
+
On the next command, replace `[distribution]` with one of these values for your
@@ -66,10 +66,13 @@ distribution of Debian or Ubuntu:
indexterm:[Linux, Debian]
indexterm:[Linux, Ubuntu]
+
+ * `debian-jessie` for Debian Jessie (8.0) (See https://bugs.launchpad.net/evergreen/+bug/1342227[Bug 134222] if you want to use EDI)
* `debian-wheezy` for Debian Wheezy (7.0)
* `debian-squeeze` for Debian Squeeze (6.0)
+ * `ubuntu-trusty` for Ubuntu Trusty Tahr (14.04) (See https://bugs.launchpad.net/evergreen/+bug/1342227[Bug 134222] if you want to use EDI)
* `ubuntu-precise` for Ubuntu Precise Pangolin (12.04)
* `ubuntu-lucid` for Ubuntu Lucid Lynx (10.04)
+
+
[source, bash]
------------------------------------------------------------
@@ -80,7 +83,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution]
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.6.1
+cd /home/opensrf/Evergreen-ILS-2.7.1
PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
make
------------------------------------------------------------
@@ -91,8 +94,8 @@ These instructions assume that you have also installed OpenSRF under /openils/.
+
[source, bash]
------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.6.1
-make STAFF_CLIENT_STAMP_ID=rel_2_6_1 install
+cd /home/opensrf/Evergreen-ILS-2.7.1
+make STAFF_CLIENT_STAMP_ID=rel_2_7_1 install
------------------------------------------------------------
+
. As the root user, change all files to be owned by the opensrf user and group:
@@ -128,7 +131,7 @@ Copying these configuration files will remove any customizations you have made t
+
[source, bash]
-------------------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.6.1
+cd /home/opensrf/Evergreen-ILS-2.7.1
perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \
--create-offline --database evergreen --host localhost --user evergreen --password evergreen
-------------------------------------------------------------------------
@@ -145,21 +148,21 @@ For example, if you purchased an SSL certificate, you will need to edit eg.conf
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.6.1/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
+cp /home/opensrf/Evergreen-ILS-2.7.1/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
----------------------------------------------------------
+
.. Update /etc/apache2/eg_vhost.conf by copying the example from Open-ILS/examples/apache/eg_vhost.conf.
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.6.1/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
+cp /home/opensrf/Evergreen-ILS-2.7.1/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
----------------------------------------------------------
+
.. Update /etc/apache2/sites-available/eg.conf by copying the example from Open-ILS/examples/apache/eg.conf.
+
[source, bash]
----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.6.1/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
+cp /home/opensrf/Evergreen-ILS-2.7.1/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
----------------------------------------------------------
Upgrade the Evergreen database schema
@@ -182,20 +185,21 @@ 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.6.1, you
+the schema. For example, if you want to upgrade from 2.5.1 to 2.7.1, you
would run the following upgrade scripts:
- 2.5.1-2.5.2-upgrade-db.sql
- 2.5.2-2.5.3-upgrade-db.sql
- 2.5.3-2.6.0-upgrade-db.sql (this is a major version upgrade)
-- 2.6.0-2.6.1-upgrade-db.sql
+- 2.6-2.7.0-upgrade-db.sql (this is a major version upgrade)
+- 2.7.0-2.7.1-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.6.1), use
+To upgrade across multiple major versions (e.g. from 2.3.0 to 2.7.1), use
the same logic to utilize the provided major version upgrade scripts. For
example:
@@ -205,7 +209,8 @@ example:
- 2.4.3-2.5.0-upgrade-db.sql
- (run all incremental scripts from 2.5.0 to 2.5.3)
- 2.5.3-2.6.0-upgrade-db.sql
-- 2.6.0-2.6.1-upgrade-db.sql
+- 2.6-2.7.0-upgrade-db.sql
+- 2.7.0-2.7.1-upgrade-db.sql
=============
[CAUTION]
@@ -219,8 +224,8 @@ as a user with the ability to connect to the database server.
[source, bash]
----------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.6.1/Open-ILS/src/sql/Pg
-psql -U evergreen -h localhost -f version-upgrade/2.5.3-2.6.0-upgrade-db.sql evergreen
+cd /home/opensrf/Evergreen-ILS-2.7.1/Open-ILS/src/sql/Pg
+psql -U evergreen -h localhost -f version-upgrade/2.6-2.7.0-upgrade-db.sql evergreen
----------------------------------------------------------
[TIP]
@@ -231,6 +236,13 @@ may take a long time depending on the number of bib records in your system.
Restart Evergreen and Test
~~~~~~~~~~~~~~~~~~~~~~~~~~
+. As the root user, restart memcached to clear out all old user sessions.
++
+[source, bash]
+--------------------------------------------------------------
+service memcached restart
+--------------------------------------------------------------
++
. As the opensrf user, start all Evergreen and OpenSRF services:
+
[source, bash]
@@ -289,3 +301,10 @@ If this does not work, it's time to do some troubleshooting.
+
If you encounter errors, refer to the troubleshooting section of this documentation for tips on finding solutions and seeking further assistance
from the Evergreen community.
+
+Review Release Notes
+~~~~~~~~~~~~~~~~~~~~
+
+Review the <<_evergreen_2_7_release_notes,2.7 release notes>> for other tasks
+that need to be done after upgrading. If you have upgraded over several
+major versions, you will need to review the release notes for each version also.
-----------------------------------------------------------------------
Summary of changes:
docs/installation/server_installation.txt | 25 +++--
docs/installation/server_upgrade.txt | 127 ++++++++++++++---------
docs/installation/staff_client_installation.txt | 1 +
3 files changed, 99 insertions(+), 54 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list