mirror of
https://github.com/myvesta/vesta
synced 2025-08-19 21:04:07 -07:00
full path in queue
This commit is contained in:
parent
46e2527c5a
commit
ca81632e82
13 changed files with 20 additions and 14 deletions
|
@ -130,7 +130,7 @@ chown root:named $conf
|
||||||
|
|
||||||
# dns-cluster
|
# dns-cluster
|
||||||
if [ ! -z "$DNS_CLUSTER" ]; then
|
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
|
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -75,7 +75,7 @@ update_domain_zone
|
||||||
|
|
||||||
# dns-cluster
|
# dns-cluster
|
||||||
if [ ! -z "$DNS_CLUSTER" ]; then
|
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
|
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$EXP' "$exp"
|
||||||
|
|
||||||
# dns-cluster
|
# dns-cluster
|
||||||
if [ ! -z "$DNS_CLUSTER" ]; then
|
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
|
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ update_domain_zone
|
||||||
|
|
||||||
# dns-cluster
|
# dns-cluster
|
||||||
if [ ! -z "$DNS_CLUSTER" ]; then
|
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
|
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@ update_domain_zone
|
||||||
|
|
||||||
# dns-cluster
|
# dns-cluster
|
||||||
if [ ! -z "$DNS_CLUSTER" ]; then
|
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
|
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -72,7 +72,7 @@ update_domain_zone
|
||||||
|
|
||||||
# dns-cluster
|
# dns-cluster
|
||||||
if [ ! -z "$DNS_CLUSTER" ]; then
|
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
|
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ update_domain_zone
|
||||||
|
|
||||||
# dns-cluster
|
# dns-cluster
|
||||||
if [ ! -z "$DNS_CLUSTER" ]; then
|
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
|
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ update_domain_zone
|
||||||
|
|
||||||
# dns-cluster
|
# dns-cluster
|
||||||
if [ ! -z "$DNS_CLUSTER" ]; then
|
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
|
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ update_domain_zone
|
||||||
|
|
||||||
# dns-cluster
|
# dns-cluster
|
||||||
if [ ! -z "$DNS_CLUSTER" ]; then
|
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
|
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@ rm -f $HOMEDIR/$user/conf/dns/$domain.db
|
||||||
|
|
||||||
# dns-cluster
|
# dns-cluster
|
||||||
if [ ! -z "$DNS_CLUSTER" ]; then
|
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
|
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ update_domain_zone
|
||||||
|
|
||||||
# dns-cluster
|
# dns-cluster
|
||||||
if [ ! -z "$DNS_CLUSTER" ]; then
|
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
|
echo "$cmd" >> $VESTA/data/queue/dns-cluster.pipe
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# info: insert dns domain
|
# info: insert dns domain
|
||||||
# options: USER DATA [SRC] [FLUSH]
|
# options: USER DATA [SRC] [FLUSH] [RESTART]
|
||||||
#
|
#
|
||||||
# The function inserts raw record to the dns.conf
|
# The function inserts raw record to the dns.conf
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@ user=$1
|
||||||
data=$2
|
data=$2
|
||||||
src=$3
|
src=$3
|
||||||
flush=$4
|
flush=$4
|
||||||
|
restart=$5
|
||||||
|
|
||||||
# Includes
|
# Includes
|
||||||
source $VESTA/conf/vesta.conf
|
source $VESTA/conf/vesta.conf
|
||||||
|
@ -24,7 +25,7 @@ source $VESTA/func/main.sh
|
||||||
# Verifications #
|
# Verifications #
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
||||||
check_args '2' "$#" 'USER DATA [SRC]'
|
check_args '2' "$#" 'USER DATA [SRC] [RESTART]'
|
||||||
validate_format 'user' 'data'
|
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"
|
||||||
|
@ -56,6 +57,11 @@ fi
|
||||||
# Vesta #
|
# Vesta #
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
||||||
|
# Restart named
|
||||||
|
if [ "$restart" != 'no' ]; then
|
||||||
|
$BIN/v-restart-dns $restart
|
||||||
|
fi
|
||||||
|
|
||||||
# Logging
|
# Logging
|
||||||
log_event "$OK" "$EVENT"
|
log_event "$OK" "$EVENT"
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,7 @@ update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns"
|
||||||
|
|
||||||
# Restart named
|
# Restart named
|
||||||
if [ "$restart" != 'no' ]; then
|
if [ "$restart" != 'no' ]; then
|
||||||
$BIN/v-restart-dns "$EVENT"
|
$BIN/v-restart-dns "$restart"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Logging
|
# Logging
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue