From 4614df59a74ddc73d883e9a7a77f5176c83e2051 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 19 Feb 2014 23:12:23 +0200 Subject: [PATCH] E_RESTART should be a variable --- bin/v-add-cron-job | 2 +- bin/v-add-cron-report | 2 +- bin/v-add-dns-domain | 2 +- bin/v-add-dns-record | 2 +- bin/v-add-sys-ip | 4 ++-- bin/v-add-web-domain | 2 +- bin/v-add-web-domain-alias | 4 ++-- bin/v-add-web-domain-proxy | 2 +- bin/v-add-web-domain-ssl | 4 ++-- bin/v-change-cron-job | 2 +- bin/v-change-dns-domain-ip | 2 +- bin/v-change-dns-domain-soa | 2 +- bin/v-change-dns-domain-tpl | 2 +- bin/v-change-dns-domain-ttl | 2 +- bin/v-change-dns-record | 2 +- bin/v-change-dns-record-id | 2 +- bin/v-change-sys-ip-nat | 2 +- bin/v-change-web-domain-ip | 4 ++-- bin/v-change-web-domain-proxy-tpl | 2 +- bin/v-change-web-domain-sslcert | 4 ++-- bin/v-change-web-domain-sslhome | 4 ++-- bin/v-change-web-domain-tpl | 2 +- bin/v-delete-cron-job | 2 +- bin/v-delete-cron-reports | 2 +- bin/v-delete-dns-domain | 2 +- bin/v-delete-dns-domains | 2 +- bin/v-delete-dns-domains-src | 2 +- bin/v-delete-dns-record | 2 +- bin/v-delete-domain | 6 +++--- bin/v-delete-sys-ip | 4 ++-- bin/v-delete-web-domain | 4 ++-- bin/v-delete-web-domain-alias | 4 ++-- bin/v-delete-web-domain-proxy | 2 +- bin/v-delete-web-domain-ssl | 4 ++-- bin/v-delete-web-domains | 4 ++-- bin/v-insert-dns-domain | 2 +- bin/v-insert-dns-record | 2 +- bin/v-insert-dns-records | 2 +- bin/v-rebuild-cron-jobs | 2 +- bin/v-rebuild-dns-domain | 2 +- bin/v-rebuild-dns-domains | 2 +- bin/v-rebuild-web-domains | 4 ++-- bin/v-restore-user | 8 ++++---- bin/v-suspend-cron-job | 2 +- bin/v-suspend-cron-jobs | 2 +- bin/v-suspend-dns-domain | 2 +- bin/v-suspend-dns-domains | 2 +- bin/v-suspend-dns-record | 2 +- bin/v-suspend-user | 6 +++--- bin/v-suspend-web-domain | 4 ++-- bin/v-suspend-web-domains | 4 ++-- bin/v-unsuspend-cron-job | 2 +- bin/v-unsuspend-cron-jobs | 2 +- bin/v-unsuspend-dns-domain | 2 +- bin/v-unsuspend-dns-domains | 2 +- bin/v-unsuspend-dns-record | 2 +- bin/v-unsuspend-user | 6 +++--- bin/v-unsuspend-web-domain | 4 ++-- bin/v-unsuspend-web-domains | 4 ++-- bin/v-update-sys-ip | 6 +++--- bin/v-update-web-templates | 4 ++-- 61 files changed, 89 insertions(+), 89 deletions(-) diff --git a/bin/v-add-cron-job b/bin/v-add-cron-job index cd20d26a..b6b2dd57 100755 --- a/bin/v-add-cron-job +++ b/bin/v-add-cron-job @@ -75,7 +75,7 @@ increase_user_value $user '$U_CRON_JOBS' # Restart crond $BIN/v-restart-cron if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi # Logging diff --git a/bin/v-add-cron-report b/bin/v-add-cron-report index 8a3ded27..d38eaf4f 100755 --- a/bin/v-add-cron-report +++ b/bin/v-add-cron-report @@ -47,7 +47,7 @@ sync_cron_jobs # Restart crond $BIN/v-restart-cron if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi # Logging diff --git a/bin/v-add-dns-domain b/bin/v-add-dns-domain index a415959b..d1c4e43c 100755 --- a/bin/v-add-dns-domain +++ b/bin/v-add-dns-domain @@ -163,7 +163,7 @@ increase_user_value "$user" '$U_DNS_RECORDS' "$records" if [ "$restart" != 'no' ]; then $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record index 6fd66d68..78fcfbc6 100755 --- a/bin/v-add-dns-record +++ b/bin/v-add-dns-record @@ -108,7 +108,7 @@ increase_user_value "$user" '$U_DNS_RECORDS' if [ "$restart" != 'no' ]; then $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-add-sys-ip b/bin/v-add-sys-ip index 4ac749e3..810adce6 100755 --- a/bin/v-add-sys-ip +++ b/bin/v-add-sys-ip @@ -153,11 +153,11 @@ fi # Restart web server $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi # Logging diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain index 898d1e15..628c3757 100755 --- a/bin/v-add-web-domain +++ b/bin/v-add-web-domain @@ -177,7 +177,7 @@ chmod 660 $USER_DATA/web.conf if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-add-web-domain-alias b/bin/v-add-web-domain-alias index 7a27c822..4c935f79 100755 --- a/bin/v-add-web-domain-alias +++ b/bin/v-add-web-domain-alias @@ -104,12 +104,12 @@ increase_user_value "$user" '$U_WEB_ALIASES' if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-add-web-domain-proxy b/bin/v-add-web-domain-proxy index 6a0745b6..df6d79eb 100755 --- a/bin/v-add-web-domain-proxy +++ b/bin/v-add-web-domain-proxy @@ -104,7 +104,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions" if [ "$restart" != 'no' ]; then $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-add-web-domain-ssl b/bin/v-add-web-domain-ssl index af8cb079..8a956456 100755 --- a/bin/v-add-web-domain-ssl +++ b/bin/v-add-web-domain-ssl @@ -127,12 +127,12 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL' "yes" if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-change-cron-job b/bin/v-change-cron-job index faca8144..452c387b 100755 --- a/bin/v-change-cron-job +++ b/bin/v-change-cron-job @@ -66,7 +66,7 @@ sync_cron_jobs # Restart crond $BIN/v-restart-cron if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi # Logging diff --git a/bin/v-change-dns-domain-ip b/bin/v-change-dns-domain-ip index 307fd5cb..68e0c72f 100755 --- a/bin/v-change-dns-domain-ip +++ b/bin/v-change-dns-domain-ip @@ -71,7 +71,7 @@ fi if [ "$restart" != 'no' ]; then $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-change-dns-domain-soa b/bin/v-change-dns-domain-soa index 7b1bf9a3..fe4bf0bf 100755 --- a/bin/v-change-dns-domain-soa +++ b/bin/v-change-dns-domain-soa @@ -65,7 +65,7 @@ fi if [ "$restart" != 'no' ]; then $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-change-dns-domain-tpl b/bin/v-change-dns-domain-tpl index d708edb9..4c4057d2 100755 --- a/bin/v-change-dns-domain-tpl +++ b/bin/v-change-dns-domain-tpl @@ -89,7 +89,7 @@ fi if [ "$restart" != 'no' ]; then $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-change-dns-domain-ttl b/bin/v-change-dns-domain-ttl index b05836c2..985b46a2 100755 --- a/bin/v-change-dns-domain-ttl +++ b/bin/v-change-dns-domain-ttl @@ -64,7 +64,7 @@ fi if [ "$restart" != 'no' ]; then $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-change-dns-record b/bin/v-change-dns-record index 22b41d2f..8f27b8d9 100755 --- a/bin/v-change-dns-record +++ b/bin/v-change-dns-record @@ -99,7 +99,7 @@ fi if [ "$restart" != 'no' ]; then $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-change-dns-record-id b/bin/v-change-dns-record-id index a9474b56..0bd4a066 100755 --- a/bin/v-change-dns-record-id +++ b/bin/v-change-dns-record-id @@ -71,7 +71,7 @@ fi if [ "$restart" != 'no' ]; then $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-change-sys-ip-nat b/bin/v-change-sys-ip-nat index a60fb9b3..8d34b864 100755 --- a/bin/v-change-sys-ip-nat +++ b/bin/v-change-sys-ip-nat @@ -78,7 +78,7 @@ fi if [ "$restart" != 'no' ]; then $BIN/v-restart-ftp if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-change-web-domain-ip b/bin/v-change-web-domain-ip index 429784e6..d3c28fac 100755 --- a/bin/v-change-web-domain-ip +++ b/bin/v-change-web-domain-ip @@ -88,12 +88,12 @@ update_object_value 'web' 'DOMAIN' "$domain" '$IP' "$3" if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-change-web-domain-proxy-tpl b/bin/v-change-web-domain-proxy-tpl index a92c87bf..605d40f3 100755 --- a/bin/v-change-web-domain-proxy-tpl +++ b/bin/v-change-web-domain-proxy-tpl @@ -95,7 +95,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions" if [ "$restart" != 'no' ]; then $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-change-web-domain-sslcert b/bin/v-change-web-domain-sslcert index 42b56793..7b6b7703 100755 --- a/bin/v-change-web-domain-sslcert +++ b/bin/v-change-web-domain-sslcert @@ -72,12 +72,12 @@ fi # Restart web server $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi # Logging diff --git a/bin/v-change-web-domain-sslhome b/bin/v-change-web-domain-sslhome index 091ad3be..972df049 100755 --- a/bin/v-change-web-domain-sslhome +++ b/bin/v-change-web-domain-sslhome @@ -72,12 +72,12 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME" # Restart web server $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi # Logging diff --git a/bin/v-change-web-domain-tpl b/bin/v-change-web-domain-tpl index 6ba39f90..908ed798 100755 --- a/bin/v-change-web-domain-tpl +++ b/bin/v-change-web-domain-tpl @@ -97,7 +97,7 @@ update_object_value 'web' 'DOMAIN' "$domain" '$TPL' "$template" if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-delete-cron-job b/bin/v-delete-cron-job index 6e8d8b72..f47bbc92 100755 --- a/bin/v-delete-cron-job +++ b/bin/v-delete-cron-job @@ -55,7 +55,7 @@ decrease_user_value "$user" '$U_CRON_JOBS' # Restart crond $BIN/v-restart-cron if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi # Logging diff --git a/bin/v-delete-cron-reports b/bin/v-delete-cron-reports index 6ce3fa38..247f17b1 100755 --- a/bin/v-delete-cron-reports +++ b/bin/v-delete-cron-reports @@ -47,7 +47,7 @@ sync_cron_jobs # Restart crond $BIN/v-restart-cron if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi # Logging diff --git a/bin/v-delete-dns-domain b/bin/v-delete-dns-domain index 61907d51..7b1699f6 100755 --- a/bin/v-delete-dns-domain +++ b/bin/v-delete-dns-domain @@ -76,7 +76,7 @@ decrease_user_value "$user" '$U_DNS_RECORDS' "$records" if [ "$restart" != 'no' ]; then $BIN/v-restart-dns $restart if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-delete-dns-domains b/bin/v-delete-dns-domains index dfb36153..da97aa69 100755 --- a/bin/v-delete-dns-domains +++ b/bin/v-delete-dns-domains @@ -44,7 +44,7 @@ done # Restart named $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi # Logging diff --git a/bin/v-delete-dns-domains-src b/bin/v-delete-dns-domains-src index 69f86614..dd646b70 100755 --- a/bin/v-delete-dns-domains-src +++ b/bin/v-delete-dns-domains-src @@ -47,7 +47,7 @@ done if [ "$restart" != 'no' ]; then $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-delete-dns-record b/bin/v-delete-dns-record index 2e02dc5e..b47c22a8 100755 --- a/bin/v-delete-dns-record +++ b/bin/v-delete-dns-record @@ -70,7 +70,7 @@ decrease_user_value "$user" '$U_DNS_RECORDS' if [ "$restart" != 'no' ]; then $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-delete-domain b/bin/v-delete-domain index a9c966be..fbc89a9d 100755 --- a/bin/v-delete-domain +++ b/bin/v-delete-domain @@ -39,7 +39,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then if [ ! -z "$check_web" ]; then $BIN/v-delete-web-domain $user $domain if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi fi @@ -50,7 +50,7 @@ if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then if [ ! -z "$check_dns" ]; then $BIN/v-delete-dns-domain $user $domain if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi fi @@ -61,7 +61,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then if [ ! -z "$check_mail" ]; then $BIN/v-delete-mail-domain $user $domain if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi fi diff --git a/bin/v-delete-sys-ip b/bin/v-delete-sys-ip index 0a1c9aac..6c06b3cd 100755 --- a/bin/v-delete-sys-ip +++ b/bin/v-delete-sys-ip @@ -122,12 +122,12 @@ fi # Adding task to the vesta pipe $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi # Logging diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain index 532ce00f..68c86d2f 100755 --- a/bin/v-delete-web-domain +++ b/bin/v-delete-web-domain @@ -155,12 +155,12 @@ fi if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-delete-web-domain-alias b/bin/v-delete-web-domain-alias index d6862a5f..a5f3462c 100755 --- a/bin/v-delete-web-domain-alias +++ b/bin/v-delete-web-domain-alias @@ -102,12 +102,12 @@ decrease_user_value "$user" '$U_WEB_ALIASES' if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-delete-web-domain-proxy b/bin/v-delete-web-domain-proxy index b1fe9ebd..0aa73e15 100755 --- a/bin/v-delete-web-domain-proxy +++ b/bin/v-delete-web-domain-proxy @@ -88,7 +88,7 @@ fi if [ "$restart" != 'no' ]; then $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl index d09dc9ad..476cf7ba 100755 --- a/bin/v-delete-web-domain-ssl +++ b/bin/v-delete-web-domain-ssl @@ -93,12 +93,12 @@ decrease_user_value "$user" '$U_WEB_SSL' if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-delete-web-domains b/bin/v-delete-web-domains index aff5436d..fed92740 100755 --- a/bin/v-delete-web-domains +++ b/bin/v-delete-web-domains @@ -46,12 +46,12 @@ done if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-insert-dns-domain b/bin/v-insert-dns-domain index 949cdfde..eb246f5d 100755 --- a/bin/v-insert-dns-domain +++ b/bin/v-insert-dns-domain @@ -73,7 +73,7 @@ chmod 660 $USER_DATA/dns.conf if [ "$restart" != 'no' ]; then $BIN/v-restart-dns $restart if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-insert-dns-record b/bin/v-insert-dns-record index 29bb3b2c..25f87dbe 100755 --- a/bin/v-insert-dns-record +++ b/bin/v-insert-dns-record @@ -48,7 +48,7 @@ echo "$data" >> $USER_DATA/dns/$domain.conf if [ "$restart" != 'no' ]; then $BIN/v-restart-dns $restart if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-insert-dns-records b/bin/v-insert-dns-records index 5b5b230f..8fb2f55c 100755 --- a/bin/v-insert-dns-records +++ b/bin/v-insert-dns-records @@ -51,7 +51,7 @@ fi if [ "$restart" != 'no' ]; then $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-rebuild-cron-jobs b/bin/v-rebuild-cron-jobs index 1f229b94..8fcd2da2 100755 --- a/bin/v-rebuild-cron-jobs +++ b/bin/v-rebuild-cron-jobs @@ -44,7 +44,7 @@ sync_cron_jobs if [ "$restart" != 'no' ]; then $BIN/v-restart-cron if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-rebuild-dns-domain b/bin/v-rebuild-dns-domain index 31be08d1..7fdb0bd3 100755 --- a/bin/v-rebuild-dns-domain +++ b/bin/v-rebuild-dns-domain @@ -79,7 +79,7 @@ update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns" if [ "$restart" != 'no' ]; then $BIN/v-restart-dns "$restart" if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-rebuild-dns-domains b/bin/v-rebuild-dns-domains index e34e3812..127c35ef 100755 --- a/bin/v-rebuild-dns-domains +++ b/bin/v-rebuild-dns-domains @@ -79,7 +79,7 @@ update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns" if [ "$restart" != 'no' ]; then $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains index 09292445..b530eea6 100755 --- a/bin/v-rebuild-web-domains +++ b/bin/v-rebuild-web-domains @@ -150,12 +150,12 @@ update_user_value "$user" '$U_WEB_ALIASES' "$user_aliases" if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-restore-user b/bin/v-restore-user index fe48dba7..a515dab9 100755 --- a/bin/v-restore-user +++ b/bin/v-restore-user @@ -373,12 +373,12 @@ if [ "$web" != 'no' ]; then # Restart WEB $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi echo @@ -491,7 +491,7 @@ if [ "$dns" != 'no' ]; then # Restart DNS $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi echo @@ -708,7 +708,7 @@ if [ "$cron" != 'no' ]; then # Restart cron $BIN/v-restart-cron if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi echo diff --git a/bin/v-suspend-cron-job b/bin/v-suspend-cron-job index a26eae21..977b77ab 100755 --- a/bin/v-suspend-cron-job +++ b/bin/v-suspend-cron-job @@ -50,7 +50,7 @@ sync_cron_jobs if [ "$restart" != 'no' ]; then $BIN/v-restart-cron if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-suspend-cron-jobs b/bin/v-suspend-cron-jobs index 577860c4..993989a5 100755 --- a/bin/v-suspend-cron-jobs +++ b/bin/v-suspend-cron-jobs @@ -45,7 +45,7 @@ done if [ "$restart" != 'no' ]; then $BIN/v-restart-cron if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-suspend-dns-domain b/bin/v-suspend-dns-domain index 3972fc39..9d6c0906 100755 --- a/bin/v-suspend-dns-domain +++ b/bin/v-suspend-dns-domain @@ -50,7 +50,7 @@ increase_user_value "$user" '$SUSPENDED_DNS' #if [ "$restart" != 'no' ]; then # $BIN/v-restart-dns # if [ $? -ne 0 ]; then -# exit E_RESTART +# exit $E_RESTART # fi #fi diff --git a/bin/v-suspend-dns-domains b/bin/v-suspend-dns-domains index 0b2a5e89..f46cc39e 100755 --- a/bin/v-suspend-dns-domains +++ b/bin/v-suspend-dns-domains @@ -46,7 +46,7 @@ done #if [ "$restart" != 'no' ]; then # $BIN/v-restart-dns # if [ $? -ne 0 ]; then -# exit E_RESTART +# exit $E_RESTART # fi #fi diff --git a/bin/v-suspend-dns-record b/bin/v-suspend-dns-record index 30da60de..9a8f8dad 100755 --- a/bin/v-suspend-dns-record +++ b/bin/v-suspend-dns-record @@ -64,7 +64,7 @@ update_domain_zone #if [ "$restart" != 'no' ]; then # $BIN/v-restart-dns # if [ $? -ne 0 ]; then -# exit E_RESTART +# exit $E_RESTART # fi #fi diff --git a/bin/v-suspend-user b/bin/v-suspend-user index d812d23f..adbff01a 100755 --- a/bin/v-suspend-user +++ b/bin/v-suspend-user @@ -72,17 +72,17 @@ fi if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-cron if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-suspend-web-domain b/bin/v-suspend-web-domain index 96392995..7634e5fa 100755 --- a/bin/v-suspend-web-domain +++ b/bin/v-suspend-web-domain @@ -92,12 +92,12 @@ increase_user_value "$user" '$SUSPENDED_WEB' if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-suspend-web-domains b/bin/v-suspend-web-domains index eda982c6..fc4bf125 100755 --- a/bin/v-suspend-web-domains +++ b/bin/v-suspend-web-domains @@ -46,12 +46,12 @@ done if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-unsuspend-cron-job b/bin/v-unsuspend-cron-job index 685bcf17..39af81b1 100755 --- a/bin/v-unsuspend-cron-job +++ b/bin/v-unsuspend-cron-job @@ -50,7 +50,7 @@ sync_cron_jobs if [ "$restart" != 'no' ]; then $BIN/v-restart-cron if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-unsuspend-cron-jobs b/bin/v-unsuspend-cron-jobs index ad0f07e9..e1d3e686 100755 --- a/bin/v-unsuspend-cron-jobs +++ b/bin/v-unsuspend-cron-jobs @@ -45,7 +45,7 @@ done if [ "$restart" != 'no' ]; then $BIN/v-restart-cron if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-unsuspend-dns-domain b/bin/v-unsuspend-dns-domain index 9be0b4c8..25253590 100755 --- a/bin/v-unsuspend-dns-domain +++ b/bin/v-unsuspend-dns-domain @@ -52,7 +52,7 @@ sed -i "s/SUSPENDED='yes'/SUSPENDED='no'/g" $USER_DATA/dns/$domain.conf #if [ "$restart" != 'no' ]; then # $BIN/v-restart-dns # if [ $? -ne 0 ]; then -# exit E_RESTART +# exit $E_RESTART # fi #fi diff --git a/bin/v-unsuspend-dns-domains b/bin/v-unsuspend-dns-domains index f06c2218..177770e0 100755 --- a/bin/v-unsuspend-dns-domains +++ b/bin/v-unsuspend-dns-domains @@ -46,7 +46,7 @@ done #if [ "$restart" != 'no' ]; then # $BIN/v-restart-dns # if [ $? -ne 0 ]; then -# exit E_RESTART +# exit $E_RESTART # fi #fi diff --git a/bin/v-unsuspend-dns-record b/bin/v-unsuspend-dns-record index 3d4a53ce..25157b32 100755 --- a/bin/v-unsuspend-dns-record +++ b/bin/v-unsuspend-dns-record @@ -63,7 +63,7 @@ update_domain_zone #if [ "$restart" != 'no' ]; then # $BIN/v-restart-dns # if [ $? -ne 0 ]; then -# exit E_RESTART +# exit $E_RESTART # fi #fi diff --git a/bin/v-unsuspend-user b/bin/v-unsuspend-user index 00a21b6f..4222d298 100755 --- a/bin/v-unsuspend-user +++ b/bin/v-unsuspend-user @@ -74,17 +74,17 @@ decrease_user_value 'admin' '$SUSPENDED_USERS' if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-cron if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-unsuspend-web-domain b/bin/v-unsuspend-web-domain index 74e4e5f8..b963833b 100755 --- a/bin/v-unsuspend-web-domain +++ b/bin/v-unsuspend-web-domain @@ -89,12 +89,12 @@ decrease_user_value "$user" '$SUSPENDED_WEB' if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-unsuspend-web-domains b/bin/v-unsuspend-web-domains index a9f713f5..15c86026 100755 --- a/bin/v-unsuspend-web-domains +++ b/bin/v-unsuspend-web-domains @@ -47,12 +47,12 @@ done if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip index b0309b18..9a10a937 100755 --- a/bin/v-update-sys-ip +++ b/bin/v-update-sys-ip @@ -54,7 +54,7 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then sed -i "s/$old/$new/g" /etc/$PROXY_SYSTEM/conf.d/$new.conf $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi if [ ! -z "$WEB_SYSTEM" ]; then @@ -69,7 +69,7 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then done $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi @@ -82,7 +82,7 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then done $BIN/v-restart-dns if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi diff --git a/bin/v-update-web-templates b/bin/v-update-web-templates index 5f077840..65c2d0a3 100755 --- a/bin/v-update-web-templates +++ b/bin/v-update-web-templates @@ -65,12 +65,12 @@ done if [ "$restart" != 'no' ]; then $BIN/v-restart-web if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi $BIN/v-restart-proxy if [ $? -ne 0 ]; then - exit E_RESTART + exit $E_RESTART fi fi