diff --git a/bin/v-add-dns-domain b/bin/v-add-dns-domain index d1db42e2..09d5b571 100755 --- a/bin/v-add-dns-domain +++ b/bin/v-add-dns-domain @@ -50,7 +50,7 @@ is_format_valid 'user' 'domain' 'ip' is_system_enabled "$DNS_SYSTEM" 'DNS_SYSTEM' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" -is_domain_new 'dns' +is_domain_new 'dns' "$domain" is_package_full 'DNS_DOMAINS' template=$(get_user_value '$DNS_TEMPLATE') is_dns_template_valid $template diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain index 62858ef3..eedc02d9 100755 --- a/bin/v-add-mail-domain +++ b/bin/v-add-mail-domain @@ -47,7 +47,7 @@ is_format_valid 'user' 'domain' 'antispam' 'antivirus' 'dkim' 'dkim_size' is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" -is_domain_new 'mail' +is_domain_new 'mail' "$domain" is_package_full 'MAIL_DOMAINS' diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain index a3e0253e..fb24bdd1 100755 --- a/bin/v-add-web-domain +++ b/bin/v-add-web-domain @@ -55,13 +55,17 @@ source $VESTA/conf/vesta.conf #----------------------------------------------------------# 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_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" is_package_full 'WEB_DOMAINS' 'WEB_ALIASES' is_domain_new 'web' "$domain,$aliases" -is_ip_valid "$ip" "$user" +if [ ! -z "$ip" ]; then + 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 # Addding PHP-FPM backend -if [ ! -z "$BACKEND_SYSTEM" ]; then +if [ ! -z "$WEB_BACKEND" ]; then if [ -z "$BACKEND_TEMPLATE" ]; then - update_user_value "$user" '$BACKEND_TEMPLATE' "default" + 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" + fi fi $BIN/v-add-web-domain-backend "$user" "$domain" $BACKEND_TEMPLATE check_result $? "Backend error" >/dev/null + prepare_web_backend fi # Preparing domain aliases diff --git a/bin/v-insert-dns-domain b/bin/v-insert-dns-domain index 4c445e15..0a83c205 100755 --- a/bin/v-insert-dns-domain +++ b/bin/v-insert-dns-domain @@ -34,7 +34,7 @@ is_object_unsuspended 'user' 'USER' "$user" eval $data domain="$DOMAIN" if [ "$flush" = 'no' ]; then - is_domain_new 'dns' + is_domain_new 'dns' $domain fi