From 7c2410cd767e3f9b9ac1f31a367143251faf4041 Mon Sep 17 00:00:00 2001
From: Andy Witter <awitter@georgialibraries.org>
Date: Wed, 19 Feb 2014 10:07:19 -0500
Subject: [PATCH] Fix bugs - when reading from config file private network was
 incorrect.  Also fix incorrect DNS zone files.

---
 GenaSYS.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/GenaSYS.sh b/GenaSYS.sh
index 693a34b..0a1e99b 100755
--- a/GenaSYS.sh
+++ b/GenaSYS.sh
@@ -53,7 +53,7 @@ done
 
 WD=$(dirname $(readlink -f $0))
 CUSTOMDIR="$WD/custom"
-EG_VERSION="2.5.2"
+EG_VERSION="2.4.6"
 UBUNTU_CODENAME="precise"
 LICENSE="$WD/License.txt"
 TEMPLATEDIR="$WD/templates"
@@ -1154,6 +1154,7 @@ then
 		Confirm_Input Get_Private_Net
 	fi
 fi
+ORIGIN_PRIVATENET="$PRIVATENET"
 Write_Config_File PRIVATENET
 
 if [ -z $CLUSTERIPADDRESS ] || [ "$USE_CONFIG_FILE" == "0" ] 
@@ -1605,7 +1606,7 @@ then
 	### Reverse the DMZ net for DNS reverse zone.
 	REV_DMZ_NET="${DMZ_NET_3RD}.${DMZ_NET_2ND}.${DMZ_NET_1ST}"
 
-	sed -i "s^_REV_DMZ_NET^$REV_DMZ_NET^g" "$TMPREVZONEFILE_DMZ"
+	sed -i "s^_REV_PRIVATE_NET^$REV_DMZ_NET^g" "$TMPREVZONEFILE_DMZ"
 fi
 
 ### Add lvs servers entry to the global hosts file and DNS zone file. 
@@ -2149,6 +2150,7 @@ for LVS_SERVER in $MACHINES_LVS_ONLY
 	if [ "$USE_DMZ" = "y" ] || [ "$USE_DMZ" = "Y" ]
 	then
 		cp -f "$TMPREVZONEFILE_DMZ" "$OUTDIR/$LVS_SERVER/etc/bind/${DMZ_NET}-zone"
+		sed -i "s^_MY_HOSTNAME^$LVS_SERVER^g" "$OUTDIR/$LVS_SERVER/etc/bind/${DMZ_NET}-zone"
 	fi
 	sed -i "s^_MY_HOSTNAME^$LVS_SERVER^g" "$OUTDIR/$LVS_SERVER/etc/bind/${CLUSTERDOMAINNAME}-zone"
 	sed -i "s^_MY_HOSTNAME^$LVS_SERVER^g" "$OUTDIR/$LVS_SERVER/etc/bind/${PRIVATENET}-zone"
-- 
2.11.0