Skip to content

Commit d108cdf

Browse files
committed
remote dns host verification
1 parent c39f021 commit d108cdf

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

bin/v-delete-remote-dns-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ old_ifs="$IFS"
4949
IFS=$'\n'
5050

5151
# Starting cluster loop
52-
for cluster_str in $(cat $VESTA/conf/dns-cluster.conf); do
52+
for cluster_str in $(grep SUSPENDED='no' $VESTA/conf/dns-cluster.conf); do
5353

5454
# Get host values
5555
eval $cluster_str

bin/v-delete-remote-dns-host

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,20 @@ is_object_valid "../../conf/dns-cluster" 'HOST' "$host"
3232
# Action #
3333
#----------------------------------------------------------#
3434

35-
# Deleting domains
36-
$BIN/v-delete-remote-dns-domains $host >>/dev/null 2>&1
37-
38-
# Disabling restart queue
3935
eval $(grep $host $VESTA/conf/dns-cluster.conf)
4036
case $TYPE in
4137
ssh) send_cmd="send_ssh_cmd" ;;
4238
*) send_cmd="send_api_cmd" ;;
4339
esac
44-
$send_cmd v-add-cron-restart-job
40+
41+
42+
# Check host connection
43+
$send_cmd v-list-sys-config
44+
if [ $? -eq 0 ]; then
45+
# Deleting domains
46+
$BIN/v-delete-remote-dns-domains $host >>/dev/null 2>&1
47+
$send_cmd v-add-cron-restart-job
48+
fi
4549

4650
# Deleting server
4751
sed -i "/HOST='$host' /d" $VESTA/conf/dns-cluster.conf
@@ -67,7 +71,7 @@ fi
6771
#----------------------------------------------------------#
6872

6973
# Logging
70-
log_history "deleted $type database server $host" '' 'admin'
74+
log_history "deleted remote dns server $host" '' 'admin'
7175
log_event "$OK" "$EVENT"
7276

7377
exit

0 commit comments

Comments
 (0)