From ca81632e8296676860ddf0ed533d01ce345865b9 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Fri, 31 May 2013 12:46:32 +0300
Subject: [PATCH] full path in queue

---
 bin/v-add-dns-domain        |  2 +-
 bin/v-add-dns-record        |  2 +-
 bin/v-change-dns-domain-exp |  2 +-
 bin/v-change-dns-domain-ip  |  2 +-
 bin/v-change-dns-domain-soa |  2 +-
 bin/v-change-dns-domain-tpl |  2 +-
 bin/v-change-dns-domain-ttl |  2 +-
 bin/v-change-dns-record     |  2 +-
 bin/v-change-dns-record-id  |  2 +-
 bin/v-delete-dns-domain     |  2 +-
 bin/v-delete-dns-record     |  2 +-
 bin/v-insert-dns-domain     | 10 ++++++++--
 bin/v-rebuild-dns-domain    |  2 +-
 13 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/bin/v-add-dns-domain b/bin/v-add-dns-domain
index 4a32939af..f384f160f 100755
--- a/bin/v-add-dns-domain
+++ b/bin/v-add-dns-domain
@@ -130,7 +130,7 @@ chown root:named $conf
 
 # dns-cluster
 if [ ! -z "$DNS_CLUSTER" ]; then
-    cmd="v-add-remote-dns-domain $user $domain"
+    cmd="$BIN/v-add-remote-dns-domain $user $domain"
     echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
 fi
 
diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record
index 266a7c3a7..d03b90100 100755
--- a/bin/v-add-dns-record
+++ b/bin/v-add-dns-record
@@ -75,7 +75,7 @@ update_domain_zone
 
 # dns-cluster
 if [ ! -z "$DNS_CLUSTER" ]; then
-    cmd="v-add-remote-dns-record $user $domain $id"
+    cmd="$BIN/v-add-remote-dns-record $user $domain $id"
     echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
 fi
 
diff --git a/bin/v-change-dns-domain-exp b/bin/v-change-dns-domain-exp
index 24f8a3e67..88dedaaaa 100755
--- a/bin/v-change-dns-domain-exp
+++ b/bin/v-change-dns-domain-exp
@@ -43,7 +43,7 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$EXP' "$exp"
 
 # dns-cluster
 if [ ! -z "$DNS_CLUSTER" ]; then
-    cmd="v-change-remote-dns-domain-exp $user $domain"
+    cmd="$BIN/v-change-remote-dns-domain-exp $user $domain"
     echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
 fi
 
diff --git a/bin/v-change-dns-domain-ip b/bin/v-change-dns-domain-ip
index 942e95a65..a7f50cd6e 100755
--- a/bin/v-change-dns-domain-ip
+++ b/bin/v-change-dns-domain-ip
@@ -54,7 +54,7 @@ update_domain_zone
 
 # dns-cluster
 if [ ! -z "$DNS_CLUSTER" ]; then
-    cmd="v-add-remote-dns-domain $user $domain"
+    cmd="$BIN/v-add-remote-dns-domain $user $domain"
     echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
 fi
 
diff --git a/bin/v-change-dns-domain-soa b/bin/v-change-dns-domain-soa
index 4ba3a5ebf..6937547c7 100755
--- a/bin/v-change-dns-domain-soa
+++ b/bin/v-change-dns-domain-soa
@@ -48,7 +48,7 @@ update_domain_zone
 
 # dns-cluster
 if [ ! -z "$DNS_CLUSTER" ]; then
-    cmd="v-change-remote-dns-domain-soa $user $domain"
+    cmd="$BIN/v-change-remote-dns-domain-soa $user $domain"
     echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
 fi
 
diff --git a/bin/v-change-dns-domain-tpl b/bin/v-change-dns-domain-tpl
index 05808a6f0..c18f76751 100755
--- a/bin/v-change-dns-domain-tpl
+++ b/bin/v-change-dns-domain-tpl
@@ -72,7 +72,7 @@ update_domain_zone
 
 # dns-cluster
 if [ ! -z "$DNS_CLUSTER" ]; then
-    cmd="v-add-remote-dns-domain $user $domain"
+    cmd="$BIN/v-add-remote-dns-domain $user $domain"
     echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
 fi
 
