Bump version to 1.50, remove old debs, increase PG version to 9.3

diff --git a/GenaSYS.sh b/GenaSYS.sh
index ae19db7..ecfa883 100755 (executable)
--- a/GenaSYS.sh
+++ b/GenaSYS.sh
@@ -25,8 +25,8 @@
     PURPOSE_="Generate config files needed for Evergreen-ILS Cluster"
    SYNOPSIS_="$NAME_"
    REQUIRES_="standard GNU commands, apt, dpkg"
-    VERSION_="1.40"
-       DATE_="2010-09-23; last update: 2014-10-21"
+    VERSION_="1.50"
+       DATE_="2010-09-23; last update: 2015-09-09"
      AUTHOR_="Andy Witter <awitter@georgialibraries.org>"
         URL_="http://evergreen-ils.org"
    CATEGORY_="devel"
@@ -53,7 +53,7 @@ done
 
 WD=$(dirname $(readlink -f $0))
 CUSTOMDIR="$WD/custom"
-EG_VERSION="2.7.1a"
+EG_VERSION="2.9.0"
 UBUNTU_CODENAME="precise"
 LICENSE="$WD/License.txt"
 TEMPLATEDIR="$WD/templates"
@@ -74,7 +74,7 @@ TMPNAGIHOSTS="${TMPFOLDER}/hosts.cfg"
 TMPMUNINCONF="${TMPFOLDER}/munin.conf"
 TMPGLUSTERNODES="${TMPFOLDER}/gluster_nodes.txt"
 TMPGLUSTERCLIENTS="${TMPFOLDER}/gluster_clients.txt"
-PSQL_VERSION="9.1"
+PSQL_VERSION="9.3"
 [ -z $CONFIG_FILE ] && CONFIG_FILE="$WD/genasys.conf"
 NEW_CONFIG_FILE="$OUTDIR/genasys.conf"
 CERT_DIR="${OUTDIR}/ssl_cert"

diff --git a/templates/apt/db01_apt.list b/templates/apt/db01_apt.list
index f335f1a..07e311d 100644 (file)
--- a/templates/apt/db01_apt.list
+++ b/templates/apt/db01_apt.list
@@ -1 +1 @@
-ntp make gdebi-core nfs-common postgresql-plperl-9.1 nagios-nrpe-server sysstat munin-node munin-plugins-extra libwww-perl
+ntp make gdebi-core nfs-common postgresql-plperl-9.3 nagios-nrpe-server sysstat munin-node munin-plugins-extra libwww-perl

diff --git a/templates/apt/db02_apt.list b/templates/apt/db02_apt.list
index f335f1a..07e311d 100644 (file)
--- a/templates/apt/db02_apt.list
+++ b/templates/apt/db02_apt.list
@@ -1 +1 @@
-ntp make gdebi-core nfs-common postgresql-plperl-9.1 nagios-nrpe-server sysstat munin-node munin-plugins-extra libwww-perl
+ntp make gdebi-core nfs-common postgresql-plperl-9.3 nagios-nrpe-server sysstat munin-node munin-plugins-extra libwww-perl

diff --git a/templates/apt/db03_apt.list b/templates/apt/db03_apt.list
index f335f1a..07e311d 100644 (file)
--- a/templates/apt/db03_apt.list
+++ b/templates/apt/db03_apt.list
@@ -1 +1 @@
-ntp make gdebi-core nfs-common postgresql-plperl-9.1 nagios-nrpe-server sysstat munin-node munin-plugins-extra libwww-perl
+ntp make gdebi-core nfs-common postgresql-plperl-9.3 nagios-nrpe-server sysstat munin-node munin-plugins-extra libwww-perl

diff --git a/templates/db/create_database_9.3.sql b/templates/db/create_database_9.3.sql
new file mode 100644 (file)
index 0000000..b73a871
--- /dev/null
+++ b/templates/db/create_database_9.3.sql
@@ -0,0 +1,22 @@
+-- This file is intended to be called by eg_db_config.pl
+
+-- If manually calling:
+-- Connect to the postgres database initially
+-- Specify the database to create as -vdb_name=DATABASE
+-- Specify the postgres contrib directory as -vcontrib_dir=CONTRIBDIR
+-- You can get the contrib directory using pg_config --sharedir and adding a /contrib to it
+
+-- NOTE: This file does not do transactions
+-- This is intentional. Please do not wrap in BEGIN/COMMIT.
+DROP DATABASE IF EXISTS :db_name;
+
+CREATE DATABASE :db_name TEMPLATE template0 ENCODING 'UNICODE' LC_COLLATE 'C' LC_CTYPE 'C';
+
+\connect :db_name
+
+CREATE LANGUAGE plperlu;
+
+CREATE EXTENSION tablefunc;
+CREATE EXTENSION xml2;
+CREATE EXTENSION hstore;
+CREATE EXTENSION intarray;

diff --git a/templates/debs/evergreen-ils_2.7.1a_amd64.deb b/templates/debs/evergreen-ils_2.7.1a_amd64.deb
deleted file mode 100644 (file)
index 2312009..0000000
Binary files a/templates/debs/evergreen-ils_2.7.1a_amd64.deb and /dev/null differ

diff --git a/templates/debs/opensrf_2.4.0-alpha_amd64.deb b/templates/debs/opensrf_2.4.0-alpha_amd64.deb
deleted file mode 100644 (file)
index 91c9d0f..0000000
Binary files a/templates/debs/opensrf_2.4.0-alpha_amd64.deb and /dev/null differ

diff --git a/templates/setup-functions b/templates/setup-functions
index 32e53d8..fb6913d 100644 (file)
--- a/templates/setup-functions
+++ b/templates/setup-functions
@@ -67,7 +67,7 @@ chown -R opensrf:opensrf /openils
 PG_Deps_Warning () { ### Dependency install error message
         echo
         echo "*********"
-        echo "WARNING!! Failed to install: libpq5 libpq-dev postgresql-client-9.1"
+        echo "WARNING!! Failed to install: libpq5 libpq-dev postgresql-client-9.3"
         echo "*********"
         sleep 5
 }

diff --git a/templates/setup-vars b/templates/setup-vars
index 66839a7..32bd0bc 100644 (file)
--- a/templates/setup-vars
+++ b/templates/setup-vars
@@ -3,7 +3,7 @@
 ### Evergreen Version
 EG_VER="_EGVER"
 ### Postgres Version
-PG_VER="9.1"
+PG_VER="9.3"
 ### GenaSYS Version
 VERSION="_GENVER"