Merge pull request #2888 from jaapmarcus/fix/multiple-dns-clusters

Fix issue password and hash mixed up

bin/v-add-remote-dns-domain

@@ -59,7 +59,10 @@ fi
 
 IFS=$'\n'
 for cluster in $(grep "SUSPENDED='no'" $HESTIA/conf/dns-cluster.conf); do
-
+    
+    # Reset user, password and hash vars
+    clear_dns_cluster_settings
+    
     # Parsing remote dns host parameters
     parse_object_kv_list "$cluster"
 

bin/v-add-remote-dns-record

@@ -57,7 +57,10 @@ fi
 
 IFS=$'\n'
 for cluster in $(grep "SUSPENDED='no'" $HESTIA/conf/dns-cluster.conf); do
-
+    
+    # Reset user, password and hash vars
+    clear_dns_cluster_settings
+    
     # Parsing remote host parameters
     parse_object_kv_list "$cluster"
 

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

@@ -43,7 +43,10 @@ check_hestia_demo_mode
 
 IFS=$'\n'
 for cluster in $(grep "SUSPENDED='no'" $HESTIA/conf/dns-cluster.conf); do
-
+    
+    # Reset user, password and hash vars
+    clear_dns_cluster_settings
+    
     # Parsing remote host parameters
     parse_object_kv_list "$cluster"
 

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

@@ -45,7 +45,10 @@ check_hestia_demo_mode
 
 IFS=$'\n'
 for cluster in $(grep "SUSPENDED='no'" $HESTIA/conf/dns-cluster.conf); do
-
+    
+    # Reset user, password and hash vars
+    clear_dns_cluster_settings
+    
     # Parsing remote host parameters
     parse_object_kv_list "$cluster"
 

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

@@ -45,7 +45,10 @@ check_hestia_demo_mode
 
 IFS=$'\n'
 for cluster in $(grep "SUSPENDED='no'" $HESTIA/conf/dns-cluster.conf); do
-
+    
+    # Reset user, password and hash vars
+    clear_dns_cluster_settings
+    
     # Parsing remote host parameters
     parse_object_kv_list "$cluster"
 

bin/v-delete-remote-dns-domain

@@ -44,7 +44,10 @@ check_hestia_demo_mode
 # Starting cluster loop
 IFS=$'\n'
 for cluster in $(grep "SUSPENDED='no'" $HESTIA/conf/dns-cluster.conf); do
-
+    
+    # Reset user, password and hash vars
+    clear_dns_cluster_settings
+    
     # Parsing remote host parameters
     parse_object_kv_list "$cluster"
 

bin/v-delete-remote-dns-domains

@@ -47,7 +47,10 @@ fi
 
 # Starting cluster loop
 for cluster in $hosts; do
-
+    
+    # Reset user, password and hash vars
+    clear_dns_cluster_settings
+    
     # Parsing remote host parameters
     parse_object_kv_list "$cluster"
 

bin/v-delete-remote-dns-record

@@ -45,7 +45,10 @@ check_hestia_demo_mode
 # Starting cluster loop
 IFS=$'\n'
 for cluster in $(cat $HESTIA/conf/dns-cluster.conf); do
-
+    
+    # Reset user, password and hash vars
+    clear_dns_cluster_settings
+    
     # Parsing remote host parameters
     parse_object_kv_list "$cluster"
 

bin/v-sync-dns-cluster

@@ -47,7 +47,10 @@ fi
 
 # Starting cluster loop
 for cluster in $hosts; do
-
+    
+    # Reset user, password and hash vars
+    clear_dns_cluster_settings    
+    
     # Parsing host values
     parse_object_kv_list "$cluster"
 

func/remote.sh

@@ -128,6 +128,11 @@ remote_dns_health_check() {
 
     # Starting health-check
     for str in $(grep "SUSPENDED='no'" $HESTIA/conf/dns-cluster.conf); do
+        
+        # Reset user, password and hash vars
+        clear_dns_cluster_settings
+        
+        # Parsing host values
         parse_object_kv_list "$str"
 
         # Checking host connection
@@ -178,3 +183,9 @@ cluster_file() {
         api)    send_api_file $* ;;
     esac
 }
+
+clear_dns_cluster_settings (){
+    unset USER
+    unset PASSWORD
+    unset HASH
+}