From 75e4f1d83732b903ce123729447a6e5337e853a4 Mon Sep 17 00:00:00 2001
From: Andy Witter <awitter@georgialibraries.org>
Date: Wed, 23 Aug 2017 09:43:46 -0400
Subject: [PATCH] fix iptables modificaton to only happen on lvs servers and
 change codename from xenial to trusty

---
 GenaSYS.sh         |  2 +-
 templates/setup.sh | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/GenaSYS.sh b/GenaSYS.sh
index a6c8cd9..d7c94af 100755
--- a/GenaSYS.sh
+++ b/GenaSYS.sh
@@ -54,7 +54,7 @@ done
 WD=$(dirname $(readlink -f $0))
 CUSTOMDIR="$WD/custom"
 EG_VERSION="2.12.4"
-UBUNTU_CODENAME="xenial"
+UBUNTU_CODENAME="trusty"
 LICENSE="$WD/License.txt"
 TEMPLATEDIR="$WD/templates"
 DEFAULT_PRIVATE_NET="10.0.1"
diff --git a/templates/setup.sh b/templates/setup.sh
index 45b3d52..eb74d54 100755
--- a/templates/setup.sh
+++ b/templates/setup.sh
@@ -260,12 +260,6 @@ cat named_options.txt >> /etc/bind/named.options
 
 fi
 
-# configure firewall for lvs servers
-sed -i "s/eth1/$PRIMARY_IF/g" "/etc/network/iptables-rules.fw"
-# find secondary interface
-SECONDARY_IF=$(ls /sys/class/net |grep -v "lo" |grep -v "$PRIMARY_IF")
-sed -i "s/eth0/$SECONDARY_IF/g" "/etc/network/iptables-rules.fw"
-
 
 ConfigLogging () { ### Configure logging for the cluster.
 if ! cat /etc/hostname|grep -q logger
@@ -659,6 +653,12 @@ then
                 Config_Apache2_Default_SSL
                 a2ensite default-ssl.conf
         fi
+	# configure firewall for lvs servers
+	sed -i "s/eth1/$PRIMARY_IF/g" "/etc/network/iptables-rules.fw"
+	# find secondary interface
+	SECONDARY_IF=$(ls /sys/class/net |grep -v "lo" |grep -v "$PRIMARY_IF")
+	sed -i "s/eth0/$SECONDARY_IF/g" "/etc/network/iptables-rules.fw"
+
 fi
 
 
-- 
2.11.0