Pārlūkot izejas kodu

trigger firewall update on ip functions

Serghey Rodin 11 gadi atpakaļ
vecāks
revīzija
42b8ac31dd
3 mainītis faili ar 37 papildinājumiem un 10 dzēšanām
  1. 13 4
      bin/v-add-sys-ip
  2. 12 4
      bin/v-delete-sys-ip
  3. 12 2
      bin/v-update-sys-ip

+ 13 - 4
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

+ 12 - 4
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

+ 12 - 2
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                              #
 #----------------------------------------------------------#