Просмотр исходного кода

minor fixes for dns-cluster sync

Serghey Rodin 12 лет назад
Родитель
Сommit
66706582f9
2 измененных файлов с 3 добавлено и 2 удалено
  1. 2 1
      bin/v-delete-remote-dns-host
  2. 1 1
      bin/v-delete-remote-dns-record

+ 2 - 1
bin/v-delete-remote-dns-host

@@ -15,6 +15,7 @@ host=$1
 # Includes
 # Includes
 source $VESTA/conf/vesta.conf
 source $VESTA/conf/vesta.conf
 source $VESTA/func/main.sh
 source $VESTA/func/main.sh
+source $VESTA/func/remote.sh
 
 
 
 
 #----------------------------------------------------------#
 #----------------------------------------------------------#
@@ -35,7 +36,7 @@ is_object_valid "../../conf/dns-cluster" 'HOST' "$host"
 $BIN/v-delete-remote-dns-domains $host >>/dev/null 2>&1
 $BIN/v-delete-remote-dns-domains $host >>/dev/null 2>&1
 
 
 # Disabling restart queue
 # Disabling restart queue
-eval $(grep $host $VESTA/conf/dns-cluster)
+eval $(grep $host $VESTA/conf/dns-cluster.conf)
 case $TYPE in
 case $TYPE in
     ssh) send_cmd="send_ssh_cmd" ;;
     ssh) send_cmd="send_ssh_cmd" ;;
     *)  send_cmd="send_api_cmd" ;;
     *)  send_cmd="send_api_cmd" ;;

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

@@ -92,7 +92,7 @@ done
 
 
 # Update pipe
 # Update pipe
 pipe="$VESTA/data/queue/dns-cluster.pipe"
 pipe="$VESTA/data/queue/dns-cluster.pipe"
-str=$(grep -n "$SCRIPT $1 $2 &3$" $pipe | cut -f1 -d: | head -n1)
+str=$(grep -n "$SCRIPT $1 $2 $3$" $pipe | cut -f1 -d: | head -n1)
 if [ ! -z "$str" ]; then
 if [ ! -z "$str" ]; then
     sed -i "$str d"  $pipe
     sed -i "$str d"  $pipe
 fi
 fi