[open-ils-commits] [GIT] Evergreen ILS branch master updated. 9d32147ead32c688e39eb47d0229e19b9972da40

Evergreen Git git at git.evergreen-ils.org
Thu May 2 14:17:56 EDT 2013 

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  9d32147ead32c688e39eb47d0229e19b9972da40 (commit)
       via  0fdd34b1e15d910ca084e1515ef755c825a2d178 (commit)
       via  3018dfb619bc7d3bccf0722c3f72326a22b5ed51 (commit)
      from  b263a51180d7e3cbf0025a10e0625e5a75321f1a (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 9d32147ead32c688e39eb47d0229e19b9972da40
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Wed May 1 17:35:30 2013 -0400

    adjust release notes references to refer to 2.4.0
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/docs/RELEASE_NOTES_2_4.txt b/docs/RELEASE_NOTES_2_4.txt
index 9e3ad59..465158e 100644
--- a/docs/RELEASE_NOTES_2_4.txt
+++ b/docs/RELEASE_NOTES_2_4.txt
@@ -1,5 +1,5 @@
-Evergreen 2.4 Beta1 Release Notes
-=================================
+Evergreen 2.4.0 Release Notes
+=============================
 :toc:
 :numbered:
 
diff --git a/docs/root.txt b/docs/root.txt
index 6ec2585..4130f09 100644
--- a/docs/root.txt
+++ b/docs/root.txt
@@ -60,7 +60,7 @@ in over a dozen countries worldwide.
 // Push titles down one level.
 :leveloffset: 1
 
-include::RELEASE_NOTES_2_3.txt[]
+include::RELEASE_NOTES_2_4.txt[]
 
 // Return to normal title levels.
 :leveloffset: 0

commit 0fdd34b1e15d910ca084e1515ef755c825a2d178
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Wed May 1 17:34:02 2013 -0400

    update upgrade instructions for 2.4.0 release
    
    - specify minimum supported PostgreSQL version as 9.1
    - specify minimum supported OpenSRF version as 2.2.0
    - update schema upgrade instructions and miscellaneous
      references to 2.3
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/docs/installation/server_upgrade.txt b/docs/installation/server_upgrade.txt
index ffec233..d8c849e 100644
--- a/docs/installation/server_upgrade.txt
+++ b/docs/installation/server_upgrade.txt
@@ -7,13 +7,13 @@ Software Prerequisites:
 ~~~~~~~~~~~~~~~~~~~~~~~
 
   * **PostgreSQL**: Version 9.1 is recommended. The minimum supported version
-    is 9.0.
-  * **Linux**: Evergreen 2.3 has been tested on Debian Squeeze (6.0),
+    is 9.1.
+  * **Linux**: Evergreen 2.4 has been tested on Debian Squeeze (6.0),
     Ubuntu Lucid Lynx (10.04) and Ubuntu Precise Pangolin (12.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.1.0.
+  * **OpenSRF**: The minimum supported version of OpenSRF is 2.2.0.
 
 In the following instructions, you are asked to perform certain steps as either the root or opensrf user.
 
@@ -42,12 +42,12 @@ osrf_ctl.sh -l -a stop_all
  .. Back up the /openils directory.
 . Upgrade OpenSRF. Download and install the latest version of OpenSRF from
 the http://evergreen-ils.org/opensrf.php[OpenSRF download page].
-. As the opensrf user, download and extract Evergreen 2.3:
+. As the opensrf user, download and extract Evergreen 2.4:
 +
 [source, bash]
 -----------------------------------------------
-wget http://www.open-ils.org/downloads/Evergreen-ILS-2.3.3.tar.gz
-tar xzf Evergreen-ILS-2.3.3.tar.gz
+wget http://www.open-ils.org/downloads/Evergreen-ILS-2.4.0.tar.gz
+tar xzf Evergreen-ILS-2.4.0.tar.gz
 -----------------------------------------------
 +
 [NOTE]
@@ -57,7 +57,7 @@ For the latest edition of Evergreen, check the http://evergreen-ils.org/download
 +
 [source, bash]
 ----------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.3.3
+cd /home/opensrf/Evergreen-ILS-2.4.0
 ---------------------------------------------
 +
 On the next command, replace `[distribution]` with one of these values for your
@@ -81,7 +81,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution]
 +
 [source, bash]
 ------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.3.3
+cd /home/opensrf/Evergreen-ILS-2.4.0
 ./configure --prefix=/openils --sysconfdir=/openils/conf
 make
 ------------------------------------------------------------
@@ -90,8 +90,8 @@ make
 +
 [source, bash]
 ------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.3.3
-make STAFF_CLIENT_STAMP_ID=rel_2_3_3 install
+cd /home/opensrf/Evergreen-ILS-2.4.0
+make STAFF_CLIENT_STAMP_ID=rel_2_4_0 install
 ------------------------------------------------------------
 +
 . As the root user, change all files to be owned by the opensrf user and group:
@@ -107,7 +107,7 @@ chown -R opensrf:opensrf /openils
 -----------------------------------------------------------
 cd /openils/var/web/xul/
 rm server
-ln -sf rel_2_3_3/server server
+ln -sf rel_2_4_0/server server
 ----------------------------------------------------------
 +
 . As the opensrf user, update opensrf_core.xml and opensrf.xml by copying the
@@ -127,7 +127,7 @@ Copying these configuration files will remove any customizations you have made t
 +
 [source, bash]
 -------------------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.3.3
+cd /home/opensrf/Evergreen-ILS-2.4.0
 perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \
 --create-offline --database evergreen --host localhost --user evergreen --password evergreen
 -------------------------------------------------------------------------
@@ -144,21 +144,21 @@ For example, if you purchased an SSL certificate, you will need to edit eg.conf
 +
 [source, bash]
 ----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.3.3/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup 
+cp /home/opensrf/Evergreen-ILS-2.4.0/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.3.3/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf 
+cp /home/opensrf/Evergreen-ILS-2.4.0/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.3.3/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf 
+cp /home/opensrf/Evergreen-ILS-2.4.0/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf 
 ----------------------------------------------------------
 
 Upgrade the Evergreen database schema
@@ -183,17 +183,18 @@ that you cannot resolve yourself through additional troubleshooting, please
 report the errors to the http://evergreen-ils.org/listserv.php[Evergreen
 Technical Discussion List].
 
