Merge pull request #192 from estratos/master

Fix Error Page Not Available on Success #191
This commit is contained in:
Serghey Rodin 2014-07-31 11:30:22 +03:00
commit 3c47527189

View file

@ -9,7 +9,7 @@
# Variable&Function # # Variable&Function #
#----------------------------------------------------------# #----------------------------------------------------------#
# Argument defenition # Argument definition
user=$1 user=$1
domain=$2 domain=$2
ip=$3 ip=$3
@ -48,29 +48,31 @@ if [ -z "$ip" ]; then
fi fi
# Web domain # Web domain
# Do Not restart at this point, will loose connection from API calls
if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
$BIN/v-add-web-domain $user $domain $ip $BIN/v-add-web-domain $user $domain $ip no
retun_code=$? return_code=$?
fi fi
# Proxy support # Proxy support
if [ ! -z "$PROXY_SYSTEM" ] && [ "$retun_code" -eq 0 ]; then # Do Not restart at this point, will loose connection from API calls
$BIN/v-add-web-domain-proxy $user $domain if [ ! -z "$PROXY_SYSTEM" ] && [ "$return_code" -eq 0 ]; then
$BIN/v-add-web-domain-proxy $user $domain '' '' no
fi fi
# DNS domain # DNS domain
if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
if [ "$retun_code" -eq 0 ]; then if [ "$return_code" -eq 0 ]; then
$BIN/v-add-dns-domain $user $domain $ip $BIN/v-add-dns-domain $user $domain $ip
retun_code=$? return_code=$?
fi fi
fi fi
# Mail domain # Mail domain
if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
if [ "$retun_code" -eq 0 ]; then if [ "$return_code" -eq 0 ]; then
$BIN/v-add-mail-domain $user $domain $BIN/v-add-mail-domain $user $domain
retun_code=$? return_code=$?
fi fi
fi fi
@ -79,4 +81,4 @@ fi
# Vesta # # Vesta #
#----------------------------------------------------------# #----------------------------------------------------------#
exit $retun_code exit $return_code