From: Andy Witter <awitter@georgialibraries.org>
Date: Tue, 3 Jun 2014 20:07:22 +0000 (-0400)
Subject: Complete update to 2.6.0 and fix osrf_control bug
X-Git-Tag: GenaSYS-2.6.0~2
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=075e995a4a68409e24d40bb1919300cff8c36587;p=contrib%2Fpines%2Fgenasys.git

Complete update to 2.6.0 and fix osrf_control bug
---

diff --git a/GenaSYS.sh b/GenaSYS.sh
index e55e5cb..a045102 100755
--- 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.31"
-       DATE_="2010-09-23; last update: 2014-02-24"
+    VERSION_="1.32"
+       DATE_="2010-09-23; last update: 2014-05-19"
      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.5.2"
+EG_VERSION="2.6.0"
 UBUNTU_CODENAME="precise"
 LICENSE="$WD/License.txt"
 TEMPLATEDIR="$WD/templates"
@@ -1674,6 +1674,10 @@ NETCFGFILE="$OUTDIR/${CLUSTERDOMAINNAME}_network_config.txt"
 
 ## begin preparation of opensrf.xml
 cp $TEMPLATEDIR/opensrf.xml/opensrf.xml-header $TMPOPENSRF_XML
+if [ "$USE_HOSTNAME_PREFIX" = "y" ] || [ "$USE_HOSTNAME_PREFIX" = "Y" ]
+then
+	sed -i "s^<db>evergreen^<db>${PREFIX}_evergreen^g" $TMPOPENSRF_XML
+fi
 #sed -i "s^DatabasePassword^$DATABASE_PASSWORD^g" $TMPOPENSRF_XML
 sed -i "s^DatabasePassword^$(echo $DATABASE_PASSWORD | sed  -e 's^&^\\\&^g' -e 's/\^/\\\^/g')^g" $TMPOPENSRF_XML
 # the below line appears to not be doing anything
diff --git a/templates/debs/opensrf_2.3.0_amd64.deb b/templates/debs/opensrf_2.3.0_amd64.deb
index 3632ec8..2cb02cb 100644
Binary files a/templates/debs/opensrf_2.3.0_amd64.deb and b/templates/debs/opensrf_2.3.0_amd64.deb differ