github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 13:01:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

is_domain_new fix

Browse source
This commit is contained in:
Serghey Rodin 2016-06-25 11:07:45 +03:00
commit 516b54fe3f
4 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v-add-dns-domain
View file

@ -50,7 +50,7 @@ is_format_valid 'user' 'domain' 'ip'
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"
is_domain_new 'dns' is_domain_new 'dns' "$domain"
is_package_full 'DNS_DOMAINS' is_package_full 'DNS_DOMAINS'
template=$(get_user_value '$DNS_TEMPLATE') template=$(get_user_value '$DNS_TEMPLATE')
is_dns_template_valid $template is_dns_template_valid $template

2
bin/v-add-mail-domain
View file

@ -47,7 +47,7 @@ is_format_valid 'user' 'domain' 'antispam' 'antivirus' 'dkim' 'dkim_size'
is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM' is_system_enabled "$MAIL_SYSTEM" 'MAIL_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"
is_domain_new 'mail' is_domain_new 'mail' "$domain"
is_package_full 'MAIL_DOMAINS' is_package_full 'MAIL_DOMAINS'

15
bin/v-add-web-domain
View file

@ -55,13 +55,17 @@ source $VESTA/conf/vesta.conf
#----------------------------------------------------------# #----------------------------------------------------------#
is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
check_args '2' "$#" 'USER DOMAIN [IP] [ALIASES] [PROXY_EXTENTIONS] [RESTART]' check_args '2' "$#" 'USER DOMAIN [IP] [RESTART] [ALIASES] [PROXY_EXTENTIONS]'
is_format_valid 'user' 'domain' 'aliases' 'ip' 'proxy_ext' is_format_valid 'user' 'domain' 'aliases' 'ip' 'proxy_ext'
is_object_valid 'user' 'USER' "$user" is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user"
is_package_full 'WEB_DOMAINS' 'WEB_ALIASES' is_package_full 'WEB_DOMAINS' 'WEB_ALIASES'
is_domain_new 'web' "$domain,$aliases" is_domain_new 'web' "$domain,$aliases"
if [ ! -z "$ip" ]; then
is_ip_valid "$ip" "$user" is_ip_valid "$ip" "$user"
else
get_user_ip
fi
#----------------------------------------------------------# #----------------------------------------------------------#
@ -102,12 +106,19 @@ chmod 751 $HOMEDIR/$user/web/$domain $HOMEDIR/$user/web/$domain/*
chmod 551 $HOMEDIR/$user/web/$domain/stats $HOMEDIR/$user/web/$domain/logs chmod 551 $HOMEDIR/$user/web/$domain/stats $HOMEDIR/$user/web/$domain/logs
# Addding PHP-FPM backend # Addding PHP-FPM backend
if [ ! -z "$BACKEND_SYSTEM" ]; then if [ ! -z "$WEB_BACKEND" ]; then
if [ -z "$BACKEND_TEMPLATE" ]; then if [ -z "$BACKEND_TEMPLATE" ]; then
BACKEND_TEMPLATE='default'
if [ -z "$(grep BACKEND_TEMPLATE $USER_DATA/user.conf)" ]; then
sed -i "s/^DNS_TEMPL/BACKEND_TEMPLATE='default'\nDNS_TEMPL/g" \
$USER_DATA/user.conf
else
update_user_value "$user" '$BACKEND_TEMPLATE' "default" update_user_value "$user" '$BACKEND_TEMPLATE' "default"
fi fi
fi
$BIN/v-add-web-domain-backend "$user" "$domain" $BACKEND_TEMPLATE $BIN/v-add-web-domain-backend "$user" "$domain" $BACKEND_TEMPLATE
check_result $? "Backend error" >/dev/null check_result $? "Backend error" >/dev/null
prepare_web_backend
fi fi
# Preparing domain aliases # Preparing domain aliases

2
bin/v-insert-dns-domain
View file

@ -34,7 +34,7 @@ is_object_unsuspended 'user' 'USER' "$user"
eval $data eval $data
domain="$DOMAIN" domain="$DOMAIN"
if [ "$flush" = 'no' ]; then if [ "$flush" = 'no' ]; then
is_domain_new 'dns' is_domain_new 'dns' $domain
fi fi