From f7bd734faadf071d2417d3209a2785e9e7fc5dd0 Mon Sep 17 00:00:00 2001 From: estratos Date: Wed, 30 Jul 2014 02:52:52 -0600 Subject: [PATCH 1/3] Fix Error Page Not Available on Success #191 script was calling CLI v-add-web-domain and restarting by default so scripts calling API will loose connection during HTTP Request --- bin/v-add-domain | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/v-add-domain b/bin/v-add-domain index 32e56214..9000e72d 100755 --- a/bin/v-add-domain +++ b/bin/v-add-domain @@ -48,14 +48,16 @@ if [ -z "$ip" ]; then fi # Web domain +# Not restart at this point will loose conecction from API calls 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=$? fi # Proxy support +# Not restart at this point will loose conecction from API calls if [ ! -z "$PROXY_SYSTEM" ] && [ "$retun_code" -eq 0 ]; then - $BIN/v-add-web-domain-proxy $user $domain + $BIN/v-add-web-domain-proxy $user $domain '' '' no fi # DNS domain From f1062c344863806c2fc1d2e3da2c6d583e2df169 Mon Sep 17 00:00:00 2001 From: estratos Date: Wed, 30 Jul 2014 03:05:14 -0600 Subject: [PATCH 2/3] Spelling correction some spelling corrections --- bin/v-add-domain | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/v-add-domain b/bin/v-add-domain index 9000e72d..1e56e2a6 100755 --- a/bin/v-add-domain +++ b/bin/v-add-domain @@ -9,7 +9,7 @@ # Variable&Function # #----------------------------------------------------------# -# Argument defenition +# Argument definition user=$1 domain=$2 ip=$3 @@ -48,31 +48,31 @@ if [ -z "$ip" ]; then fi # Web domain -# Not restart at this point will loose conecction from API calls +# Do Not restart at this point will loose conecction from API calls if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then $BIN/v-add-web-domain $user $domain $ip no - retun_code=$? + return_code=$? fi # Proxy support -# Not restart at this point will loose conecction from API calls -if [ ! -z "$PROXY_SYSTEM" ] && [ "$retun_code" -eq 0 ]; then +# Do Not restart at this point will loose conecction from API calls +if [ ! -z "$PROXY_SYSTEM" ] && [ "$return_code" -eq 0 ]; then $BIN/v-add-web-domain-proxy $user $domain '' '' no fi # DNS domain 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 - retun_code=$? + return_code=$? fi fi # Mail domain 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 - retun_code=$? + return_code=$? fi fi @@ -81,4 +81,4 @@ fi # Vesta # #----------------------------------------------------------# -exit $retun_code +exit $return_code From 76a56e33249f8e87a971d0c4a535f09ff04f6f57 Mon Sep 17 00:00:00 2001 From: estratos Date: Wed, 30 Jul 2014 03:17:26 -0600 Subject: [PATCH 3/3] Spelling Spelling Correction to comments --- bin/v-add-domain | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/v-add-domain b/bin/v-add-domain index 1e56e2a6..66fd2664 100755 --- a/bin/v-add-domain +++ b/bin/v-add-domain @@ -48,14 +48,14 @@ if [ -z "$ip" ]; then fi # Web domain -# Do Not restart at this point will loose conecction from API calls +# Do Not restart at this point, will loose connection from API calls if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then $BIN/v-add-web-domain $user $domain $ip no return_code=$? fi # Proxy support -# Do Not restart at this point will loose conecction from API calls +# Do Not restart at this point, will loose connection from API calls if [ ! -z "$PROXY_SYSTEM" ] && [ "$return_code" -eq 0 ]; then $BIN/v-add-web-domain-proxy $user $domain '' '' no fi