LP1157897: PostgreSQL PPA for Ubuntu Lucid

Addresses this bug reported in launchpad:
https://bugs.launchpad.net/evergreen/+bug/1157897

Signed-off-by: Elliot Voris <evoris@slcconline.edu>

diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-lucid b/Open-ILS/src/extras/install/Makefile.ubuntu-lucid
index 02829b3..246678d 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-lucid
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-lucid
@@ -2,6 +2,7 @@
 
 DIR = $(dir $(lastword $(MAKEFILE_LIST)))
 APT_SAFE_TOOL = aptitude -P
+APT_TOOL=apt-get -yq
 
 # We need a recent version of Yaz
 # Ubuntu 10.04 comes with 3.0.52
@@ -93,6 +94,7 @@ all: install_yaz
        make -f $(DIR)/Makefile.common install_net_z3950_simpleserver
        make -f $(DIR)/Makefile.common install_cpan
        make -f $(DIR)/Makefile.common install_cpan_force
+       make -f $(DIR)/Makefile.common install_libdbi
        make -f $(DIR)/Makefile.debian install_js_sm
        make -f $(DIR)/Makefile.debian debian_sys_config
 
@@ -101,7 +103,7 @@ install_yaz:
        tar xzf $(YAZ).tar.gz
        cd $(YAZ) && ./configure && make && make install && ldconfig
 
-install_pgsql_server_debs_91:
+install_postgres_server:
        $(APT_TOOL) install $(PGSQL_SERVER_DEBS_91)
 
 install_pgsql_client_backport_debs_91:

diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index 708f909..e692c0c 100644 (file)
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -78,9 +78,13 @@ before you can successfully configure, compile, and install Evergreen.
 
 1. Begin by installing the most recent version of OpenSRF (2.2.1 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 some distributions, it is necessary to install PostgreSQL 9 from external
    repositories.
 +
+[NOTE]
+Debian Wheezy, Ubuntu Precise, and Fedora come with PostgreSQL 9, so
+no additional steps are required.
++
   * On Debian Squeeze, open `/etc/apt/sources.list` in a text editor as the
     *root* Linux account and add the following line:
 +
@@ -89,28 +93,28 @@ before you can successfully configure, compile, and install Evergreen.
 deb http://backports.debian.org/debian-backports squeeze-backports main contrib
 ------------------------------------------------------------------------------
 +
-  * On Ubuntu Lucid, you can use a PPA (personal package archive), which are 
-    package sources hosted on Launchpad. The one most commonly used by Evergreen
-    Community members is maintained by Martin Pitt, who also maintains the
-    official PostgreSQL packages for Ubuntu. As the *root* Linux account, issue
-    the following commands to add the PPA source:
+  * On Ubuntu Lucid, create and open `/etc/apt/sources.list.d/pgdg.list` in a
+    text editor as the *root* Linux account and add the following line:
 +
 [source, bash]
 ------------------------------------------------------------------------------
-apt-get install python-software-properties
-add-apt-repository ppa:pitti/postgresql
+deb http://apt.postgresql.org/pub/repos/apt/ lucid-pgdg main
 ------------------------------------------------------------------------------
 +
-  * Ubuntu Precise comes with PostgreSQL 9, so no additional steps are required.
+  ** Run the following command as the *user* Linux account to import the repository key:
 +
-  * Fedora comes with PostgreSQL 9, so no additional steps are required.
+[source, bash]
+------------------------------------------------------------------------------
+wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+------------------------------------------------------------------------------
 +
-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
+3. On Debian Squeeze and Ubuntu Lucid, run `aptitude update` as the
+   *root* Linux account to retrieve the new packages from the backports
+   repository.
+4. Issue the following command as the *root* Linux account to install
    prerequisites using the `Makefile.install` prerequisite installer,
-   substituting `debian-squeeze`, `fedora`, `ubuntu-lucid`, or
-   `ubuntu-precise` for <osname> below:
+   substituting `debian-squeeze`,`debian-wheezy`, `fedora`, `ubuntu-lucid`,
+   or `ubuntu-precise` for <osname> below:
 +
 [source, bash]
 ------------------------------------------------------------------------------