From 91a804c1c8ef02f44785f9a8ff428b44f7dab737 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 28 Oct 2015 16:34:41 +0200 Subject: [PATCH] check_result function --- bin/v-add-cron-job | 6 ++---- bin/v-add-cron-reports | 4 +--- bin/v-add-cron-vesta-autoupdate | 6 ++---- bin/v-add-sys-ip | 8 ++------ bin/v-add-sys-quota | 17 +++------------ bin/v-add-user | 6 +----- bin/v-add-web-domain | 11 ++++------ bin/v-add-web-domain-alias | 14 ++++++------- bin/v-add-web-domain-backend | 4 +--- bin/v-add-web-domain-proxy | 6 ++---- bin/v-add-web-domain-ssl | 14 ++++++------- bin/v-change-cron-job | 6 ++---- bin/v-change-dns-domain-ip | 6 ++---- bin/v-change-dns-domain-soa | 6 ++---- bin/v-change-dns-domain-tpl | 6 ++---- bin/v-change-dns-domain-ttl | 6 ++---- bin/v-change-dns-record | 6 ++---- bin/v-change-dns-record-id | 6 ++---- bin/v-change-sys-ip-nat | 4 +--- bin/v-change-web-domain-backend-tpl | 11 ++++------ bin/v-change-web-domain-ip | 24 ++++++++++------------ bin/v-change-web-domain-proxy-tpl | 8 +++----- bin/v-change-web-domain-sslcert | 21 ++++++++++--------- bin/v-change-web-domain-sslhome | 21 ++++++++++--------- bin/v-change-web-domain-tpl | 6 ++---- bin/v-delete-cron-job | 6 ++---- bin/v-delete-cron-reports | 6 ++---- bin/v-delete-cron-vesta-autoupdate | 6 ++---- bin/v-delete-dns-domain | 6 ++---- bin/v-delete-dns-domains | 9 ++++---- bin/v-delete-dns-domains-src | 4 +--- bin/v-delete-dns-record | 6 ++---- bin/v-delete-sys-ip | 8 ++------ bin/v-delete-web-domain | 10 +++------ bin/v-delete-web-domain-alias | 14 ++++++------- bin/v-delete-web-domain-backend | 6 ++---- bin/v-delete-web-domain-proxy | 4 +--- bin/v-delete-web-domain-ssl | 14 ++++++------- bin/v-delete-web-domains | 10 +++------ bin/v-insert-dns-domain | 6 ++---- bin/v-insert-dns-record | 6 ++---- bin/v-insert-dns-records | 6 ++---- bin/v-rebuild-cron-jobs | 6 ++---- bin/v-rebuild-dns-domain | 6 ++---- bin/v-rebuild-dns-domains | 6 ++---- bin/v-rebuild-web-domains | 12 ++++------- bin/v-start-service | 8 ++------ bin/v-stop-service | 8 ++------ bin/v-suspend-cron-job | 6 ++---- bin/v-suspend-cron-jobs | 6 ++---- bin/v-suspend-dns-domain | 8 -------- bin/v-suspend-dns-domains | 8 -------- bin/v-suspend-dns-record | 8 -------- bin/v-suspend-user | 14 ++++--------- bin/v-suspend-web-domain | 30 +++++++++++++-------------- bin/v-suspend-web-domains | 12 +++++------ bin/v-unsuspend-cron-job | 6 ++---- bin/v-unsuspend-cron-jobs | 6 ++---- bin/v-unsuspend-dns-domain | 9 -------- bin/v-unsuspend-dns-domains | 8 -------- bin/v-unsuspend-dns-record | 8 -------- bin/v-unsuspend-user | 13 ++++-------- bin/v-unsuspend-web-domain | 32 ++++++++++++++--------------- bin/v-unsuspend-web-domains | 12 +++++------ bin/v-update-sys-ip | 4 +--- bin/v-update-sys-vesta | 12 ++--------- 66 files changed, 204 insertions(+), 404 deletions(-) diff --git a/bin/v-add-cron-job b/bin/v-add-cron-job index 75a396a09..b233f9a2d 100755 --- a/bin/v-add-cron-job +++ b/bin/v-add-cron-job @@ -72,11 +72,9 @@ sync_cron_jobs # Increasing cron value increase_user_value $user '$U_CRON_JOBS' -# Restart crond +# Restarting crond $BIN/v-restart-cron -if [ $? -ne 0 ]; then - exit $E_RESTART -fi +check_result $? "Cron restart failed" >/dev/null # Logging log_history "added cron job $job" diff --git a/bin/v-add-cron-reports b/bin/v-add-cron-reports index d38eaf4f8..81f75284f 100755 --- a/bin/v-add-cron-reports +++ b/bin/v-add-cron-reports @@ -46,9 +46,7 @@ sync_cron_jobs # Restart crond $BIN/v-restart-cron -if [ $? -ne 0 ]; then - exit $E_RESTART -fi +check_result $? "Cron restart failed" >/dev/null # Logging log_history "enabled cron reporting" diff --git a/bin/v-add-cron-vesta-autoupdate b/bin/v-add-cron-vesta-autoupdate index 84c041c40..be881d636 100755 --- a/bin/v-add-cron-vesta-autoupdate +++ b/bin/v-add-cron-vesta-autoupdate @@ -66,11 +66,9 @@ sync_cron_jobs # Increasing cron value increase_user_value $user '$U_CRON_JOBS' -# Restart crond +# Restarting crond $BIN/v-restart-cron -if [ $? -ne 0 ]; then - exit $E_RESTART -fi +check_result $? "Cron restart failed" >/dev/null # Logging log_history "added cron job $job" diff --git a/bin/v-add-sys-ip b/bin/v-add-sys-ip index 07fe7568d..79d607abc 100755 --- a/bin/v-add-sys-ip +++ b/bin/v-add-sys-ip @@ -161,16 +161,12 @@ fi # Restarting web server $BIN/v-restart-web -if [ $? -ne 0 ]; then - exit $E_RESTART -fi +check_result $? "Web restart failed" >/dev/null # Restarting proxy server if [ ! -z "$PROXY_SYSTEM" ]; then $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Proxy restart failed" >/dev/null fi # Restarting firewall diff --git a/bin/v-add-sys-quota b/bin/v-add-sys-quota index 9b35c59d9..10432a608 100755 --- a/bin/v-add-sys-quota +++ b/bin/v-add-sys-quota @@ -22,18 +22,11 @@ source $VESTA/conf/vesta.conf if [ ! -e "/usr/sbin/setquota" ]; then if [ -e "/etc/redhat-release" ]; then yum -y install quota >/dev/null 2>&1 - result=$? + check_result $? "quota package installation failed" $E_UPDATE else export DEBIAN_FRONTEND=noninteractive apt-get -y install quota >/dev/null 2>&1 - result=$? - fi - - # Checking installation status - if [ "$result" -ne 0 ]; then - echo "Error: quota package wasn't successfully installed" - log_event "$E_UPDATE" "$EVENT" - exit $E_UPDATE + check_result $? "quota package installation failed" $E_UPDATE fi fi @@ -66,11 +59,7 @@ chmod a+x /etc/cron.daily/quotacheck # Enabling fs quota if [ ! -z "$(quotaon -pa|grep " $mnt "|grep user|grep 'off')" ]; then quotaon $mnt - if [ $? -ne 0 ]; then - echo "Error: quota can't be enabled on $mnt partition" - log_event "$E_DISK" "$EVENT" - exit $E_DISK - fi + check_result $? "quota can't be enabled in $mtn" $E_DISK fi # Updating DISK_QUOTA value diff --git a/bin/v-add-user b/bin/v-add-user index 9afb1e9d0..06ae6aac6 100755 --- a/bin/v-add-user +++ b/bin/v-add-user @@ -58,11 +58,7 @@ shell=$(grep -w "$shell_conf" /etc/shells |head -n1) # Adding user /usr/sbin/useradd "$user" -s "$shell" -c "$email" -m -d "$HOMEDIR/$user" -if [ $? -ne 0 ]; then - echo "Error: user creation failed" - log_event "$E_INVALID" "$EVENT" - exit $E_INVALID -fi +check_result $? "user creation failed" $E_INVALID # Adding password echo "$user:$password" | /usr/sbin/chpasswd diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain index 58d48e55c..8924d148d 100755 --- a/bin/v-add-web-domain +++ b/bin/v-add-web-domain @@ -213,17 +213,14 @@ str="$str TIME='$TIME' DATE='$DATE'" # Registering domain echo "$str" >> $USER_DATA/web.conf -# Restart web server +# Restarting web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web restart failed" >/dev/null + if [ ! -z "$PROXY_SYSTEM" ]; then $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Proxy restart failed" >/dev/null fi fi diff --git a/bin/v-add-web-domain-alias b/bin/v-add-web-domain-alias index fefbdf9d2..2630190f5 100755 --- a/bin/v-add-web-domain-alias +++ b/bin/v-add-web-domain-alias @@ -75,7 +75,7 @@ if [ "$SSL" = 'yes' ]; then fi # Checking proxy -if [ ! -z "$PROXY" ]; then +if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl" conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" del_web_config @@ -100,16 +100,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$ALIAS' "$ALIAS" # Update counters increase_user_value "$user" '$U_WEB_ALIASES' -# Adding task to the vesta pipe +# Restarting web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web restart failed" >/dev/null - $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + check_result $? "Proxy restart failed" >/dev/null fi fi diff --git a/bin/v-add-web-domain-backend b/bin/v-add-web-domain-backend index c9f327a28..66273e816 100755 --- a/bin/v-add-web-domain-backend +++ b/bin/v-add-web-domain-backend @@ -67,9 +67,7 @@ cat $WEBTPL/$WEB_BACKEND/$template.tpl |\ # Restart backend server if [ "$restart" != 'no' ]; then $BIN/v-restart-web-backend - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web backend restart failed" >/dev/null fi # Logging diff --git a/bin/v-add-web-domain-proxy b/bin/v-add-web-domain-proxy index 7c3502c86..a64b3e308 100755 --- a/bin/v-add-web-domain-proxy +++ b/bin/v-add-web-domain-proxy @@ -100,12 +100,10 @@ fi update_object_value 'web' 'DOMAIN' "$domain" '$PROXY' "$PROXY" update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions" -# Restart web server +# Restarting web server if [ "$restart" != 'no' ]; then $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Proxy restart failed" >/dev/null fi log_history "enabled proxy support for $domain" diff --git a/bin/v-add-web-domain-ssl b/bin/v-add-web-domain-ssl index 946e454a5..a18ff90bd 100755 --- a/bin/v-add-web-domain-ssl +++ b/bin/v-add-web-domain-ssl @@ -97,7 +97,7 @@ if [ -z "$(grep "$conf" $web_conf)" ]; then fi # Checking proxy -if [ ! -z "$PROXY" ]; then +if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl" add_web_config @@ -124,16 +124,14 @@ increase_user_value "$user" '$U_WEB_SSL' update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME" update_object_value 'web' 'DOMAIN' "$domain" '$SSL' "yes" -# Restart web server +# Restarting web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web restart failed" >/dev/null - $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + check_result $? "Proxy restart failed" >/dev/null fi fi diff --git a/bin/v-change-cron-job b/bin/v-change-cron-job index 31fb7ad2f..23df67e88 100755 --- a/bin/v-change-cron-job +++ b/bin/v-change-cron-job @@ -64,11 +64,9 @@ sync_cron_jobs # Vesta # #----------------------------------------------------------# -# Restart crond +# Restarting crond $BIN/v-restart-cron -if [ $? -ne 0 ]; then - exit $E_RESTART -fi +check_result $? "Cron restart failed" >/dev/null # Logging log_history "changed cron job $job" diff --git a/bin/v-change-dns-domain-ip b/bin/v-change-dns-domain-ip index e2c9c24c7..deb511cf6 100755 --- a/bin/v-change-dns-domain-ip +++ b/bin/v-change-dns-domain-ip @@ -70,12 +70,10 @@ fi # Vesta # #----------------------------------------------------------# -# Restart named +# Restarting named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "DNS restart failed" >/dev/null fi # Logging diff --git a/bin/v-change-dns-domain-soa b/bin/v-change-dns-domain-soa index 9a819f205..dc281f77c 100755 --- a/bin/v-change-dns-domain-soa +++ b/bin/v-change-dns-domain-soa @@ -64,12 +64,10 @@ fi # Vesta # #----------------------------------------------------------# -# Restart named +# Restarting named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "DNS restart failed" >/dev/null fi # Logging diff --git a/bin/v-change-dns-domain-tpl b/bin/v-change-dns-domain-tpl index 52e149e99..1acad59bc 100755 --- a/bin/v-change-dns-domain-tpl +++ b/bin/v-change-dns-domain-tpl @@ -90,12 +90,10 @@ fi update_object_value 'dns' 'DOMAIN' "$domain" '$TPL' "$template" update_object_value 'dns' 'DOMAIN' "$domain" '$RECORDS' "$records" -# Restart named +# Restarting named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "DNS restart failed" >/dev/null fi # Logging diff --git a/bin/v-change-dns-domain-ttl b/bin/v-change-dns-domain-ttl index 109b243e6..a99dc7f3e 100755 --- a/bin/v-change-dns-domain-ttl +++ b/bin/v-change-dns-domain-ttl @@ -63,12 +63,10 @@ fi # Vesta # #----------------------------------------------------------# -# Restart named +# Restarting named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "DNS restart failed" >/dev/null fi # Logging diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record index 6614f2e0b..018aa55dd 100755 --- a/bin/v-change-dns-record +++ b/bin/v-change-dns-record @@ -96,12 +96,10 @@ fi # Vesta # #----------------------------------------------------------# -# Restart named +# Restarting named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "DNS restart failed" >/dev/null fi # Logging diff --git a/bin/v-change-dns-record-id b/bin/v-change-dns-record-id index 4324524a5..202eb9ee3 100755 --- a/bin/v-change-dns-record-id +++ b/bin/v-change-dns-record-id @@ -70,12 +70,10 @@ fi # Vesta # #----------------------------------------------------------# -# Restart named +# Restarting named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "DNS restart failed" >/dev/null fi # Logging diff --git a/bin/v-change-sys-ip-nat b/bin/v-change-sys-ip-nat index 8d34b8642..f6b448615 100755 --- a/bin/v-change-sys-ip-nat +++ b/bin/v-change-sys-ip-nat @@ -77,9 +77,7 @@ fi # Restart ftp server if [ "$restart" != 'no' ]; then $BIN/v-restart-ftp - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "FTP restart failed" >/dev/null fi # Logging diff --git a/bin/v-change-web-domain-backend-tpl b/bin/v-change-web-domain-backend-tpl index bce3d5f9f..b932bde2b 100755 --- a/bin/v-change-web-domain-backend-tpl +++ b/bin/v-change-web-domain-backend-tpl @@ -155,16 +155,13 @@ fi #----------------------------------------------------------# -# Restart web +# Restarting web if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web restart failed" >/dev/null + $BIN/v-restart-web-backend - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web backend restart failed" >/dev/null fi # Logging diff --git a/bin/v-change-web-domain-ip b/bin/v-change-web-domain-ip index 4ad36a5a5..e5b0e4c52 100755 --- a/bin/v-change-web-domain-ip +++ b/bin/v-change-web-domain-ip @@ -59,17 +59,17 @@ if [ "$SSL" = 'yes' ]; then fi # Checking proxy -if [ ! -z "$PROXY" ]; then +if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl" conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" replace_web_config -fi -# Checking SSL proxy -if [ "$SSL" = 'yes' ] && [ ! -z "$PROXY" ]; then - tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl" - conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" - replace_web_config + # Checking SSL proxy + if [ "$SSL" = 'yes' ] && [ ! -z "$PROXY" ]; then + tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl" + conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" + replace_web_config + fi fi @@ -87,13 +87,11 @@ update_object_value 'web' 'DOMAIN' "$domain" '$IP' "$3" # Restart web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "WEB restart failed" >/dev/null - $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + check_result $? "Proxy restart failed" >/dev/null fi fi diff --git a/bin/v-change-web-domain-proxy-tpl b/bin/v-change-web-domain-proxy-tpl index ca0b46433..bd03ca888 100755 --- a/bin/v-change-web-domain-proxy-tpl +++ b/bin/v-change-web-domain-proxy-tpl @@ -87,16 +87,14 @@ fi # Vesta # #----------------------------------------------------------# -# Update config +# Updating config update_object_value 'web' 'DOMAIN' "$domain" '$PROXY' "$PROXY" update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions" -# Restart web +# Restarting proxy if [ "$restart" != 'no' ]; then $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Proxy restart failed" >/dev/null fi # Logging diff --git a/bin/v-change-web-domain-sslcert b/bin/v-change-web-domain-sslcert index 7b6b77037..58a3c6f0f 100755 --- a/bin/v-change-web-domain-sslcert +++ b/bin/v-change-web-domain-sslcert @@ -1,6 +1,6 @@ #!/bin/bash # info: change domain ssl certificate -# options: USER DOMAIN SSL_DIR +# options: USER DOMAIN SSL_DIR [RESTART] # # The function changes SSL domain certificate and the key. If ca file present # it will be replaced as well. @@ -15,6 +15,7 @@ user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") ssl_dir=$3 +restart=$4 # Includes source $VESTA/func/main.sh @@ -26,7 +27,7 @@ source $VESTA/conf/vesta.conf # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'USER DOMAIN SSL_DIR' +check_args '3' "$#" 'USER DOMAIN SSL_DIR [RESTART]' validate_format 'user' 'domain' 'ssl_dir' is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' is_object_valid 'user' 'USER' "$user" @@ -69,15 +70,15 @@ fi # Vesta # #----------------------------------------------------------# -# Restart web server -$BIN/v-restart-web -if [ $? -ne 0 ]; then - exit $E_RESTART -fi +# Restarting web server +if [ "$restart" != 'no' ]; then + $BIN/v-restart-web + check_result $? "Web restart failed" >/dev/null -$BIN/v-restart-proxy -if [ $? -ne 0 ]; then - exit $E_RESTART + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + check_result $? "Proxy restart failed" >/dev/null + fi fi # Logging diff --git a/bin/v-change-web-domain-sslhome b/bin/v-change-web-domain-sslhome index 06128dc3e..277bd3527 100755 --- a/bin/v-change-web-domain-sslhome +++ b/bin/v-change-web-domain-sslhome @@ -10,6 +10,7 @@ user=$1 domain=$(idn -t --quiet -u "$2" ) domain_idn=$(idn -t --quiet -a "$domain") ssl_home=$3 +restart=$4 # Includes source $VESTA/func/main.sh @@ -21,7 +22,7 @@ source $VESTA/conf/vesta.conf # Verifications # #----------------------------------------------------------# -check_args '3' "$#" 'USER DOMAIN SSL_HOME' +check_args '3' "$#" 'USER DOMAIN SSL_HOME [RESTART]' validate_format 'user' 'domain' is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' is_object_valid 'user' 'USER' "$user" @@ -55,7 +56,7 @@ esac replace_web_config # Checking proxy config -if [ ! -z "$PROXY" ]; then +if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl" conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" replace_web_config @@ -69,15 +70,15 @@ fi # Update config update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME" -# Restart web server -$BIN/v-restart-web -if [ $? -ne 0 ]; then - exit $E_RESTART -fi +# Restarting web server +if [ "$restart" != 'no' ]; then + $BIN/v-restart-web + check_result $? "Web restart failed" >/dev/null -$BIN/v-restart-proxy -if [ $? -ne 0 ]; then - exit $E_RESTART + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + check_result $? "Proxy restart failed" >/dev/null + fi fi # Logging diff --git a/bin/v-change-web-domain-tpl b/bin/v-change-web-domain-tpl index a046220c5..56f7417db 100755 --- a/bin/v-change-web-domain-tpl +++ b/bin/v-change-web-domain-tpl @@ -93,12 +93,10 @@ fi # Changing tpl in config update_object_value 'web' 'DOMAIN' "$domain" '$TPL' "$template" -# Restart web +# Restarting web if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web restart failed" >/dev/null fi # Logging diff --git a/bin/v-delete-cron-job b/bin/v-delete-cron-job index f47bbc92c..54eecdb7e 100755 --- a/bin/v-delete-cron-job +++ b/bin/v-delete-cron-job @@ -52,11 +52,9 @@ sync_cron_jobs # Decreasing cron value decrease_user_value "$user" '$U_CRON_JOBS' -# Restart crond +# Restarting crond $BIN/v-restart-cron -if [ $? -ne 0 ]; then - exit $E_RESTART -fi +check_result $? "Restart restart failed" >/dev/null # Logging log_history "deleted cron job $job" diff --git a/bin/v-delete-cron-reports b/bin/v-delete-cron-reports index 247f17b13..c04a3bd02 100755 --- a/bin/v-delete-cron-reports +++ b/bin/v-delete-cron-reports @@ -44,11 +44,9 @@ sync_cron_jobs # Vesta # #----------------------------------------------------------# -# Restart crond +# Restarting crond $BIN/v-restart-cron -if [ $? -ne 0 ]; then - exit $E_RESTART -fi +check_result $? "Cron restart failed" >/dev/null # Logging log_history "disabled cron reporting" diff --git a/bin/v-delete-cron-vesta-autoupdate b/bin/v-delete-cron-vesta-autoupdate index ee5f74a6b..9e68e5197 100755 --- a/bin/v-delete-cron-vesta-autoupdate +++ b/bin/v-delete-cron-vesta-autoupdate @@ -51,11 +51,9 @@ sync_cron_jobs # Decreasing cron value decrease_user_value "$user" '$U_CRON_JOBS' -# Restart crond +# Restarting crond $BIN/v-restart-cron -if [ $? -ne 0 ]; then - exit $E_RESTART -fi +check_result $? "Cron restart failed" >/dev/null # Logging log_event "$OK" "$EVENT" diff --git a/bin/v-delete-dns-domain b/bin/v-delete-dns-domain index 18e41337c..eba97bbc3 100755 --- a/bin/v-delete-dns-domain +++ b/bin/v-delete-dns-domain @@ -71,12 +71,10 @@ rm -f $USER_DATA/dns/$domain.conf decrease_user_value "$user" '$U_DNS_DOMAINS' decrease_user_value "$user" '$U_DNS_RECORDS' "$records" -# Restart named +# Restarting named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns $restart - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Bind restart failed" >/dev/null fi # Logging diff --git a/bin/v-delete-dns-domains b/bin/v-delete-dns-domains index da97aa69e..5a3e86ae1 100755 --- a/bin/v-delete-dns-domains +++ b/bin/v-delete-dns-domains @@ -11,6 +11,7 @@ # Argument defenition user=$1 +restart=$2 # Includes source $VESTA/func/main.sh @@ -41,10 +42,10 @@ done # Vesta # #----------------------------------------------------------# -# Restart named -$BIN/v-restart-dns -if [ $? -ne 0 ]; then - exit $E_RESTART +# Restarting named +if [ "$restart" != 'no' ]; then + $BIN/v-restart-dns + check_result $? "Bind restart failed" >/dev/null fi # Logging diff --git a/bin/v-delete-dns-domains-src b/bin/v-delete-dns-domains-src index dd646b705..91abc238d 100755 --- a/bin/v-delete-dns-domains-src +++ b/bin/v-delete-dns-domains-src @@ -46,9 +46,7 @@ done # Restart named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Bind restart failed" >/dev/null fi # Logging diff --git a/bin/v-delete-dns-record b/bin/v-delete-dns-record index 6f8969b4e..c317da23e 100755 --- a/bin/v-delete-dns-record +++ b/bin/v-delete-dns-record @@ -69,12 +69,10 @@ records="$(wc -l $USER_DATA/dns/$domain.conf | cut -f1 -d ' ')" update_object_value 'dns' 'DOMAIN' "$domain" '$RECORDS' "$records" decrease_user_value "$user" '$U_DNS_RECORDS' -# Restart named +# Restarting named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Bind restart failed" >/dev/null fi # Logging diff --git a/bin/v-delete-sys-ip b/bin/v-delete-sys-ip index e9186fc7d..550251b23 100755 --- a/bin/v-delete-sys-ip +++ b/bin/v-delete-sys-ip @@ -123,16 +123,12 @@ fi # Restarting web server $BIN/v-restart-web -if [ $? -ne 0 ]; then - exit $E_RESTART -fi +check_result $? "Web restart failed" >/dev/null # Restarting proxy server if [ ! -z "$PROXY_SYSTEM" ]; then $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Proxy restart failed" >/dev/null fi # Restarting firewall diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain index b205917de..2a4f2844f 100755 --- a/bin/v-delete-web-domain +++ b/bin/v-delete-web-domain @@ -168,18 +168,14 @@ if [ "$SSL" = 'yes' ]; then decrease_user_value "$user" '$U_WEB_SSL' fi -# Restart web server +# Restarting web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web restart failed" >/dev/null if [ ! -z "$PROXY_SYSTEM" ]; then $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Proxy restart failed" >/dev/null fi fi diff --git a/bin/v-delete-web-domain-alias b/bin/v-delete-web-domain-alias index da6645ce5..714489d86 100755 --- a/bin/v-delete-web-domain-alias +++ b/bin/v-delete-web-domain-alias @@ -73,7 +73,7 @@ if [ "$SSL" = 'yes' ]; then fi # Checking proxy -if [ ! -z "$PROXY" ]; then +if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl" conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" del_web_config @@ -98,16 +98,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$ALIAS' "$ALIAS" # Update counters decrease_user_value "$user" '$U_WEB_ALIASES' -# Restart web server +# Restarting web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web restart failed" >/dev/null - $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + check_result $? "Proxy restart failed" >/dev/null fi fi diff --git a/bin/v-delete-web-domain-backend b/bin/v-delete-web-domain-backend index 286c3922b..06e501bdd 100755 --- a/bin/v-delete-web-domain-backend +++ b/bin/v-delete-web-domain-backend @@ -52,12 +52,10 @@ rm -f $pool/$backend.conf # Vesta # #----------------------------------------------------------# -# Restart backend server +# Restarting backend server if [ "$restart" != 'no' ]; then $BIN/v-restart-web-backend - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Backend restart failed" >/dev/null fi # Logging diff --git a/bin/v-delete-web-domain-proxy b/bin/v-delete-web-domain-proxy index 0aa73e150..2bd06ba52 100755 --- a/bin/v-delete-web-domain-proxy +++ b/bin/v-delete-web-domain-proxy @@ -87,9 +87,7 @@ fi # Restart proxy server if [ "$restart" != 'no' ]; then $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Proxy restart failed" >/dev/null fi # Logging diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl index 4d19fb37b..b9ec4e129 100755 --- a/bin/v-delete-web-domain-ssl +++ b/bin/v-delete-web-domain-ssl @@ -48,7 +48,7 @@ tpl_file="$WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$TPL.stpl" del_web_config # Checking proxy -if [ ! -z "$PROXY" ]; then +if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl" del_web_config @@ -89,16 +89,14 @@ fi # Decreasing domain value decrease_user_value "$user" '$U_WEB_SSL' -# Restart web server +# Restarting web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web restart failed" >/dev/null - $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + check_result $? "Proxy restart failed" >/dev/null fi fi diff --git a/bin/v-delete-web-domains b/bin/v-delete-web-domains index 824e72881..547461421 100755 --- a/bin/v-delete-web-domains +++ b/bin/v-delete-web-domains @@ -42,18 +42,14 @@ done # Vesta # #----------------------------------------------------------# -# Restart web server +# Restarting web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web restart failed" >/dev/null if [ ! -z "$PROXY_SYSTEM" ]; then $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Proxy restart failed" >/dev/null fi fi diff --git a/bin/v-insert-dns-domain b/bin/v-insert-dns-domain index fcd548ae7..00c2c53db 100755 --- a/bin/v-insert-dns-domain +++ b/bin/v-insert-dns-domain @@ -68,12 +68,10 @@ chmod 660 $USER_DATA/dns.conf # Vesta # #----------------------------------------------------------# -# Restart named +# Restarting named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns $restart - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Bind restart failed" >/dev/null fi # Logging diff --git a/bin/v-insert-dns-record b/bin/v-insert-dns-record index 25f87dbe5..d81db1893 100755 --- a/bin/v-insert-dns-record +++ b/bin/v-insert-dns-record @@ -44,12 +44,10 @@ echo "$data" >> $USER_DATA/dns/$domain.conf # Vesta # #----------------------------------------------------------# -# Restart named +# Restarting named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns $restart - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Bind restart failed" >/dev/null fi # Logging diff --git a/bin/v-insert-dns-records b/bin/v-insert-dns-records index 8fb2f55ce..ce61f5ad0 100755 --- a/bin/v-insert-dns-records +++ b/bin/v-insert-dns-records @@ -47,12 +47,10 @@ fi # Vesta # #----------------------------------------------------------# -# Restart named +# Restarting named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Bind restart failed" >/dev/null fi # Logging diff --git a/bin/v-rebuild-cron-jobs b/bin/v-rebuild-cron-jobs index 8fcd2da2d..c4bac3ed8 100755 --- a/bin/v-rebuild-cron-jobs +++ b/bin/v-rebuild-cron-jobs @@ -40,12 +40,10 @@ sync_cron_jobs # Vesta # #----------------------------------------------------------# -# Restart crond +# Restarting crond if [ "$restart" != 'no' ]; then $BIN/v-restart-cron - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Cron restart failed" >/dev/null fi # Logging diff --git a/bin/v-rebuild-dns-domain b/bin/v-rebuild-dns-domain index 732e14eda..f21fad08b 100755 --- a/bin/v-rebuild-dns-domain +++ b/bin/v-rebuild-dns-domain @@ -81,12 +81,10 @@ update_user_value "$user" '$U_DNS_DOMAINS' "$user_domains" update_user_value "$user" '$U_DNS_RECORDS' "$user_records" update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns" -# Restart named +# Restarting named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns "$restart" - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Bind restart failed" >/dev/null fi # Logging diff --git a/bin/v-rebuild-dns-domains b/bin/v-rebuild-dns-domains index b2c4aba39..83c4d6f0c 100755 --- a/bin/v-rebuild-dns-domains +++ b/bin/v-rebuild-dns-domains @@ -82,12 +82,10 @@ update_user_value "$user" '$U_DNS_DOMAINS' "$user_domains" update_user_value "$user" '$U_DNS_RECORDS' "$user_records" update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns" -# Restart named +# Restarting named if [ "$restart" != 'no' ]; then $BIN/v-restart-dns - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Bind restart failed" >/dev/null fi # Logging diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains index b0dfeb9d4..1afb36de3 100755 --- a/bin/v-rebuild-web-domains +++ b/bin/v-rebuild-web-domains @@ -159,18 +159,14 @@ update_user_value "$user" '$U_WEB_DOMAINS' "$user_domains" update_user_value "$user" '$U_WEB_SSL' "$user_ssl" update_user_value "$user" '$U_WEB_ALIASES' "$user_aliases" -# Restart web server +# Restarting web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web restart failed" >/dev/null - if [ ! -z "$PROXY_SYSTEM" ];then + if [ ! -z "$PROXY_SYSTEM" ]; then $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Proxy restart failed" >/dev/null fi fi diff --git a/bin/v-start-service b/bin/v-start-service index 970c7ca0a..100b82881 100755 --- a/bin/v-start-service +++ b/bin/v-start-service @@ -29,14 +29,10 @@ check_args '1' "$#" 'SERVICE' if [ "$service" != 'iptables' ]; then service $service start >/dev/null 2>&1 - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "$service start failed" $E_RESTART else $BIN/v-update-firewall - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "$service start failed" $E_RESTART fi diff --git a/bin/v-stop-service b/bin/v-stop-service index 7355a113c..b05f8744d 100755 --- a/bin/v-stop-service +++ b/bin/v-stop-service @@ -29,14 +29,10 @@ check_args '1' "$#" 'SERVICE' if [ "$service" != 'iptables' ]; then service $service stop >/dev/null 2>&1 - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "$service stop failed" $E_RESTART else $BIN/v-stop-firewall - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "$service stop failed" $E_RESTART fi diff --git a/bin/v-suspend-cron-job b/bin/v-suspend-cron-job index 977b77aba..19124b80b 100755 --- a/bin/v-suspend-cron-job +++ b/bin/v-suspend-cron-job @@ -46,12 +46,10 @@ sync_cron_jobs # Vesta # #----------------------------------------------------------# -# Restart crond +# Restarting crond if [ "$restart" != 'no' ]; then $BIN/v-restart-cron - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Cron restart failed" >/dev/null fi # Logging diff --git a/bin/v-suspend-cron-jobs b/bin/v-suspend-cron-jobs index 993989a5f..7de5a1aad 100755 --- a/bin/v-suspend-cron-jobs +++ b/bin/v-suspend-cron-jobs @@ -41,12 +41,10 @@ done # Vesta # #----------------------------------------------------------# -# Restart crond +# Restarting crond if [ "$restart" != 'no' ]; then $BIN/v-restart-cron - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Cron restart failed" >/dev/null fi # Logging diff --git a/bin/v-suspend-dns-domain b/bin/v-suspend-dns-domain index 9d6c0906c..38eb76d36 100755 --- a/bin/v-suspend-dns-domain +++ b/bin/v-suspend-dns-domain @@ -46,14 +46,6 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$SUSPENDED' 'yes' sed -i "s/SUSPENDED='no'/SUSPENDED='yes'/g" $USER_DATA/dns/$domain.conf increase_user_value "$user" '$SUSPENDED_DNS' -# Restart named -#if [ "$restart" != 'no' ]; then -# $BIN/v-restart-dns -# if [ $? -ne 0 ]; then -# exit $E_RESTART -# fi -#fi - # Logging log_event "$OK" "$EVENT" diff --git a/bin/v-suspend-dns-domains b/bin/v-suspend-dns-domains index f46cc39e6..34d41dcb3 100755 --- a/bin/v-suspend-dns-domains +++ b/bin/v-suspend-dns-domains @@ -42,14 +42,6 @@ done # Vesta # #----------------------------------------------------------# -# Restart dns server -#if [ "$restart" != 'no' ]; then -# $BIN/v-restart-dns -# if [ $? -ne 0 ]; then -# exit $E_RESTART -# fi -#fi - # Logging log_event "$OK" "$EVENT" diff --git a/bin/v-suspend-dns-record b/bin/v-suspend-dns-record index 7ac0a3093..f98025f91 100755 --- a/bin/v-suspend-dns-record +++ b/bin/v-suspend-dns-record @@ -63,14 +63,6 @@ fi # Vesta # #----------------------------------------------------------# -# Restart named -#if [ "$restart" != 'no' ]; then -# $BIN/v-restart-dns -# if [ $? -ne 0 ]; then -# exit $E_RESTART -# fi -#fi - # Logging log_event "$OK" "$EVENT" diff --git a/bin/v-suspend-user b/bin/v-suspend-user index 1f15dedc5..99e732271 100755 --- a/bin/v-suspend-user +++ b/bin/v-suspend-user @@ -73,22 +73,16 @@ fi # Vesta # #----------------------------------------------------------# -# Restart web server +# Restarting system services if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web restart failed" >/dev/null $BIN/v-restart-dns - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "DNS restart failed" >/dev/null $BIN/v-restart-cron - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Cron restart failed" >/dev/null fi # Changing suspend value diff --git a/bin/v-suspend-web-domain b/bin/v-suspend-web-domain index 5eac5cdaa..d98ed633f 100755 --- a/bin/v-suspend-web-domain +++ b/bin/v-suspend-web-domain @@ -63,41 +63,39 @@ if [ "$SSL" = 'yes' ]; then fi # Checking proxy -if [ ! -z "$PROXY" ]; then +if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl" conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" del_web_config add_web_config + # Checking proxy SSL + if [ "$SSL" = 'yes' ]; then + tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl" + conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" + del_web_config + add_web_config + fi fi -# Checking proxy SSL -if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ]; then - tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl" - conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" - del_web_config - add_web_config -fi #----------------------------------------------------------# # Vesta # #----------------------------------------------------------# -# Update config +# Updating config update_object_value 'web' 'DOMAIN' "$domain" '$SUSPENDED' 'yes' increase_user_value "$user" '$SUSPENDED_WEB' -# Restart web server +# Restarting web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web restart failed" >/dev/null - $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + check_result $? "Proxy restart failed" >/dev/null fi fi diff --git a/bin/v-suspend-web-domains b/bin/v-suspend-web-domains index fc4bf125c..5ff752bf7 100755 --- a/bin/v-suspend-web-domains +++ b/bin/v-suspend-web-domains @@ -42,16 +42,14 @@ done # Vesta # #----------------------------------------------------------# -# Restart web server +# Restarting web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web restart failed" >/dev/null - $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + check_result $? "Proxy restart failed" >/dev/null fi fi diff --git a/bin/v-unsuspend-cron-job b/bin/v-unsuspend-cron-job index 39af81b16..c152d011f 100755 --- a/bin/v-unsuspend-cron-job +++ b/bin/v-unsuspend-cron-job @@ -46,12 +46,10 @@ sync_cron_jobs # Vesta # #----------------------------------------------------------# -# Restart crond +# Restarting crond if [ "$restart" != 'no' ]; then $BIN/v-restart-cron - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Cron restart failed" >/dev/null fi # Logging diff --git a/bin/v-unsuspend-cron-jobs b/bin/v-unsuspend-cron-jobs index e1d3e686b..f767ce612 100755 --- a/bin/v-unsuspend-cron-jobs +++ b/bin/v-unsuspend-cron-jobs @@ -41,12 +41,10 @@ done # Vesta # #----------------------------------------------------------# -# Restart crond +# Restarting crond if [ "$restart" != 'no' ]; then $BIN/v-restart-cron - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Cron restart failed" >/dev/null fi # Logging diff --git a/bin/v-unsuspend-dns-domain b/bin/v-unsuspend-dns-domain index 25253590c..1e5dcfac9 100755 --- a/bin/v-unsuspend-dns-domain +++ b/bin/v-unsuspend-dns-domain @@ -47,15 +47,6 @@ update_object_value 'dns' 'DOMAIN' "$domain" '$SUSPENDED' 'no' decrease_user_value "$user" '$SUSPENDED_DNS' sed -i "s/SUSPENDED='yes'/SUSPENDED='no'/g" $USER_DATA/dns/$domain.conf - -# Restart named -#if [ "$restart" != 'no' ]; then -# $BIN/v-restart-dns -# if [ $? -ne 0 ]; then -# exit $E_RESTART -# fi -#fi - # Logging log_event "$OK" "$EVENT" diff --git a/bin/v-unsuspend-dns-domains b/bin/v-unsuspend-dns-domains index 177770e04..7d184b4a2 100755 --- a/bin/v-unsuspend-dns-domains +++ b/bin/v-unsuspend-dns-domains @@ -42,14 +42,6 @@ done # Vesta # #----------------------------------------------------------# -# Restart dns server -#if [ "$restart" != 'no' ]; then -# $BIN/v-restart-dns -# if [ $? -ne 0 ]; then -# exit $E_RESTART -# fi -#fi - # Logging log_event "$OK" "$EVENT" diff --git a/bin/v-unsuspend-dns-record b/bin/v-unsuspend-dns-record index 52fb15fb1..38c9e58e3 100755 --- a/bin/v-unsuspend-dns-record +++ b/bin/v-unsuspend-dns-record @@ -62,14 +62,6 @@ fi # Vesta # #----------------------------------------------------------# -# Restart named -#if [ "$restart" != 'no' ]; then -# $BIN/v-restart-dns -# if [ $? -ne 0 ]; then -# exit $E_RESTART -# fi -#fi - # Logging log_event "$OK" "$EVENT" diff --git a/bin/v-unsuspend-user b/bin/v-unsuspend-user index 6173092a5..f2a44f5e6 100755 --- a/bin/v-unsuspend-user +++ b/bin/v-unsuspend-user @@ -76,21 +76,16 @@ fi update_user_value "$user" '$SUSPENDED' 'no' decrease_user_value 'admin' '$SUSPENDED_USERS' +# Restarting system services if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web restart failed" >/dev/null $BIN/v-restart-dns - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "DNS restart failed" >/dev/null $BIN/v-restart-cron - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Cron restart failed" >/dev/null fi # Logging diff --git a/bin/v-unsuspend-web-domain b/bin/v-unsuspend-web-domain index ad189c9aa..f0baea176 100755 --- a/bin/v-unsuspend-web-domain +++ b/bin/v-unsuspend-web-domain @@ -52,7 +52,7 @@ upd_web_domain_values del_web_config add_web_config -# Check SSL +# Checking SSL if [ "$SSL" = 'yes' ]; then tpl_file="$WEBTPL/$WEB_SYSTEM/$WEB_BACKEND/$TPL.stpl" conf="$HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf" @@ -61,19 +61,19 @@ if [ "$SSL" = 'yes' ]; then fi # Checking proxy -if [ ! -z "$PROXY" ]; then +if [ ! -z "$PROXY_SYSTEM" ] && [ ! -z "$PROXY" ]; then tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.tpl" conf="$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" del_web_config add_web_config -fi -# Checking SSL proxy -if [ ! -z "$PROXY" ] && [ "$SSL" = 'yes' ]; then - tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl" - conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" - del_web_config - add_web_config + # Checking proxy SSL + if [ "$SSL" = 'yes' ]; then + tpl_file="$WEBTPL/$PROXY_SYSTEM/$PROXY.stpl" + conf="$HOMEDIR/$user/conf/web/s$PROXY_SYSTEM.conf" + del_web_config + add_web_config + fi fi @@ -81,20 +81,18 @@ fi # Vesta # #----------------------------------------------------------# -# Update config +# Updating config update_object_value 'web' 'DOMAIN' "$domain" '$SUSPENDED' 'no' decrease_user_value "$user" '$SUSPENDED_WEB' -# Restart web erver +# Restarting web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web restart failed" >/dev/null - $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + check_result $? "Proxy restart failed" >/dev/null fi fi diff --git a/bin/v-unsuspend-web-domains b/bin/v-unsuspend-web-domains index 15c860260..c5ae0c032 100755 --- a/bin/v-unsuspend-web-domains +++ b/bin/v-unsuspend-web-domains @@ -43,16 +43,14 @@ done # Vesta # #----------------------------------------------------------# -# Restart web server +# Restarting web server if [ "$restart" != 'no' ]; then $BIN/v-restart-web - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "Web restart failed" >/dev/null - $BIN/v-restart-proxy - if [ $? -ne 0 ]; then - exit $E_RESTART + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy + check_result $? "Proxy restart failed" >/dev/null fi fi diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip index 5e6d48729..0c152e600 100755 --- a/bin/v-update-sys-ip +++ b/bin/v-update-sys-ip @@ -87,9 +87,7 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then $BIN/v-rebuild-dns-domains $user no done $BIN/v-restart-dns - if [ $? -ne 0 ]; then - exit $E_RESTART - fi + check_result $? "dns restart failed" >/dev/null fi # No further comparation is needed diff --git a/bin/v-update-sys-vesta b/bin/v-update-sys-vesta index d47fb9f06..8fec0ce73 100755 --- a/bin/v-update-sys-vesta +++ b/bin/v-update-sys-vesta @@ -42,11 +42,7 @@ if [ -e "/etc/redhat-release" ]; then # Update vesta package $yum update $package > /dev/null 2>&1 - if [ $? -ne 0 ]; then - echo "Error: $package update failed" - log_event "$E_UPDATE" "$EVENT" - exit $E_UPDATE - fi + check_result $? "$pacakge update failed" $E_UPDATE else # Update repo apt-get update -o Dir::Etc::sourcelist="sources.list.d/vesta.list" \ @@ -54,11 +50,7 @@ else # Update vesta package apt-get install $package -qq > /dev/null 2>&1 - if [ $? -ne 0 ]; then - echo "Error: $package update failed" - log_event "$E_UPDATE" "$EVENT" - exit $E_UPDATE - fi + check_result $? "$pacakge update failed" $E_UPDATE fi