Sfoglia il codice sorgente

remote dns host verification

Serghey Rodin 12 anni fa
parent
commit
d108cdfc91
2 ha cambiato i file con 11 aggiunte e 7 eliminazioni
  1. 1 1
      bin/v-delete-remote-dns-domain
  2. 10 6
      bin/v-delete-remote-dns-host

+ 1 - 1
bin/v-delete-remote-dns-domain

@@ -49,7 +49,7 @@ old_ifs="$IFS"
 IFS=$'\n'
 
 # Starting cluster loop
-for cluster_str in $(cat $VESTA/conf/dns-cluster.conf); do
+for cluster_str in $(grep SUSPENDED='no' $VESTA/conf/dns-cluster.conf); do
 
     # Get host values
     eval $cluster_str

+ 10 - 6
bin/v-delete-remote-dns-host

@@ -32,16 +32,20 @@ is_object_valid "../../conf/dns-cluster" 'HOST' "$host"
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Deleting domains
-$BIN/v-delete-remote-dns-domains $host >>/dev/null 2>&1
-
-# Disabling restart queue
 eval $(grep $host $VESTA/conf/dns-cluster.conf)
 case $TYPE in
     ssh) send_cmd="send_ssh_cmd" ;;
     *)  send_cmd="send_api_cmd" ;;
 esac
-$send_cmd v-add-cron-restart-job
+
+
+# Check host connection
+$send_cmd v-list-sys-config
+if [ $? -eq 0 ]; then
+    # Deleting domains
+    $BIN/v-delete-remote-dns-domains $host >>/dev/null 2>&1
+    $send_cmd v-add-cron-restart-job
+fi
 
 # Deleting server
 sed -i "/HOST='$host' /d" $VESTA/conf/dns-cluster.conf
@@ -67,7 +71,7 @@ fi
 #----------------------------------------------------------#
 
 # Logging
-log_history "deleted $type database server $host" '' 'admin'
+log_history "deleted remote dns server $host" '' 'admin'
 log_event "$OK" "$EVENT"
 
 exit