From 42b8ac31dd0b55513a97e3260762fca563eac7b1 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Fri, 17 Apr 2015 16:11:27 +0300
Subject: [PATCH] trigger firewall update on ip functions

---
 bin/v-add-sys-ip    | 17 +++++++++++++----
 bin/v-delete-sys-ip | 16 ++++++++++++----
 bin/v-update-sys-ip | 14 ++++++++++++--
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/bin/v-add-sys-ip b/bin/v-add-sys-ip
index 6bb0c6df1..0dd172987 100755
--- a/bin/v-add-sys-ip
+++ b/bin/v-add-sys-ip
@@ -159,14 +159,23 @@ else
     increase_user_value 'admin' '$IP_AVAIL'
 fi
 
-# Restart web server
+# Restarting web server
 $BIN/v-restart-web
 if [ $? -ne 0 ]; then
     exit $E_RESTART
 fi
-$BIN/v-restart-proxy
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
+
+# Restarting proxy server
+if [ ! -z "$PROXY_SYSTEM" ]; then
+    $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit $E_RESTART
+    fi
+fi
+
+# Restarting firewall
+if [ ! -z "$FIREWALL_SYSTEM" ];
+    $BIN/v-update-firewall
 fi
 
 # Logging
diff --git a/bin/v-delete-sys-ip b/bin/v-delete-sys-ip
index 5c29e4871..ba0297887 100755
--- a/bin/v-delete-sys-ip
+++ b/bin/v-delete-sys-ip
@@ -121,15 +121,23 @@ else
     decrease_user_value "$OWNER" '$IP_AVAIL'
 fi
 
-# Adding task to the vesta pipe
+# Restarting web server
 $BIN/v-restart-web
 if [ $? -ne 0 ]; then
     exit $E_RESTART
 fi
 
-$BIN/v-restart-proxy
-if [ $? -ne 0 ]; then
-    exit $E_RESTART
+# Restarting proxy server
+if [ ! -z "$PROXY_SYSTEM" ]; then
+    $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit $E_RESTART
+    fi
+fi
+
+# Restarting firewall
+if [ ! -z "$FIREWALL_SYSTEM" ];
+    $BIN/v-update-firewall
 fi
 
 # Logging
diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip
index 0d0643702..28bf2e5c5 100755
--- a/bin/v-update-sys-ip
+++ b/bin/v-update-sys-ip
@@ -65,8 +65,19 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then
                 $BIN/v-rebuild-web-domains $user no
             done
         fi
+
+        # Restarting web server
         $BIN/v-restart-web
-        $BIN/v-restart-proxy
+
+        # Restarting proxy server
+        if [ ! -z "$PROXY_SYSTEM" ]; then
+            $BIN/v-restart-proxy
+        fi
+
+        # Restarting firewall
+        if [ ! -z "$FIREWALL_SYSTEM" ];
+            $BIN/v-update-firewall
+        fi
 
         if [ ! -z "$DNS_SYSTEM" ]; then
             # Rebuild dns domains
@@ -98,7 +109,6 @@ for ip in $ip_list; do
 done
 
 
-
 #----------------------------------------------------------#
 #                       Vesta                              #
 #----------------------------------------------------------#