From 5904999d2b4696340184b3e27ee6f81025952503 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Sun, 26 Oct 2014 13:24:30 +0200
Subject: [PATCH] Fix for firewall setup

---
 install/vst-install-debian.sh | 20 ++++++++++----------
 install/vst-install-rhel.sh   | 24 ++++++++++++------------
 install/vst-install-ubuntu.sh | 20 ++++++++++----------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh
index fd92b2b2..ea6bf7d0 100644
--- a/install/vst-install-debian.sh
+++ b/install/vst-install-debian.sh
@@ -495,16 +495,6 @@ if [ "$srv_type" = 'micro' ]; then
     rm -f /usr/local/vesta/data/templates/web/apache2/phpfcgid.*
 fi
 
-# Firewall configuartion
-wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz
-tar -xzf firewall.tar.gz
-rm -f firewall.tar.gz
-if [ "$disable_iptables" = 'yes' ]; then
-    sed -i "s/iptables//" $VESTA/conf/vesta.conf
-else
-    /usr/local/vesta/bin/v-update-firewall
-fi
-
 # Generating SSL certificate
 $VESTA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \
      'San Francisco' 'Vesta Control Panel' 'IT' > /tmp/vst.pem
@@ -797,6 +787,16 @@ $VESTA/bin/v-add-database admin default default $(gen_pass) mysql
 # Configuring system ips
 $VESTA/bin/v-update-sys-ip
 
+# Firewall configuartion
+wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz
+tar -xzf firewall.tar.gz
+rm -f firewall.tar.gz
+if [ "$disable_iptables" = 'yes' ]; then
+    sed -i "s/iptables//" $VESTA/conf/vesta.conf
+else
+    /usr/local/vesta/bin/v-update-firewall
+fi
+
 # Get main ip
 main_ip=$(ifconfig |grep 'inet addr:' |grep -v 127.0.0.1 |head -n1 | \
     cut -f2 -d: | cut -f1 -d ' ')
diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh
index c42b7cc9..55f96636 100644
--- a/install/vst-install-rhel.sh
+++ b/install/vst-install-rhel.sh
@@ -554,18 +554,6 @@ if [ "$srv_type" = 'micro' ]; then
     rm -f /usr/local/vesta/data/templates/web/httpd/phpfcgid.*
 fi
 
-# Firewall configuration
-wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz
-tar -xzf firewall.tar.gz
-rm -f firewall.tar.gz
-if [ "$disable_iptables" = 'yes' ]; then
-    sed -i "s/iptables//" $VESTA/conf/vesta.conf
-    chkconfig iptables off
-    service iptables stop
-else
-    /usr/local/vesta/bin/v-update-firewall
-fi
-
 # Generating SSL certificate
 $VESTA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \
      'San Francisco' 'Vesta Control Panel' 'IT' > /tmp/vst.pem
@@ -849,6 +837,18 @@ $VESTA/bin/v-add-database admin default default $(gen_pass) mysql
 # Configuring system ips
 $VESTA/bin/v-update-sys-ip
 
+# Firewall configuration
+wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz
+tar -xzf firewall.tar.gz
+rm -f firewall.tar.gz
+if [ "$disable_iptables" = 'yes' ]; then
+    sed -i "s/iptables//" $VESTA/conf/vesta.conf
+    chkconfig iptables off
+    service iptables stop
+else
+    /usr/local/vesta/bin/v-update-firewall
+fi
+
 # Get main ip
 main_ip=$(ifconfig |grep 'inet addr:' |grep -v 127.0.0.1 |head -n1 | \
     cut -f2 -d: | cut -f1 -d ' ')
diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh
index 3d52a551..cc461577 100644
--- a/install/vst-install-ubuntu.sh
+++ b/install/vst-install-ubuntu.sh
@@ -501,16 +501,6 @@ if [ "$codename" = 'trusty' ]; then
     rm -f /usr/local/vesta/data/templates/web/apache2/phpcgi.*
 fi
 
-# Firewall configuartion
-wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz
-tar -xzf firewall.tar.gz
-rm -f firewall.tar.gz
-if [ "$disable_iptables" = 'yes' ]; then
-    sed -i "s/iptables//" $VESTA/conf/vesta.conf
-else
-    /usr/local/vesta/bin/v-update-firewall
-fi
-
 # Generating SSL certificate
 $VESTA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \
      'San Francisco' 'Vesta Control Panel' 'IT' > /tmp/vst.pem
@@ -819,6 +809,16 @@ $VESTA/bin/v-add-database admin default default $(gen_pass) mysql
 # Configuring system ips
 $VESTA/bin/v-update-sys-ip
 
+# Firewall configuartion
+wget $CHOST/$VERSION/firewall.tar.gz -O firewall.tar.gz
+tar -xzf firewall.tar.gz
+rm -f firewall.tar.gz
+if [ "$disable_iptables" = 'yes' ]; then
+    sed -i "s/iptables//" $VESTA/conf/vesta.conf
+else
+    /usr/local/vesta/bin/v-update-firewall
+fi
+
 # Get main ip
 main_ip=$(ifconfig |grep 'inet addr:' |grep -v 127.0.0.1 |head -n1 | \
     cut -f2 -d: | cut -f1 -d ' ')