-Run the following script as a user with the ability to connect to the
-database server. Adjust the arguments to the `psql` command to reflect your
-database server connection information:
+Run the following steps as a user with the ability to connect to the
+database server. Please adjust the arguments to the `psql` command and
+the `PG*` environment variables for the `2.3-2.4-supplemental.sh` command
+to reflect your database server connection information.  To supply the
+pasword, you can create a 
+http://www.postgresql.org/docs/9.1/static/libpq-pgpass.html[PostgreSQL password file].
 
 [source, bash]
 ----------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.3.3/Open-ILS/src/sql/Pg
-psql -U evergreen -h localhost -f version-upgrade/2.2-2.3.0-upgrade-db.sql evergreen
-psql -U evergreen -h localhost -f version-upgrade/2.3.0-2.3.1-upgrade-db.sql evergreen
-psql -U evergreen -h localhost -f version-upgrade/2.3.1-2.3.2-upgrade-db.sql evergreen
-psql -U evergreen -h localhost -f version-upgrade/2.3.2-2.3.3-upgrade-db.sql evergreen
+cd /home/opensrf/Evergreen-ILS-2.4.0/Open-ILS/src/sql/Pg
+psql -U evergreen -h localhost -f version-upgrade/2.3-2.4.0-upgrade-db.sql evergreen
+PGDATABASE=evergreen PGUSER=evergreen PGHOST=localhost version-upgrade/2.3-2.4-supplemental.sh
 ----------------------------------------------------------
 
 Restart Evergreen and Test

commit 3018dfb619bc7d3bccf0722c3f72326a22b5ed51
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Wed May 1 17:02:57 2013 -0400

    revisions to installation instructions
    
    - Remove references to PostgreSQL 9.0; 9.1 is recommended
      for Evergreen 2.4.
    - Clarify that the latest version of OpenSRF now means 2.2
      or later.
    - Increase chances that somebody following the instructions
      precisely doesn't run into a problem during the configure step.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index 2b75fbf..53dcfb6 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -76,7 +76,7 @@ Installing prerequisites
 Evergreen has a number of prerequisite packages that must be installed
 before you can successfully configure, compile, and install Evergreen.
 
-1. Begin by installing the most recent version of OpenSRF (2.1 or later).
+1. Begin by installing the most recent version of OpenSRF (2.2 or later).
    You can download OpenSRF releases from http://evergreen-ils.org/opensrf.php
 2. On many distributions, it is necessary to install PostgreSQL 9 from external
    repositories.
@@ -147,10 +147,14 @@ the *user* Linux account to configure and build Evergreen:
 
 [source, bash]
 ------------------------------------------------------------------------------
-./configure --prefix=/openils --sysconfdir=/openils/conf
+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
 -------------------------
 
@@ -419,26 +423,6 @@ 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`.
 
-For PostgreSQL 9.0
-^^^^^^^^^^^^^^^^^^
-To create the database instance on a remote database server running PostgreSQL
-9.0, you can either:
-
-  *  Install the PostgreSQL contrib modules on the machine on which you
-     are installing the Evergreen code, and use the `--create-database`
-     option from that machine, or
-  *  Copy the `Open-ILS/src/sql/Pg/create_database.sql` script to your
-     PostgreSQL server and invoke it as the *postgres* Linux account:
-+
-[source, bash]
-------------------------------------------------------------------------------
-psql -vdb_name=<dbname> -vcontrib_dir=`pg_config --sharedir`/contrib -f create_database.sql
-------------------------------------------------------------------------------
-
-Then you can issue the `eg_db_config` command as above _without_ the
-`--create-database` argument to create your schema and configure your
-configuration files.
-
 Starting Evergreen
 ------------------
 1. As the *root* Linux account, start the `memcached` and `ejabberd` services

-----------------------------------------------------------------------

Summary of changes:
 docs/RELEASE_NOTES_2_4.txt                |    4 +-
 docs/installation/server_installation.txt |   28 ++++-------------
 docs/installation/server_upgrade.txt      |   47 +++++++++++++++--------------
 docs/root.txt                             |    2 +-
 4 files changed, 33 insertions(+), 48 deletions(-)


hooks/post-receive
-- 
Evergreen ILS

More information about the open-ils-commits mailing list