Sync only uniq domains

This commit is contained in:
Serghey Rodin 2013-10-07 21:32:55 +03:00
commit f087a7402a
2 changed files with 27 additions and 12 deletions

View file

@ -19,6 +19,7 @@ restart=$5
# 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/domain.sh
#----------------------------------------------------------# #----------------------------------------------------------#
@ -30,6 +31,9 @@ validate_format 'user' 'data'
is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM' is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM'
is_object_valid 'user' 'USER' "$user" is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user"
eval $data
domain="$DOMAIN"
is_domain_new 'dns'
#----------------------------------------------------------# #----------------------------------------------------------#
@ -37,7 +41,6 @@ is_object_unsuspended 'user' 'USER' "$user"
#----------------------------------------------------------# #----------------------------------------------------------#
# Prepare values for the insert # Prepare values for the insert
eval $data
dns_rec="DOMAIN='$DOMAIN' IP='$IP' TPL='$TPL' TTL='$TTL' EXP='$EXP'" dns_rec="DOMAIN='$DOMAIN' IP='$IP' TPL='$TPL' TTL='$TTL' EXP='$EXP'"
dns_rec="$dns_rec SOA='$SOA' SRC='$src' RECORDS='$RECORDS'" dns_rec="$dns_rec SOA='$SOA' SRC='$src' RECORDS='$RECORDS'"
dns_rec="$dns_rec SUSPENDED='$SUSPENDED' TIME='$TIME' DATE='$DATE'" dns_rec="$dns_rec SUSPENDED='$SUSPENDED' TIME='$TIME' DATE='$DATE'"

View file

@ -111,6 +111,9 @@ for cluster_str in $hosts; do
done done
# Clean source records # Clean source records
if [ ! -z "$verbose" ]; then
echo "STATUS: Wiping dns domains"
fi
$send_cmd v-delete-dns-domains-src $DNS_USER $HOSTNAME no $send_cmd v-delete-dns-domains-src $DNS_USER $HOSTNAME no
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Error: $TYPE connection to $HOST failed (cleanup)" echo "Error: $TYPE connection to $HOST failed (cleanup)"
@ -125,9 +128,13 @@ for cluster_str in $hosts; do
for str in $(cat $VESTA/data/users/$user/dns.conf); do for str in $(cat $VESTA/data/users/$user/dns.conf); do
eval $str eval $str
if [ ! -z "$verbose" ]; then if [ ! -z "$verbose" ]; then
echo "DOMAIN: $DOMAIN" echo "DOMAIN: $DOMAIN index"
fi fi
$send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME $send_cmd v-insert-dns-domain $DNS_USER "$str" $HOSTNAME
if [ $? -eq 0 ]; then
if [ ! -z "$verbose" ]; then
echo "DOMAIN: $DOMAIN records"
fi
# Sync record # Sync record
if [ "$TYPE" = 'ssh' ]; then if [ "$TYPE" = 'ssh' ]; then
@ -141,6 +148,11 @@ for cluster_str in $hosts; do
$DNS_USER $DOMAIN "$str" $DNS_USER $DOMAIN "$str"
done done
fi fi
else
if [ ! -z "$verbose" ]; then
echo "DOMAIN: $DOMAIN skiping records (not uniq)"
fi
fi
done done
done done