Remove hard coded Postgresql version from setup.sh

diff --git a/templates/setup-vars b/templates/setup-vars
index 2b91864..66839a7 100644 (file)
--- a/templates/setup-vars
+++ b/templates/setup-vars
@@ -1,8 +1,13 @@
 #!/bin/bash
 
+### Evergreen Version
 EG_VER="_EGVER"
+### Postgres Version
+PG_VER="9.1"
+### GenaSYS Version
 VERSION="_GENVER"
 
+
 ### Setup colors.
 ### Normal colors.
 ESC_SEQ="\x1b["
@@ -45,3 +50,5 @@ fi
 
 ### Postgres user UID is sycronized for NFS
 PG_UID="499"
+
+### Postgres 

diff --git a/templates/setup.sh b/templates/setup.sh
index f1d6949..31104f0 100755 (executable)
--- a/templates/setup.sh
+++ b/templates/setup.sh
@@ -199,7 +199,7 @@ fi
 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-${PG_VER}"
 echo "*********"
 sleep 5
 }
@@ -215,9 +215,9 @@ if [ -e debconf-settings ]
                apt-get update
                if [ "$PKG_SET" = "0" ]
                        then
-                        aptitude -t squeeze-backports -yq install libpq5 libpq-dev postgresql-client-9.1 || PG_Deps_Warning
+                        aptitude -t squeeze-backports -yq install libpq5 libpq-dev postgresql-client-${PG_VER} || PG_Deps_Warning
                        elif [ -z "$PKG_SET" ] ; then
-                        aptitude -yq install libpq5 libpq-dev postgresql-client-9.1 || PG_Deps_Warning
+                        aptitude -yq install libpq5 libpq-dev postgresql-client-${PG_VER} || PG_Deps_Warning
                fi
                InstallDebs
                        else
@@ -325,9 +325,9 @@ then
                if [ "$PKG_SET" = "0" ] #setup backports if debian 6.x
                then
                        apt-get update
-                       aptitude -t squeeze-backports -yq install postgresql-9.1 postgresql-contrib-9.1 postgresql-plperl-9.1 postgresql-server-dev-9.1 || DBInstallErr
+                       aptitude -t squeeze-backports -yq install postgresql-${PG_VER} postgresql-contrib-${PG_VER} postgresql-plperl-${PG_VER} postgresql-server-dev-${PG_VER} || DBInstallErr
                        elif [ -z "$PKG_SET" ] ; then
-                        aptitude -yq install postgresql-9.1 postgresql-contrib-9.1 postgresql-plperl-9.1 postgresql-server-dev-9.1 || DBInstallErr 
+                        aptitude -yq install postgresql-${PG_VER} postgresql-contrib-${PG_VER} postgresql-plperl-${PG_VER} postgresql-server-dev-${PG_VER} || DBInstallErr 
                else
                        echo
                        echo "Failed to set the backports repository for installing Postgresql"
@@ -338,10 +338,10 @@ then
                #echo "kernel.shmmax=17179869184" >> /etc/sysctl.d/evergreen_db.conf #TODO disabled for now
                #echo "kernel.shmall = 4194304" >> /etc/sysctl.d/evergreen_db.conf #TODO dislbed for now
                Install_DB_Deps
-               sed -i "s^#listen_addresses = 'localhost'^listen_addresses = '*'^g" /etc/postgresql/9.1/main/postgresql.conf
-               sed -i "s^#log_destination = 'stderr'^log_destination = 'syslog'^g" /etc/postgresql/9.1/main/postgresql.conf
-               sed -i "s^#syslog_facility = 'LOCAL0'^syslog_facility = 'LOCAL3'^g" /etc/postgresql/9.1/main/postgresql.conf
-               sed -i "s^#syslog_ident = 'postgres'^syslog_ident = 'postgres'^g" /etc/postgresql/9.1/main/postgresql.conf
+               sed -i "s^#listen_addresses = 'localhost'^listen_addresses = '*'^g" /etc/postgresql/${PG_VER}/main/postgresql.conf
+               sed -i "s^#log_destination = 'stderr'^log_destination = 'syslog'^g" /etc/postgresql/${PG_VER}/main/postgresql.conf
+               sed -i "s^#syslog_facility = 'LOCAL0'^syslog_facility = 'LOCAL3'^g" /etc/postgresql/${PG_VER}/main/postgresql.conf
+               sed -i "s^#syslog_ident = 'postgres'^syslog_ident = 'postgres'^g" /etc/postgresql/${PG_VER}/main/postgresql.conf
                #Init_DB_9 #TODO disabled. Now done the new way from the 1st brick head.
                Add_EG_DB_User #TODO disabled same as above