From d108cdfc91fd50670591be6a9bf68ddf7e762895 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Mon, 14 Oct 2013 20:49:15 +0300
Subject: [PATCH] remote dns host verification

---
 bin/v-delete-remote-dns-domain |  2 +-
 bin/v-delete-remote-dns-host   | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/bin/v-delete-remote-dns-domain b/bin/v-delete-remote-dns-domain
index 326d3c69..9d5bb154 100755
--- a/bin/v-delete-remote-dns-domain
+++ b/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
diff --git a/bin/v-delete-remote-dns-host b/bin/v-delete-remote-dns-host
index 968e02f7..e82cad68 100755
--- a/bin/v-delete-remote-dns-host
+++ b/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