Преглед на файлове

skip nonexisting domains

Serghey Rodin преди 12 години
родител
ревизия
0f7c02ee4e
променени са 1 файла, в които са добавени 11 реда и са изтрити 2 реда
  1. 11 2
      bin/v-add-remote-dns-domain

+ 11 - 2
bin/v-add-remote-dns-domain

@@ -26,8 +26,6 @@ source $VESTA/conf/vesta.conf
 check_args '2' "$#" 'USER DOMAIN'
 check_args '2' "$#" 'USER DOMAIN'
 validate_format 'user' 'domain'
 validate_format 'user' 'domain'
 is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
 is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
-is_object_valid 'user' 'USER' "$user"
-is_object_valid 'dns' 'DOMAIN' "$domain"
 
 
 if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then
 if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then
     echo "Error: dns-cluster.conf doesn't exist"
     echo "Error: dns-cluster.conf doesn't exist"
@@ -47,6 +45,17 @@ fi
 #                       Action                             #
 #                       Action                             #
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
+# Check domain existance
+check_local_domain=$(grep "DOMAIN='$domain'" $USER_DATA/dns.conf 2>/dev/null)
+if [ -z "$check_local_domain" ]; then
+    pipe="$VESTA/data/queue/dns-cluster.pipe"
+    str=$(grep -n "$SCRIPT $1 $2$" $pipe | cut -f1 -d: | head -n1)
+    if [ ! -z "$str" ]; then
+        sed -i "$str d"  $pipe
+    fi
+    exit
+fi
+
 old_ifs="$IFS"
 old_ifs="$IFS"
 IFS=$'\n'
 IFS=$'\n'