check if dns-sync is already running

bin/v-add-remote-dns-domain

@@ -14,6 +14,7 @@ user=$1
 domain=$2
 flush=$3
 
+
 # Includes
 source $VESTA/func/main.sh
 source $VESTA/func/remote.sh
@@ -27,12 +28,7 @@ source $VESTA/conf/vesta.conf
 check_args '2' "$#" 'USER DOMAIN [FLUSH]'
 is_format_valid 'user' 'domain'
 is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
-if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then
-    check_result $E_NOTEXIST "dns-cluster.conf doesn't exist"
-fi
-if [ "$(ps auxf |grep -v grep |grep $BIN/$SCRIPT |wc -l)" -gt 2 ]; then
-    check_result $E_EXISTS "another sync process already running"
-fi
+is_procces_running
 remote_dns_health_check
 
 

bin/v-add-remote-dns-record

@@ -29,12 +29,7 @@ is_format_valid 'user' 'domain' 'id'
 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
-    check_result $E_NOTEXIST "dns-cluster.conf doesn't exist"
-fi
-if [ "$(ps auxf |grep -v grep |grep $BIN/$SCRIPT |wc -l)" -gt 2 ]; then
-    check_result $E_EXISTS "another sync process already running"
-fi
+is_procces_running
 remote_dns_health_check
 
 

bin/v-add-web-domain-proxy

@@ -12,8 +12,7 @@
 
 # Argument definition
 user=$1
-domain=$(idn -t --quiet -u "$2" )
-domain_idn=$(idn -t --quiet -a "$domain")
+domain=$2
 template=$3
 default_extentions="jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,\
 exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,html,htm"
@@ -51,6 +50,7 @@ is_proxy_template_valid $template
 
 # Defining domain parameters
 get_domain_values 'web'
+prepare_web_domain_values
 local_ip=$(get_real_ip $IP)
 
 # Preparing domain values for the template substitution

bin/v-change-remote-dns-domain-exp

@@ -28,12 +28,7 @@ is_format_valid 'user' 'domain'
 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
-    check_result $E_NOTEXIST "dns-cluster.conf doesn't exist"
-fi
-if [ "$(ps auxf |grep -v grep |grep $BIN/$SCRIPT |wc -l)" -gt 2 ]; then
-    check_result $E_EXISTS "another sync process already running"
-fi
+is_procces_running
 remote_dns_health_check
 
 

bin/v-change-remote-dns-domain-soa

@@ -28,12 +28,7 @@ is_format_valid 'user' 'domain'
 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
-    check_result 1 $E_NOTEXIST "dns-cluster.conf doesn't exist"
-fi
-if [ "$(ps auxf |grep -v grep |grep $VESTA/bin/$SCRIPT |wc -l)" -gt 2 ]; then
-    check_result 1 $E_EXISTS "another sync process already running"
-fi
+is_procces_running
 remote_dns_health_check
 
 

bin/v-change-remote-dns-domain-ttl

@@ -28,12 +28,7 @@ is_format_valid 'user' 'domain'
 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
-    check_result $E_NOTEXIST "dns-cluster.conf doesn't exist"
-fi
-if [ "$(ps auxf |grep -v grep |grep $BIN/$SCRIPT |wc -l)" -gt 2 ]; then
-    check_result $E_EXISTS "another sync process already running"
-fi
+is_procces_running
 remote_dns_health_check
 
 

bin/v-delete-remote-dns-domain

@@ -26,12 +26,7 @@ source $VESTA/conf/vesta.conf
 check_args '2' "$#" 'USER DOMAIN'
 is_format_valid 'user' 'domain'
 is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
-if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then
-    check_result $E_NOTEXIST "dns-cluster.conf doesn't exist"
-fi
-if [ "$(ps auxf |grep -v grep |grep $BIN/$SCRIPT |wc -l)" -gt 2 ]; then
-    check_result $E_EXISTS "another sync process already running"
-fi
+is_procces_running
 remote_dns_health_check
 
 

bin/v-delete-remote-dns-domains

@@ -22,12 +22,7 @@ source $VESTA/conf/vesta.conf
 #----------------------------------------------------------#
 
 is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
-if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then
-    check_result $E_NOTEXIST "dns-cluster.conf doesn't exist"
-fi
-if [ "$(ps auxf |grep -v grep |grep $BIN/$SCRIPT |wc -l)" -gt 2 ]; then
-    check_result $E_EXISTS "another sync process already running"
-fi
+is_procces_running
 remote_dns_health_check
 
 

bin/v-delete-remote-dns-record

@@ -27,12 +27,7 @@ source $VESTA/conf/vesta.conf
 check_args '3' "$#" 'USER DOMAIN ID'
 is_format_valid 'user' 'domain' 'id'
 is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
-if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then
-    check_result $E_NOTEXIST "dns-cluster.conf doesn't exist"
-fi
-if [ "$(ps auxf |grep -v grep |grep $BIN/$SCRIPT |wc -l)" -gt 2 ]; then
-    check_result $E_EXISTS "another sync process already running"
-fi
+is_procces_running
 remote_dns_health_check
 
 

bin/v-sync-dns-cluster

@@ -22,12 +22,7 @@ source $VESTA/conf/vesta.conf
 #----------------------------------------------------------#
 
 is_system_enabled "$DNS_CLUSTER" 'DNS_CLUSTER'
-if [ ! -e "$VESTA/conf/dns-cluster.conf" ]; then
-    check_result $E_NOTEXIST "dns-cluster.conf doesn't exist"
-fi
-if [ "$(ps auxf |grep -v grep |grep $BIN/$SCRIPT |wc -l)" -gt 2 ]; then
-    check_result $E_EXISTS "another sync process already running"
-fi
+is_procces_running
 remote_dns_health_check 'no_email'
 
 

func/remote.sh

@@ -1,3 +1,13 @@
+# Check if script already running or not
+is_procces_running() {
+    SCRIPT=$(basename $0)
+    for pid in $(pidof -x $SCRIPT); do
+        if [ $pid != $$ ]; then
+            check_result $E_INUSE "$SCRIPT is already running"
+        fi
+    done
+}
+
 send_api_cmd() {
     answer=$(curl -s -k \
         --data-urlencode "user=$USER" \