github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-21 05:44:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolved conflicts

Browse source
This commit is contained in:
myvesta 2024-04-14 22:28:39 +02:00
commit 0d026da7f3
151 changed files with 5312 additions and 407 deletions
Download patch file Download diff file Expand all files Collapse all files

33
bin/v-restore-user
View file

@ -37,6 +37,7 @@ fi
source $VESTA/func/main.sh
source $VESTA/func/domain.sh
source $VESTA/func/ip.sh
source $VESTA/func/ipv6.sh
source $VESTA/func/db.sh
source $VESTA/func/rebuild.sh
source $VESTA/conf/vesta.conf
@ -353,6 +354,15 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then
old_ip=$IP
IP=$ip
fi
# Checking ip address
check_ipv6=$(is_ipv6_valid $IP6 $user)
if [ ! -z "$check_ipv6" ]; then
local_ipv6=''
get_user_ipv6 $user
old_ipv6=$IP6
IP6=$ipv6
fi
# Checking web template
check_tpl=$(is_web_template_valid $TPL)
@ -514,11 +524,22 @@ if [ "$dns" != 'no' ] && [ ! -z "$DNS_SYSTEM" ]; then
# Checking ip address
check_ip=$(is_ip_valid $IP $user)
if [ ! -z "$check_ip" ]; then
local_ip=''
local_ipv6=''
get_user_ip $user
old_ip=$IP
IP=$ip
fi
# Checking ipv6 address
check_ipv6=$(is_ipv6_valid $IP6 $user)
if [ ! -z "$check_ipv6" ]; then
local_ip6=''
get_user_ipv6 $user
old_ipv6=$IP6
IP6=$ipv6
else
old_ipv6=''
fi
# Checking dns template
check_tpl=$(is_dns_template_valid $TPL)
@ -527,7 +548,7 @@ if [ "$dns" != 'no' ] && [ ! -z "$DNS_SYSTEM" ]; then
fi
# Concatenating dns.conf keys
str="DOMAIN='$domain' IP='$IP' TPL='$TPL' TTL='$TTL' EXP='$EXP'"
str="DOMAIN='$domain' IP='$IP' IP6='$IP6' TPL='$TPL' TTL='$TTL' EXP='$EXP'"
str="$str SOA='$SOA' RECORDS='$RECORDS' SUSPENDED='no'"
str="$str TIME='$(date +%T)' DATE='$(date +%F)'"
echo $str >> $USER_DATA/dns.conf
@ -535,6 +556,14 @@ if [ "$dns" != 'no' ] && [ ! -z "$DNS_SYSTEM" ]; then
# Restoring dns records
cp -f $tmpdir/dns/$domain/vesta/$domain.conf $USER_DATA/dns/
if [ -z "$old_ipv6" ] && [ ! -z "$IP6" ]; then
time_n_date=$(date +'%T %F')
time=$(echo "$time_n_date" |cut -f 1 -d \ )
date=$(echo "$time_n_date" |cut -f 2 -d \ )
ip=""
ipv6="$IP6"
add_dns_config_records
fi
# Rebuilding dns domain
rebuild_dns_domain_conf