From: Andy Witter <awitter@georgialibraries.org>
Date: Wed, 19 Feb 2014 06:39:12 +0000 (-0500)
Subject: Fix bug - tmprevzonefile.txt: file not found.
X-Git-Tag: GenaSYS-2.6.0~8
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=58ac685c247f26b084d924d562e9f84f71d47cd3;p=contrib%2Fpines%2Fgenasys.git

Fix bug - tmprevzonefile.txt: file not found.
---

diff --git a/GenaSYS.sh b/GenaSYS.sh
index face50f..a431bc5 100755
--- a/GenaSYS.sh
+++ b/GenaSYS.sh
@@ -1117,7 +1117,7 @@ then
 	Get_Gateways
 fi
 Write_Config_File DMZ_NET
-write_Config_File DMZ_GATEWAY
+Write_Config_File DMZ_GATEWAY
 Write_Config_File PRIVATENET_GATEWAY
 
 if [ -z $USE_STANDARD_PRIVATE_NETWORK ] || [ "$USE_CONFIG_FILE" == "0" ] 
@@ -1579,19 +1579,18 @@ sed -i "s^_REV_PRIVATE_NET^$REV_PRIVATENET^g" "$TMPREVZONEFILE"
 
 if [ "$USE_DMZ" = "y" ] || [ "$USE_DMZ" = "Y" ]
 then
-
-cat "$TEMPLATEDIR/lvs/bind/revzonefile-header" > "$TMPREVZONEFILE_DMZ"
+	cat "$TEMPLATEDIR/lvs/bind/revzonefile-header" > "$TMPREVZONEFILE_DMZ"
 
 	
-### Split the DMZ network into 3 separate octects.
-DMZ_NET_1ST="$(echo $DMZ_NET | awk -F"." '{ print $1 }')"
-DMZ_NET_2ND="$(echo $DMZ_NET | awk -F"." '{ print $2 }')"
-DMZ_NET_3RD="$(echo $DMZ_NET | awk -F"." '{ print $3 }')"
+	### Split the DMZ network into 3 separate octects.
+	DMZ_NET_1ST="$(echo $DMZ_NET | awk -F"." '{ print $1 }')"
+	DMZ_NET_2ND="$(echo $DMZ_NET | awk -F"." '{ print $2 }')"
+	DMZ_NET_3RD="$(echo $DMZ_NET | awk -F"." '{ print $3 }')"
 
-### Reverse the DMZ net for DNS reverse zone.
-REV_DMZ_NET="${DMZ_NET_3RD}.${DMZ_NET_2ND}.${DMZ_NET_1ST}"
+	### 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_DMZ_NET^$REV_DMZ_NET^g" "$TMPREVZONEFILE_DMZ"
 fi
 
 ### Add lvs servers entry to the global hosts file and DNS zone file. 
@@ -2084,7 +2083,10 @@ cat $TMPFOLDER/zonefile-footer >> "$TMPZONEFILE"
 cat $TMPFOLDER/revzonefile-footer >> "$TMPREVZONEFILE"
 sed -i "s^domain.org^$CLUSTERDOMAINNAME^g" "$TMPZONEFILE"
 sed -i "s^domain.org^$CLUSTERDOMAINNAME^g" "$TMPREVZONEFILE"
-sed -i "s^domain.org^$CLUSTERDOMAINNAME^g" "$TMPREVZONEFILE_DMZ"
+if [ "$USE_DMZ" = "y" ] || [ "$USE_DMZ" = "Y" ]
+then
+	sed -i "s^domain.org^$CLUSTERDOMAINNAME^g" "$TMPREVZONEFILE_DMZ"
+fi
 sed -i "s^Priv_NET^$PRIVATENET^g" "$TMPZONEFILE"
 
 
@@ -2129,7 +2131,10 @@ for LVS_SERVER in $MACHINES_LVS_ONLY
 	mkdir -p "$OUTDIR/$LVS_SERVER/etc/bind"
 	cp -f "$TMPZONEFILE" "$OUTDIR/$LVS_SERVER/etc/bind/${CLUSTERDOMAINNAME}-zone"
 	cp -f "$TMPREVZONEFILE" "$OUTDIR/$LVS_SERVER/etc/bind/${PRIVATENET}-zone"
-	cp -f "$TMPREVZONEFILE_DMZ" "$OUTDIR/$LVS_SERVER/etc/bind/${DMZ_NET}-zone"
+	if [ "$USE_DMZ" = "y" ] || [ "$USE_DMZ" = "Y" ]
+	then
+		cp -f "$TMPREVZONEFILE_DMZ" "$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"
 done