diff --git a/bin/v-change-dns-domain-ttl b/bin/v-change-dns-domain-ttl
index 9a777ff22..46854463c 100755
--- a/bin/v-change-dns-domain-ttl
+++ b/bin/v-change-dns-domain-ttl
@@ -47,7 +47,7 @@ update_domain_zone
 
 # dns-cluster
 if [ ! -z "$DNS_CLUSTER" ]; then
-    cmd="v-change-remote-dns-domain-ttl $user $domain"
+    cmd="$BIN/v-change-remote-dns-domain-ttl $user $domain"
     echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
 fi
 
diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record
index 42f06766d..9f08af68b 100755
--- a/bin/v-change-dns-record
+++ b/bin/v-change-dns-record
@@ -65,7 +65,7 @@ update_domain_zone
 
 # dns-cluster
 if [ ! -z "$DNS_CLUSTER" ]; then
-    cmd="v-add-remote-dns-domain $user $domain"
+    cmd="$BIN/v-add-remote-dns-domain $user $domain"
     echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
 fi
 
diff --git a/bin/v-change-dns-record-id b/bin/v-change-dns-record-id
index 8fd85f9f8..f492b4ebc 100755
--- a/bin/v-change-dns-record-id
+++ b/bin/v-change-dns-record-id
@@ -54,7 +54,7 @@ update_domain_zone
 
 # dns-cluster
 if [ ! -z "$DNS_CLUSTER" ]; then
-    cmd="v-add-remote-dns-domain $user $domain"
+    cmd="$BIN/v-add-remote-dns-domain $user $domain"
     echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
 fi
 
diff --git a/bin/v-delete-dns-domain b/bin/v-delete-dns-domain
index d67d9ce12..e1d47568a 100755
--- a/bin/v-delete-dns-domain
+++ b/bin/v-delete-dns-domain
@@ -46,7 +46,7 @@ rm -f $HOMEDIR/$user/conf/dns/$domain.db
 
 # dns-cluster
 if [ ! -z "$DNS_CLUSTER" ]; then
-    cmd="v-delete-remote-dns-domain $user $domain"
+    cmd="$BIN/v-delete-remote-dns-domain $user $domain"
     echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
 fi
 
diff --git a/bin/v-delete-dns-record b/bin/v-delete-dns-record
index 7998cf1b6..43b10344b 100755
--- a/bin/v-delete-dns-record
+++ b/bin/v-delete-dns-record
@@ -47,7 +47,7 @@ update_domain_zone
 
 # dns-cluster
 if [ ! -z "$DNS_CLUSTER" ]; then
-    cmd="v-delete-remote-dns-record $user $domain $id"
+    cmd="$BIN/v-delete-remote-dns-record $user $domain $id"
     echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
 fi
 
diff --git a/bin/v-insert-dns-domain b/bin/v-insert-dns-domain
index ca7fa97ed..11308d3d4 100755
--- a/bin/v-insert-dns-domain
+++ b/bin/v-insert-dns-domain
@@ -1,6 +1,6 @@
 #!/bin/bash
 # info: insert dns domain
-# options: USER DATA [SRC] [FLUSH]
+# options: USER DATA [SRC] [FLUSH] [RESTART]
 #
 # The function inserts raw record to the dns.conf
 
@@ -14,6 +14,7 @@ user=$1
 data=$2
 src=$3
 flush=$4
+restart=$5
 
 # Includes
 source $VESTA/conf/vesta.conf
@@ -24,7 +25,7 @@ source $VESTA/func/main.sh
 #                    Verifications                         #
 #----------------------------------------------------------#
 
-check_args '2' "$#" 'USER DATA [SRC]'
+check_args '2' "$#" 'USER DATA [SRC] [RESTART]'
 validate_format 'user' 'data'
 is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
@@ -56,6 +57,11 @@ fi
 #                       Vesta                              #
 #----------------------------------------------------------#
 
+# Restart named
+if [ "$restart" != 'no' ]; then
+    $BIN/v-restart-dns $restart
+fi
+
 # Logging
 log_event "$OK" "$EVENT"
 
diff --git a/bin/v-rebuild-dns-domain b/bin/v-rebuild-dns-domain
index 7bb342ddc..a53171bbd 100755
--- a/bin/v-rebuild-dns-domain
+++ b/bin/v-rebuild-dns-domain
@@ -68,7 +68,7 @@ update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns"
 
 # Restart named
 if [ "$restart" != 'no' ]; then
-    $BIN/v-restart-dns "$EVENT"
+    $BIN/v-restart-dns "$restart"
 fi
 
 # Logging